Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 9 deletions

diff --git a/app/models/concerns/spammable.rb b/app/models/concerns/spammable.rb
index 7c12fe29ade..4fbb5dcb649 100644
--- a/app/models/concerns/spammable.rb
+++ b/app/models/concerns/spammable.rb
@@ -37,15 +37,23 @@ module Spammable
     end
   end
 
+  def needs_recaptcha!
+    self.errors.add(:base, "Your #{spammable_entity_type} has been recognized as spam. "\
+                  "Please, change the content or solve the reCAPTCHA to proceed.")
+  end
+
+  def unrecoverable_spam_error!
+    self.errors.add(:base, "Your #{spammable_entity_type} has been recognized as spam and has been discarded.")
+  end
+
   def invalidate_if_spam
-    error_msg = if Gitlab::Recaptcha.enabled?
-                  "Your #{spammable_entity_type} has been recognized as spam. "\
-                  "Please, change the content or solve the reCAPTCHA to proceed."
-                else
-                  "Your #{spammable_entity_type} has been recognized as spam and has been discarded."
-                end
-
-    self.errors.add(:base, error_msg) if spam?
+    return unless spam?
+
+    if Gitlab::Recaptcha.enabled?
+      needs_recaptcha!
+    else
+      unrecoverable_spam_error!
+    end
   end
 
   def spammable_entity_type
diff --git a/app/views/shared/issuable/form/_branch_chooser.html.haml b/app/views/shared/issuable/form/_branch_chooser.html.haml
index 8d9e5ddf065..d8253924e0a 100644
--- a/app/views/shared/issuable/form/_branch_chooser.html.haml
+++ b/app/views/shared/issuable/form/_branch_chooser.html.haml
@@ -12,7 +12,7 @@
       = _('From <code>%{source_title}</code> into').html_safe % { source_title: source_title }
 
     - if issuable.new_record?
-      %code= target_title
+      %code#js-target-branch-title= target_title
       &nbsp;
       = link_to _('Change branches'), mr_change_branches_path(issuable)
     - elsif issuable.for_fork?