Sync changes from upstream repository

Hubot · Hubot · commit bd70172bae04 · 2015-12-06T20:15:45.000-08:00
diff --git a/content/changes/index.html b/content/changes/index.html
@@ -3,8 +3,8 @@
 layout: blog
 ---
 
-<%= render '/_changes.*', :changes => paginated_api_changes(0, 9) %>
+<%= renderp '/_changes.*', :changes => paginated_api_changes(0, 9) %>
 
 <div class="paginate-container">
-  <%= render '/includes/pagination_bar.html', :current_page => 1, :total_pages => total_pages %>
+  <%= renderp '/includes/pagination_bar.html', :current_page => 1, :total_pages => total_pages %>
 </div>
diff --git a/layouts/_changes.html b/layouts/_changes.html
@@ -1,6 +1,6 @@
 <% @changes.each do |article| %>
 <div class="change" id="<%= article.path %>">
-  <%= render '/_meta.*', :item => article %>
+  <%= renderp '/_meta.*', :item => article %>
     <%= article.compiled_content %>
 </div>
 <% end %>
diff --git a/layouts/api.html b/layouts/api.html
@@ -1,7 +1,7 @@
-<%= render '/head.*' %>
+<%= renderp '/head.*' %>
 
 <body class="api <%= ENV['DEV_MODE'] ? 'dev-mode' : '' %>">
-  <%= render '/header.*' %>
+  <%= renderp '/header.*' %>
 
   <div class="sub-nav">
     <h2><a href="/v3/">API</a></h2>
@@ -19,9 +19,9 @@ <h2><a href="/v3/">API</a></h2>
       <%= yield %>
     </div>
 
-    <%= render '/sidebar.*' %>
+    <%= renderp '/sidebar.*' %>
   </div><!-- #wrapper -->
 
-  <%= render '/footer.*' %>
+  <%= renderp '/footer.*' %>
 </body>
 </html>
diff --git a/layouts/blog.html b/layouts/blog.html
@@ -1,20 +1,20 @@
-<%= render '/head.*' %>
+<%= renderp '/head.*' %>
 
 <body class="blog">
-  <%= render '/header.*' %>
+  <%= renderp '/header.*' %>
 
   <div id="wrapper">
     <div class="content">
       <%= yield %>
     </div>
 
     <div class="sidebar-shell">
-        <%= render '/headlines.*', :changes => api_changes %>
+        <%= renderp '/headlines.*', :changes => api_changes %>
 
         <div class="sidebar-module notice"><a class="rss-subscribe" href="/changes.atom">Subscribe to the RSS feed</a></div>
     </div>
   </div>
 
-  <%= render '/footer.*' %>
+  <%= renderp '/footer.*' %>
 </body>
 </html>
diff --git a/layouts/changes.html b/layouts/changes.html
@@ -1,5 +1,5 @@
 <div class="change" id="<%= @item.path %>">
-<%= render '/_meta.*', :item => @item %>
+<%= renderp '/_meta.*', :item => @item %>
 
 <%= yield %>
 </div>
diff --git a/layouts/default.html b/layouts/default.html
@@ -1,16 +1,16 @@
-<%= render '/head.*' %>
+<%= renderp '/head.*' %>
 
 <body>
-  <%= render '/header.*' %>
+  <%= renderp '/header.*' %>
 
   <div id="wrapper">
     <div class="content">
       <%= yield %>
     </div>
 
-    <%= render '/sidebar.*' %>
+    <%= renderp '/sidebar.*' %>
   </div><!-- #wrapper -->
 
-  <%= render '/footer.*' %>
+  <%= renderp '/footer.*' %>
 </body>
 </html>
diff --git a/layouts/developers.html b/layouts/developers.html
@@ -1,10 +1,10 @@
-<%= render '/head.*' %>
+<%= renderp '/head.*' %>
 
 <body class="developers">
-  <%= render '/header.*' %>
+  <%= renderp '/header.*' %>
 
   <%= yield %>
 
-  <%= render '/footer.*' %>
+  <%= renderp '/footer.*' %>
 </body>
 </html>
diff --git a/layouts/guides.html b/layouts/guides.html
@@ -1,7 +1,7 @@
-<%= render '/head.*' %>
+<%= renderp '/head.*' %>
 
 <body class="api <%= ENV['DEV_MODE'] ? 'dev-mode' : '' %>">
-  <%= render '/header.*' %>
+  <%= renderp '/header.*' %>
 
   <div class="sub-nav">
     <h2><a href="/v3/">API</a></h2>
@@ -45,6 +45,6 @@ <h2><a href="/v3/">API</a></h2>
     </div><!-- sidebar-shell -->
   </div><!-- #wrapper -->
 
-  <%= render '/footer.*' %>
+  <%= renderp '/footer.*' %>
 </body>
 </html>
