From e993b59b7dcaf795abb82af3f548f35aff01c6a8 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 25 Feb 2015 19:53:45 -0800
Subject: Dont render project entity

---
 app/views/projects/deploy_keys/_deploy_key.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.1


From c254cb03d8ddfb217341c2f83223ba30228f3088 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 25 Feb 2015 20:00:28 -0800
Subject: Fix affix for issue and merge request with image in description

---
 app/assets/javascripts/issue.js.coffee         | 11 ++++++-----
 app/assets/javascripts/merge_request.js.coffee | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

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..ec686315435 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) ->
-- 
cgit v1.2.1