From 5934698fc3b7aaf6623959a9740e62ed3d341a42 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Mon, 3 Oct 2016 16:14:17 -0500
Subject: [PATCH 1/4] fix broken string interpolation

---
 app/views/projects/commit/_change.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml
index f6e3d5e76f5..59af45ee1ed 100644
--- a/app/views/projects/commit/_change.html.haml
+++ b/app/views/projects/commit/_change.html.haml
@@ -13,7 +13,7 @@
         %a.close{href: "#", "data-dismiss" => "modal"} ×
         %h3.page-title== #{label} this #{commit.change_type_title(current_user)}
       .modal-body
-        = form_tag send("#{type.underscore}_namespace_project_commit_path", @project.namespace, @project, commit.id), method: :post, remote: false, class: 'form-horizontal js-#{type}-form js-requires-input' do
+        = form_tag send("#{type.underscore}_namespace_project_commit_path", @project.namespace, @project, commit.id), method: :post, remote: false, class: "form-horizontal js-#{type}-form js-requires-input" do
           .form-group.branch
             = label_tag 'target_branch', target_label, class: 'control-label'
             .col-sm-10

From 7876e83d0c91e75b91e21ddb9993fc39fde96731 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Mon, 3 Oct 2016 17:04:23 -0500
Subject: [PATCH 2/4] remove unnecessary nonce id

---
 app/views/projects/commit/_change.html.haml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml
index 59af45ee1ed..e38ee6a2afa 100644
--- a/app/views/projects/commit/_change.html.haml
+++ b/app/views/projects/commit/_change.html.haml
@@ -23,9 +23,8 @@
               - if can?(current_user, :push_code, @project)
                 .js-create-merge-request-container
                   .checkbox
-                    - nonce = SecureRandom.hex
-                    = label_tag "create_merge_request-#{nonce}" do
-                      = check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request', id: "create_merge_request-#{nonce}"
+                    = label_tag do
+                      = check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request'
                       Start a <strong>new merge request</strong> with these changes
               - else
                 = hidden_field_tag 'create_merge_request', 1

From 79aad815272fdebca30080cb33dd3fa77ef72350 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 5 Oct 2016 10:12:46 -0500
Subject: [PATCH 3/4] fix awkward verb conjugation in cherry-pick and revert
 errors

---
 app/services/commits/change_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/commits/change_service.rb b/app/services/commits/change_service.rb
index db5f2bf9b2e..4d410f66c55 100644
--- a/app/services/commits/change_service.rb
+++ b/app/services/commits/change_service.rb
@@ -35,7 +35,7 @@ module Commits
         success
       else
         error_msg = "Sorry, we cannot #{action.to_s.dasherize} this #{@commit.change_type_title(current_user)} automatically.
-                     It may have already been #{action.to_s.dasherize}, or a more recent commit may have updated some of its content."
+                     A #{action.to_s.dasherize} may have already been performed with this #{@commit.change_type_title(current_user)}, or a more recent commit may have updated some of its content."
         raise ChangeError, error_msg
       end
     end

From 130cbc979aff4ce746cabc7d319a34904b1fd611 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Sat, 10 Dec 2016 00:44:04 -0600
Subject: [PATCH 4/4] prevent create_merge_request form field helpers from
 generating an id value

---
 app/views/projects/commit/_change.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml
index e38ee6a2afa..782f558e8b0 100644
--- a/app/views/projects/commit/_change.html.haml
+++ b/app/views/projects/commit/_change.html.haml
@@ -24,10 +24,10 @@
                 .js-create-merge-request-container
                   .checkbox
                     = label_tag do
-                      = check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request'
+                      = check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request', id: nil
                       Start a <strong>new merge request</strong> with these changes
               - else
-                = hidden_field_tag 'create_merge_request', 1
+                = hidden_field_tag 'create_merge_request', 1, id: nil
           .form-actions
             = submit_tag label, class: 'btn btn-create'
             = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal"