From 6367f1882bb4f7531fa0f27b5a8f2510bb306a03 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 21 Apr 2015 14:13:18 +0200 Subject: [PATCH 1/5] fix code climate popup overflow bug --- app/styles/app/layouts/top.sass | 6 +++--- app/styles/app/modules/tiles.sass | 11 ++++------- app/styles/app/popup.sass | 1 + app/templates/components/code-climate-popup.hbs | 8 ++++---- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/styles/app/layouts/top.sass b/app/styles/app/layouts/top.sass index 270ab3ed..b7543bce 100644 --- a/app/styles/app/layouts/top.sass +++ b/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 diff --git a/app/styles/app/modules/tiles.sass b/app/styles/app/modules/tiles.sass index e9d61a18..4cdb12c1 100644 --- a/app/styles/app/modules/tiles.sass +++ b/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 diff --git a/app/styles/app/popup.sass b/app/styles/app/popup.sass index 2dcdba7a..a7658ce9 100644 --- a/app/styles/app/popup.sass +++ b/app/styles/app/popup.sass @@ -42,6 +42,7 @@ p font-size: $font-size-normal + word-wrap: normal pre background-color: $color-bg-pre diff --git a/app/templates/components/code-climate-popup.hbs b/app/templates/components/code-climate-popup.hbs index 7035909b..a6a366d2 100644 --- a/app/templates/components/code-climate-popup.hbs +++ b/app/templates/components/code-climate-popup.hbs @@ -7,7 +7,7 @@

Integrating Code Climate's test coverage reporting with your test suite on Travis CI allows to track changes in coverage over time. If you haven't tried it out already, sign + {{bind-attr href="config.codeClimateUrl"}} target="_blank">sign up today to improve your code's quality. New customers get 20% off for the first three months!

@@ -17,14 +17,14 @@
  1. - Add the `code-climate-reporter` gem to your Gemfile:
    +

    Add the `code-climate-reporter` gem to your Gemfile:

     gem "codeclimate-test-reporter", group: :test, require: nil
  2. - Load the reporter in your `test_helper` or `spec_helper`, putting it at the very top: +

    Load the reporter in your `test_helper` or `spec_helper`, putting it at the very top:

     require "codeclimate-test-reporter"
@@ -32,7 +32,7 @@ CodeClimate::TestReporter.start
  3. - Add the Code Climate token to your .travis.yml: +

    Add the Code Climate token to your .travis.yml:

     addons:

From 89f055cbd0106a602aeef404f94c9ad5c2abcf5f Mon Sep 17 00:00:00 2001
From: Lisa Passing 
Date: Tue, 21 Apr 2015 17:12:59 +0200
Subject: [PATCH 2/5] add rust to config keys

---
 app/utils/keys-map.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/utils/keys-map.coffee b/app/utils/keys-map.coffee
index 66f08736..2b2a704c 100644
--- a/app/utils/keys-map.coffee
+++ b/app/utils/keys-map.coffee
@@ -17,6 +17,7 @@ languageConfigKeys = {
   jdk:         'JDK'
   rvm:         'Ruby'
   otp_release: 'OTP Release'
+  rust:        'Rust'
 }
 
 configKeys = {

From 60bd9e6a267a96f2ad41e7ec3e6390942bdc4db4 Mon Sep 17 00:00:00 2001
From: Lisa Passing 
Date: Wed, 22 Apr 2015 15:43:39 +0200
Subject: [PATCH 3/5] fix signup button on profile on pro

---
 app/styles/app/layouts/profile.sass |  4 ---
 app/templates/account.hbs           | 39 +++++++++++++++--------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass
index b34f80f2..6a715a7b 100644
--- a/app/styles/app/layouts/profile.sass
+++ b/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
diff --git a/app/templates/account.hbs b/app/templates/account.hbs
index a7ef4634..ab1a9041 100644
--- a/app/templates/account.hbs
+++ b/app/templates/account.hbs
@@ -1,5 +1,25 @@
 {{#if allHooks.isLoaded}}
+
   
    
+  {{#if config.billingEndpoint}}
+    
    
+    {{#if view.subscribed}}
+      
+        Subscription active!
+      
+    {{else}}
+      {{#if view.education}}
+        
+          Educational account!
+        
+      {{else}}
+        
+          Sign up this account!
+        
+      {{/if}}
+    {{/if}}
+    
    
+  {{/if}}
 
   
    
     
    {{view.name}}
    
@@ -19,25 +39,6 @@
       
       
    last synced {{format-time user.syncedAt}}
    
     
    
-    {{#if config.billingEndpoint}}
-      
    
-      {{#if view.subscribed}}
-        
-          Subscription active!
-        
-      {{else}}
-        {{#if view.education}}
-          
-            Educational account!
-          
-        {{else}}
-          
-            Sign up this account!
-          
-        {{/if}}
-      {{/if}}
-      
    
-    {{/if}}
     {{#if config.pro}}
       
    We're only showing your private repositories. You can find your public projects on travis-ci.org.
    
       {{else}}

From 9609daab3ba72147e7194f154a4e97e339954d87 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki 
Date: Wed, 22 Apr 2015 18:45:10 +0200
Subject: [PATCH 4/5] Fix removing caches for entier repository

It seems that sometimes repository_id is not present on cache object.
I'll investigate that later, but we have a repo object on the caches
controller anyway, so I'll just use it instead.
---
 app/controllers/caches.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/caches.coffee b/app/controllers/caches.coffee
index 4a266cc6..11903b12 100644
--- a/app/controllers/caches.coffee
+++ b/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.repository_id')}/caches", "DELETE").then(deletingDone, deletingDone).then =>
           @set('model', {})
 
 `export default Controller`

From 9bf5582f7deac099c01512952e65bf57d06f0026 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki 
Date: Wed, 22 Apr 2015 18:46:51 +0200
Subject: [PATCH 5/5] repo.repository_id -> repo.id

---
 app/controllers/caches.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/caches.coffee b/app/controllers/caches.coffee
index 11903b12..3c7fd3c4 100644
--- a/app/controllers/caches.coffee
+++ b/app/controllers/caches.coffee
@@ -17,7 +17,7 @@ Controller = Ember.Controller.extend
         deletingDone = => @set('isDeleting', false)
 
         repo = @get('repo')
-        Ajax.ajax("/repos/#{@get('repo.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`