Merge remote-tracking branch 'origin/CLDC-2100-delete-merge-request' into CLDC-2100-delete-merge-request

# Conflicts: # app/views/merge_requests/delete_confirmation.html.erb # config/routes.rb
2 years ago · 8dc9d18353
1 changed files with 5 additions and 0 deletions
--- a/app/controllers/merge_requests_controller.rb
+++ b/app/controllers/merge_requests_controller.rb
@ -47,6 +47,11 @@ class MergeRequestsController < ApplicationController
    redirect_to organisations_path(anchor: "merge-requests")
  end

+  def delete
+    @merge_request.discard!
+    redirect_to organisations_path(anchor: "merge-requests")
+  end
+
 private

  def page