diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-08 15:45:56 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 13:14:52 -0500 |
| commit | 9d4c105ab0054d99ae43675e758af6b8098a191a (patch) | |
| tree | 3c731a900c7eeb3281b049e6db6bab80019b528a /app/controllers | |
| parent | a28eef1d1a871c14142d01f1ef8c76660da34c21 (diff) | |
| download | gitlab-ce-9d4c105ab0054d99ae43675e758af6b8098a191a.tar.gz | |
Remove code introduced when endpoint was in MR controller.
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index fc3b28c0f26..9d588c370aa 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -2,8 +2,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController before_action :module_enabled before_action :merge_request, only: [ :edit, :update, :show, :diffs, :commits, :builds, :merge, :merge_check, - :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, - :revert + :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds ] before_action :closes_issues, only: [:edit, :update, :show, :diffs, :commits, :builds] before_action :validates_merge_request, only: [:show, :diffs, :commits, :builds] |