Merge branch 'master' into dashboard

assets/scripts/app/app.coffee

@@ -70,6 +70,9 @@ unless window.TravisApplication
 
       type = Ember.get(Travis, 'mappings')[name]
 
+      if name == 'job' && data.job?.commit
+        @loadOrMerge(Travis.Commit, data.job.commit)
+
       if name == 'build' && data.build?.commit
         # TODO: commit should be a sideload record on build, not mixed with it
         build = data.build

assets/scripts/app/templates/layouts/top.hbs

@@ -8,14 +8,16 @@
   <li class="home">
     {{#link-to "main"}}Home{{/link-to}}
   </li>
-  {{#unless config.enterprise}}
+  {{#if config.enterprise}}
+    <li><a href="http://docs.travis-ci.com">Docs</a></li>
+  {{else}}
     <li>
       <a href="http://blog.travis-ci.com">Blog</a>
     </li>
     <li>
       <a href="http://traviscistatus.com">Status</a>
     </li>
-  {{/unless}}
+  {{/if}}
   {{#unless config.pro}}
     <li class="menu community">
       <p class="handle">

assets/scripts/app/templates/sidebar.hbs

@@ -10,7 +10,7 @@
   </div>
 {{/if}}
 
-{{#if config.pages_endpoint}}
+{{#if config.sidebar_support_box}}
   {{view templateName="layouts/support"}}
 {{/if}}
 

assets/scripts/travis.coffee

@@ -64,6 +64,12 @@ billing_endpoint = $('meta[rel="travis.billing_endpoint"]').attr('href')
 customer_io_site_id = $('meta[name="travis.customer_io_site_id"]').attr('value')
 setupCustomerio(customer_io_site_id) if customer_io_site_id
 
+enterprise = $('meta[name="travis.enterprise"]').attr('value') == 'true'
+
+# for now I set pro to true also for enterprise, but it should be changed
+# to allow more granular config later
+pro = $('meta[name="travis.pro"]').attr('value') == 'true' || enterprise
+
 $.extend Travis,
   run: ->
     Travis.advanceReadiness() # bc, remove once merged to master
@@ -82,10 +88,9 @@ $.extend Travis,
     show_repos_hint: 'private'
     avatar_default_url: 'https://travis-ci.org/images/ui/default-avatar.png'
     pusher_log_fallback:  $('meta[name="travis.pusher_log_fallback"]').attr('value') == 'true'
-    # for now I set pro to true also for enterprise, but it should be changed
-    # to allow more granular config later
-    pro: $('meta[name="travis.pro"]').attr('value') == 'true' || $('meta[name="travis.enterprise"]').attr('value') == 'true'
-    enterprise: $('meta[name="travis.enterprise"]').attr('value') == 'true'
+    pro: pro
+    enterprise: enterprise
+    sidebar_support_box: pro && !enterprise
 
     pages_endpoint: pages_endpoint || billing_endpoint
     billing_endpoint: billing_endpoint