Skip to content
Snippets Groups Projects
Commit ce5fca48 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fix MR modal

parent 08bcf639
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -22,12 +22,7 @@ class MergeRequest
this.$('.show-all-commits').on 'click', =>
this.showAllCommits()
modal = $('#modal_merge_info').modal modal: true, show:false
$('.how_to_merge_link').bind "click", ->
modal.show()
$('.modal-header .close').bind "click", ->
modal.hide()
modal = $('#modal_merge_info').modal(show: false)
 
# Local jQuery finder
$: (selector) ->
Loading
Loading
Loading
Loading
@@ -471,3 +471,7 @@ li.commit {
}
}
}
.commit-breadcrumb {
padding: 0;
}
= render "head"
 
- if @path.present?
%ul.breadcrumb
%ul.breadcrumb.commit-breadcrumb
%li.light
History for
= commits_breadcrumbs
Loading
Loading
%h3.page-title
= "Edit merge request #{@merge_request.id}"
= "Edit merge request ##{@merge_request.id}"
%hr
= render 'form'
%div#modal_merge_info.modal.hide
.modal-header
%a.close{href: "#"} ×
%a.close{href: "#", "data-dismiss" => "modal"} ×
%h3 How To Merge
.modal-body
%p
Loading
Loading
Loading
Loading
@@ -11,7 +11,8 @@
%p
You can accept this request automatically.
If you still want to do it manually -
%strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
%strong
= link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
for instructions
.accept_group
= f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
Loading
Loading
@@ -31,7 +32,7 @@
.automerge_widget.cannot_be_merged{style: "display:none"}
.alert.alert-disabled
%span
= link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
= link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn btn-small padded", title: "How To Merge", "data-toggle" => "modal"
 
%strong This request can't be merged with GitLab. You should do it manually
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment