Commit 7fef8456 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'small-fixes' into 'master'

Small fixes

Fixes #2062 and #2061

See merge request !1601
parents e27f5aef c254cb03
...@@ -16,8 +16,9 @@ class @Issue ...@@ -16,8 +16,9 @@ class @Issue
updateTaskState updateTaskState
) )
$('.issuable-affix').affix offset: $('.issue-details').waitForImages ->
top: -> $('.issuable-affix').affix offset:
@top = $('.issue-details').outerHeight(true) + 25 top: ->
bottom: -> @top = $('.issue-details').outerHeight(true) + 25
@bottom = $('.footer').outerHeight(true) bottom: ->
@bottom = $('.footer').outerHeight(true)
...@@ -20,11 +20,12 @@ class @MergeRequest ...@@ -20,11 +20,12 @@ class @MergeRequest
if $("a.btn-close").length if $("a.btn-close").length
$("li.task-list-item input:checkbox").prop("disabled", false) $("li.task-list-item input:checkbox").prop("disabled", false)
$('.issuable-affix').affix offset: $('.merge-request-details').waitForImages ->
top: -> $('.issuable-affix').affix offset:
@top = $('.merge-request-details').outerHeight(true) + 70 top: ->
bottom: -> @top = $('.merge-request-details').outerHeight(true) + 91
@bottom = $('.footer').outerHeight(true) bottom: ->
@bottom = $('.footer').outerHeight(true)
# Local jQuery finder # Local jQuery finder
$: (selector) -> $: (selector) ->
......
...@@ -13,7 +13,7 @@ ...@@ -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" = 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 = link_to namespace_project_deploy_key_path(key_project.namespace, key_project, deploy_key) do
%i.fa.fa-key %i.fa.fa-key
%strong= deploy_key.title %strong= deploy_key.title
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment