Sync changes from upstream repository

Hubot · Hubot · commit e049e77035e7 · 2016-03-03T22:17:36.000-08:00
diff --git a/layouts/sidebar.html b/layouts/sidebar.html
@@ -122,7 +122,7 @@ <h3><a href="#" class="js-expand-btn collapsed arrow-btn" data-proofer-ignore></
         </ul>
       </li>
       <li class="js-topic">
-        <h3><a href="#" class="js-expand-btn collapsed arrow-btn" data-proofer-ignore></a><a href="/v3/enterprise/">Enterprise <%= config[:latest_enterprise_version] %></a></h3>
+        <h3><a href="#" class="js-expand-btn collapsed arrow-btn" data-proofer-ignore></a><a href="/v3/enterprise/">Enterprise</a></h3>
         <ul class="js-guides">
           <li><a href="/v3/enterprise/admin_stats/">Admin Stats</a></li>
           <li><a href="/v3/enterprise/ldap/">LDAP</a></li>
diff --git a/nanoc.yaml b/nanoc.yaml
@@ -63,7 +63,7 @@ page_variables:
       hide_from_search: true
   -
     scope:
-      path: "enterprise"
+      path: "enterprise/."
       reps:
         - :default
     values:
diff --git a/script/enterprise-backport b/script/enterprise-backport
@@ -45,7 +45,7 @@ data_variables:
 
   versioned_config = symbolize_hash(config.deep_merge(config_enterprise_admin))
 
-  ent_scope_idx = versioned_config[:page_variables].find_index { |v| v[:scope][:path] == 'enterprise' }
+  ent_scope_idx = versioned_config[:page_variables].find_index { |v| v[:scope][:path] == 'enterprise/.' }
 
   versioned_config[:page_variables][ent_scope_idx][:values][:version] = CURR_VERSION
 
