Fix MR modal

diff --git a/app/assets/javascripts/merge_requests.js.coffee b/app/assets/javascripts/merge_requests.js.coffee
index 769a940..153198c 100644 (file)
--- a/app/assets/javascripts/merge_requests.js.coffee
+++ b/app/assets/javascripts/merge_requests.js.coffee
@@ -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) ->

diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss
index 1a2c5e7..316dc3d 100644 (file)
--- a/app/assets/stylesheets/sections/commits.scss
+++ b/app/assets/stylesheets/sections/commits.scss
@@ -471,3 +471,7 @@ li.commit {
     }
   }
 }
+
+.commit-breadcrumb {
+  padding: 0;
+}

diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index d56923f..723c5a1 100644 (file)
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -1,7 +1,7 @@
 = render "head"
 
 - if @path.present?
-  %ul.breadcrumb
+  %ul.breadcrumb.commit-breadcrumb
     %li.light
       History for
     = commits_breadcrumbs

diff --git a/app/views/projects/merge_requests/edit.html.haml b/app/views/projects/merge_requests/edit.html.haml
index 348ebee..67a1541 100644 (file)
--- a/app/views/projects/merge_requests/edit.html.haml
+++ b/app/views/projects/merge_requests/edit.html.haml
@@ -1,4 +1,4 @@
 %h3.page-title
-  = "Edit merge request #{@merge_request.id}"
+  = "Edit merge request ##{@merge_request.id}"
 %hr
 = render 'form'

diff --git a/app/views/projects/merge_requests/show/_how_to_merge.html.haml b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
index 7f1e334..3864e3b 100644 (file)
--- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml
+++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
@@ -1,6 +1,6 @@
 %div#modal_merge_info.modal.hide
   .modal-header
-    %a.close{href: "#"} ×
+    %a.close{href: "#", "data-dismiss" => "modal"} ×
     %h3 How To Merge
   .modal-body
     %p

diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index 01378d9..9154371 100644 (file)
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -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"
@@ -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