Merge branch 'master' into hooks-activation-error-message

Conflicts:
	app/templates/account.hbs

app/controllers/caches.coffee

@@ -17,7 +17,7 @@ Controller = Ember.Controller.extend
         deletingDone = => @set('isDeleting', false)
 
         repo = @get('repo')
-        Ajax.ajax("/repos/#{@get('cache.repository_id')}/caches", "DELETE").then(deletingDone, deletingDone).then =>
+        Ajax.ajax("/repos/#{@get('repo.id')}/caches", "DELETE").then(deletingDone, deletingDone).then =>
           @set('model', {})
 
 `export default Controller`

app/styles/app/layouts/profile.sass

@@ -35,10 +35,6 @@
 
   .cta-btn
     text-align: right
-    @media #{$large-up}
-      position: absolute
-      top: 1rem
-      right: 0
 
 .profile-getstarted
   position: relative

app/styles/app/layouts/top.sass

@@ -15,7 +15,7 @@ $top-height: 55px
 
   p
     position: relative
-    margin: 0
+    margin: auto
     padding: 0
 
   .arrow
@@ -92,7 +92,7 @@ $top-height: 55px
     position: relative
 
   a,
-  .navigation-handle span
+  .navigation-handle span:not(.sync-spinner)
     display: block
     color: #898989
     border-bottom: solid 1px #eff0ec
@@ -127,7 +127,7 @@ $top-height: 55px
         margin-right: 0
 
       a,
-      .navigation-handle span
+      .navigation-handle span:not(.sync-spinner)
         padding: 0 .2em
 
     .navigation--profile

app/styles/app/modules/tiles.sass

@@ -14,7 +14,6 @@
   background-color: $cream-light
   p
     margin: 0
-    white-space: nowrap
   .icon
     vertical-align: middle
   .icon--lang
@@ -133,10 +132,6 @@
     position: absolute
     bottom: 0
 
-
-// repo header
-.tile--repo
-
 // build history etc
 .tile--build
   .tile-main
@@ -151,10 +146,12 @@
       &:after
         @include fadeOut(right, -90deg, $cream-light)
     @media #{$xlarge-up}
-      @include grid-column(8)
+      @include grid-column(7)
   .tile-additional
+    p
+      white-space: nowrap
     @media #{$xlarge-up}
-      @include grid-column(4)
+      @include grid-column(5)
 
 p.tile-single-line
   padding: .7em 0

app/styles/app/popup.sass

@@ -42,6 +42,7 @@
 
   p
     font-size: $font-size-normal
+    word-wrap: normal
 
   pre
     background-color: $color-bg-pre

app/templates/account.hbs

@@ -1,5 +1,25 @@
 {{#if allHooks.isLoaded}}
+
   <header>
+  {{#if config.billingEndpoint}}
+    <div class="cta-btn">
+    {{#if view.subscribed}}
+      <a class="btn btn-activated" {{bind-attr href="billingUrl"}}>
+        Subscription active!
+      </a>
+    {{else}}
+      {{#if view.education}}
+        <a class="btn btn-activated" {{bind-attr href="billingUrl"}}>
+          Educational account!
+        </a>
+      {{else}}
+        <a class="btn btn-activate" {{bind-attr href="billingUrl"}}>
+          Sign up this account!
+        </a>
+      {{/if}}
+    {{/if}}
+    </div>
+  {{/if}}
 
     <div class="profile-header">
       <h1>{{view.name}}</h1>

app/templates/components/code-climate-popup.hbs

@@ -7,7 +7,7 @@
   <p>
     Integrating <a href="https://codeclimate.com">Code Climate's test coverage</a> reporting with your test
     suite on Travis CI allows to track changes in coverage over time. If you haven't tried it out already, <a
-    {{bind-attr href=config.codeClimateUrl}}" target="_blank">sign
+    {{bind-attr href="config.codeClimateUrl"}} target="_blank">sign
     up today</a> to improve your code's quality. New customers get 20% off for the first three months!
   </p>
 
@@ -17,14 +17,14 @@
 
   <ol>
     <li>
-      Add the `code-climate-reporter` gem to your Gemfile:<br/>
+      <p>Add the `code-climate-reporter` gem to your Gemfile:</p>
 
 <pre>
 gem "codeclimate-test-reporter", group: :test, require: nil
 </pre>
     </li>
     <li>
-      Load the reporter in your `test_helper` or `spec_helper`, putting it at the very top:
+      <p>Load the reporter in your `test_helper` or `spec_helper`, putting it at the very top:</p>
 
 <pre>
 require "codeclimate-test-reporter"
@@ -32,7 +32,7 @@ CodeClimate::TestReporter.start
 </pre>
     </li>
     <li>
-      Add the Code Climate token to your .travis.yml:
+      <p>Add the Code Climate token to your .travis.yml:</p>
 
 <pre>
 addons:

app/utils/keys-map.coffee

@@ -17,6 +17,7 @@ languageConfigKeys = {
   jdk:         'JDK'
   rvm:         'Ruby'
   otp_release: 'OTP Release'
+  rust:        'Rust'
 }
 
 configKeys = {