Merge branch 'small-fixes' into 'master'
Small fixes Fixes #2062 and #2061 See merge request !1601
This commit is contained in:
commit
7fef8456e8
|
@ -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)
|
||||
|
|
|
@ -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) ->
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue