Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 0 deletions

diff --git a/config/routes/merge_requests.rb b/config/routes/merge_requests.rb
index f6c45081ce0..b2635a7fa74 100644
--- a/config/routes/merge_requests.rb
+++ b/config/routes/merge_requests.rb
@@ -55,6 +55,15 @@ resources :merge_requests, concerns: :awardable, except: [:new, :create, :show],
       delete :resolve, action: :unresolve
     end
   end
+
+  scope module: :merge_requests do
+    resources :drafts, only: [:index, :update, :create, :destroy] do
+      collection do
+        post :publish
+        delete :discard
+      end
+    end
+  end
 end
 
 scope path: 'merge_requests', controller: 'merge_requests/creations' do