Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 4 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 6be14abe744..1f7760276bc 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -262,8 +262,6 @@ class MergeRequest < ApplicationRecord
 
   RebaseLockTimeout = Class.new(StandardError)
 
-  REBASE_LOCK_MESSAGE = _("Failed to enqueue the rebase operation, possibly due to a long-lived transaction. Try again later.")
-
   def self.reference_prefix
     '!'
   end
@@ -1514,7 +1512,7 @@ class MergeRequest < ApplicationRecord
     end
   rescue ActiveRecord::LockWaitTimeout => e
     Gitlab::ErrorTracking.track_exception(e)
-    raise RebaseLockTimeout, REBASE_LOCK_MESSAGE
+    raise RebaseLockTimeout, _('Failed to enqueue the rebase operation, possibly due to a long-lived transaction. Try again later.')
   end
 
   def source_project_variables
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index 48c96203921..f4666197def 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -7,7 +7,8 @@ class ProjectWiki
   MARKUPS = {
     'Markdown' => :markdown,
     'RDoc'     => :rdoc,
-    'AsciiDoc' => :asciidoc
+    'AsciiDoc' => :asciidoc,
+    'Org'      => :org
   }.freeze unless defined?(MARKUPS)
 
   CouldNotCreateWikiError = Class.new(StandardError)