diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-26 06:31:50 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-26 06:31:50 +0000 |
| commit | 7fef8456e8bc92adb0de3f2bc7192e3bedfce47d (patch) | |
| tree | 8a1fc68e175831bfb45eef152add39d5278a463b | |
| parent | e27f5aef462e5cf32f23fbb3137b98011c0c0ddf (diff) | |
| parent | c254cb03d8ddfb217341c2f83223ba30228f3088 (diff) | |
| download | gitlab-ce-7fef8456e8bc92adb0de3f2bc7192e3bedfce47d.tar.gz | |
Merge branch 'small-fixes' into 'master'
Small fixes
Fixes #2062 and #2061
See merge request !1601
| -rw-r--r-- | app/assets/javascripts/issue.js.coffee | 11 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request.js.coffee | 11 | ||||
| -rw-r--r-- | app/views/projects/deploy_keys/_deploy_key.html.haml | 2 |
3 files changed, 13 insertions, 11 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 805bf0203cb..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) -> 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 |