Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into route-helper

8 files changed, 19 insertions, 15 deletions

diff --git a/app/assets/javascripts/diff.js.coffee b/app/assets/javascripts/diff.js.coffee
index b0b312e7749..05f5af42571 100644
--- a/app/assets/javascripts/diff.js.coffee
+++ b/app/assets/javascripts/diff.js.coffee
@@ -1,6 +1,7 @@
 class @Diff
   UNFOLD_COUNT = 20
   constructor: ->
+    $(document).off('click', '.js-unfold')
     $(document).on('click', '.js-unfold', (event) =>
       target = $(event.target)
       unfoldBottom = target.hasClass('js-unfold-bottom')
@@ -36,7 +37,7 @@ class @Diff
       )
     )
 
-    $('.diff-header').stick_in_parent(offset_top: $('.navbar').height())
+    $('.diff-header').stick_in_parent(recalc_every: 1, offset_top: $('.navbar').height())
 
   lineNumbers: (line) ->
     return ([0, 0]) unless line.children().length
diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee
index 9b7c1be8355..f2753170478 100644
--- a/app/assets/javascripts/issue.js.coffee
+++ b/app/assets/javascripts/issue.js.coffee
@@ -16,8 +16,9 @@ class @Issue
       updateTaskState
     )
 
-    $('.issuable-affix').affix offset:
-      top: ->
-        @top = $('.issue-details').outerHeight(true) + 25
-      bottom: ->
-        @bottom = $('.footer').outerHeight(true)
+    $('.issue-details').waitForImages ->
+      $('.issuable-affix').affix offset:
+        top: ->
+          @top = $('.issue-details').outerHeight(true) + 25
+        bottom: ->
+          @bottom = $('.footer').outerHeight(true)
diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee
index 757592842eb..d19f3af8c34 100644
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -20,11 +20,12 @@ class @MergeRequest
     if $("a.btn-close").length
       $("li.task-list-item input:checkbox").prop("disabled", false)
 
-    $('.issuable-affix').affix offset:
-      top: ->
-        @top = $('.merge-request-details').outerHeight(true) + 70
-      bottom: ->
-        @bottom = $('.footer').outerHeight(true)
+    $('.merge-request-details').waitForImages ->
+      $('.issuable-affix').affix offset:
+        top: ->
+          @top = $('.merge-request-details').outerHeight(true) + 91
+        bottom: ->
+          @bottom = $('.footer').outerHeight(true)
 
   # Local jQuery finder
   $: (selector) ->
@@ -95,6 +96,7 @@ class @MergeRequest
         this.$('.merge-request-tabs .diffs-tab').addClass 'active'
         this.loadDiff() unless @diffs_loaded
         this.$('.diffs').show()
+        $(".diff-header").trigger("sticky_kit:recalc")
       when 'commits'
         this.$('.merge-request-tabs .commits-tab').addClass 'active'
         this.$('.commits').show()
diff --git a/app/assets/stylesheets/sections/diff.scss b/app/assets/stylesheets/sections/diff.scss
index f47ea329827..54311a68852 100644
--- a/app/assets/stylesheets/sections/diff.scss
+++ b/app/assets/stylesheets/sections/diff.scss
@@ -8,6 +8,7 @@
     border-bottom: 1px solid #CCC;
     padding: 5px 5px 5px 10px;
     color: #555;
+    z-index: 10;
 
     > span {
       font-family: $monospace_font;
diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb
index 74f992b4699..e979dad4b11 100644
--- a/app/controllers/import/gitlab_controller.rb
+++ b/app/controllers/import/gitlab_controller.rb
@@ -17,7 +17,7 @@ class Import::GitlabController < Import::BaseController
     @already_added_projects = current_user.created_projects.where(import_type: "gitlab")
     already_added_projects_names = @already_added_projects.pluck(:import_source)
 
-    @repos.to_a.reject!{ |repo| already_added_projects_names.include? repo["path_with_namespace"] }
+    @repos = @repos.to_a.reject{ |repo| already_added_projects_names.include? repo["path_with_namespace"] }
   end
 
   def jobs
diff --git a/app/controllers/import/gitorious_controller.rb b/app/controllers/import/gitorious_controller.rb
index 627b4a171b8..6067a87ee04 100644
--- a/app/controllers/import/gitorious_controller.rb
+++ b/app/controllers/import/gitorious_controller.rb
@@ -15,7 +15,7 @@ class Import::GitoriousController < Import::BaseController
     @already_added_projects = current_user.created_projects.where(import_type: "gitorious")
     already_added_projects_names = @already_added_projects.pluck(:import_source)
 
-    @repos.to_a.reject! { |repo| already_added_projects_names.include? repo.full_name }
+    @repos.reject! { |repo| already_added_projects_names.include? repo.full_name }
   end
 
   def jobs
diff --git a/app/views/projects/deploy_keys/_deploy_key.html.haml b/app/views/projects/deploy_keys/_deploy_key.html.haml
index 52da85cbdfa..230e164f24c 100644
--- a/app/views/projects/deploy_keys/_deploy_key.html.haml
+++ b/app/views/projects/deploy_keys/_deploy_key.html.haml
@@ -13,7 +13,7 @@
         = link_to 'Remove', namespace_project_deploy_key_path(@project.namespace, @project, deploy_key), data: { confirm: 'You are going to remove deploy key. Are you sure?'}, method: :delete, class: "btn btn-remove delete-key btn-small pull-right"
 
 
-  = key_project = deploy_key.projects.include?(@project) ? @project : deploy_key.projects.first
+  - key_project = deploy_key.projects.include?(@project) ? @project : deploy_key.projects.first
   = link_to namespace_project_deploy_key_path(key_project.namespace, key_project, deploy_key) do
     %i.fa.fa-key
     %strong= deploy_key.title
diff --git a/db/migrate/20150223022001_set_missing_last_activity_at.rb b/db/migrate/20150223022001_set_missing_last_activity_at.rb
index 3a3adf18872..3f6d4d83474 100644
--- a/db/migrate/20150223022001_set_missing_last_activity_at.rb
+++ b/db/migrate/20150223022001_set_missing_last_activity_at.rb
@@ -4,6 +4,5 @@ class SetMissingLastActivityAt < ActiveRecord::Migration
   end
 
   def down
-    raise ActiveRecord::IrreversibleMigration
   end
 end