diff --git a/layouts/header.html b/layouts/header.html
@@ -1,4 +1,4 @@
-<%= render '/includes/staging_header.html' %>
+<%= renderp '/includes/staging_header.html' %>
 <div id="header-wrapper">
   <div id="header">
     <div>
diff --git a/layouts/integrations-directory.html b/layouts/integrations-directory.html
@@ -1,7 +1,7 @@
-<%= render '/head.*' %>
+<%= renderp '/head.*' %>
 
 <body class="api <%= ENV['DEV_MODE'] ? 'dev-mode' : '' %>">
-  <%= render '/header.*' %>
+  <%= renderp '/header.*' %>
 
   <div class="sub-nav">
     <h2><a href="/integrations-directory">Integrations Directory</a></h2>
@@ -35,6 +35,6 @@ <h2><a href="/integrations-directory">Integrations Directory</a></h2>
     </div><!-- sidebar-shell -->
   </div><!-- #wrapper -->
 
-  <%= render '/footer.*' %>
+  <%= renderp '/footer.*' %>
 </body>
 </html>
diff --git a/layouts/libraries.html b/layouts/libraries.html
@@ -1,7 +1,7 @@
-<%= render '/head.*' %>
+<%= renderp '/head.*' %>
 
 <body class="api">
-  <%= render '/header.*' %>
+  <%= renderp '/header.*' %>
 
   <div class="sub-nav">
     <h2><a href="/v3/">API</a></h2>
@@ -18,6 +18,6 @@ <h2><a href="/v3/">API</a></h2>
     <%= yield %>
   </div>
 
-  <%= render '/footer.*' %>
+  <%= renderp '/footer.*' %>
 </body>
 </html>
diff --git a/layouts/overview.html b/layouts/overview.html
@@ -1,10 +1,10 @@
-<%= render '/head.*' %>
+<%= renderp '/head.*' %>
 
 <body class="overview">
-  <%= render '/header.*' %>
+  <%= renderp '/header.*' %>
 
   <%= yield %>
 
-  <%= render '/footer.*' %>
+  <%= renderp '/footer.*' %>
 </body>
 </html>
diff --git a/layouts/pagination_page.html b/layouts/pagination_page.html
@@ -1,5 +1,5 @@
-<%= render '/_changes.*', :changes => paginated_api_changes(@first, @last) %>
+<%= renderp '/_changes.*', :changes => paginated_api_changes(@first, @last) %>
 
 <div class="paginate-container">
-  <%= render '/includes/pagination_bar.html', :current_page => @current_page, :total_pages => total_pages %>
+  <%= renderp '/includes/pagination_bar.html', :current_page => @current_page, :total_pages => total_pages %>
 </div>
diff --git a/layouts/webhooks.html b/layouts/webhooks.html
@@ -1,7 +1,7 @@
-<%= render '/head.*' %>
+<%= renderp '/head.*' %>
 
 <body class="api <%= ENV['DEV_MODE'] ? 'dev-mode' : '' %>">
-  <%= render '/header.*' %>
+  <%= renderp '/header.*' %>
 
   <div class="sub-nav">
     <h2><a href="/v3/">API</a></h2>
@@ -38,6 +38,6 @@ <h2><a href="/v3/">API</a></h2>
   </div><!-- #wrapper -->
   </div><!-- #wrapper -->
 
-  <%= render '/footer.*' %>
+  <%= renderp '/footer.*' %>
 </body>
 </html>
diff --git a/lib/default.rb b/lib/default.rb
@@ -11,3 +11,10 @@
 include Nanoc::Helpers::Rendering
 include Nanoc::Helpers::Blogging
 include ChangesHelper
+
+Nanoc::Helpers::Rendering.module_eval do
+  if respond_to? :render
+    alias_method :renderp, :render
+    remove_method :render
+  end
+end
diff --git a/lib/paginate.rb b/lib/paginate.rb
@@ -28,7 +28,7 @@ def create_individual_blog_pages
       last  = (next_i * PER_PAGE) - 1
 
       @items.create(
-        "<%= render '/pagination_page.html',
+        "<%= renderp '/pagination_page.html',
           :current_page => #{next_i},
           :per_page => PER_PAGE,
           :first => #{first}, :last => #{last} %>",
diff --git a/lib/redirect_generator.rb b/lib/redirect_generator.rb
@@ -3,7 +3,7 @@ def generate_redirects(redirects)
     redirects.each do |pairs|
       pairs.each_pair do |old_url, new_url|
         @items.create(
-          "<%= render '/redirect.*',
+          "<%= renderp '/redirect.*',
             { :new_url => '#{new_url}' }
           %>",
           {},

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<%= render '/includes/staging_header.html' %>`
	`1`	`+<%= renderp '/includes/staging_header.html' %>`
`2`	`2`	`<div id="header-wrapper">`
`3`	`3`	`<div id="header">`
`4`	`4`	`<div>`