diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-04 14:32:10 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:48 +0300 |
| commit | 46f8e6421adc9e2e30c8c3f58fe0e00ae326f0c5 (patch) | |
| tree | e5ff7d04b24622ce52d87fe1c34867a41d78f3a7 /app/controllers | |
| parent | ba327e69ec4b2214f12f577cd86a37c65ea2f3e9 (diff) | |
| download | gitlab-ce-46f8e6421adc9e2e30c8c3f58fe0e00ae326f0c5.tar.gz | |
Remove undo endpoint
This reverts commit 2536fea8db0967a817615eb3e951eb6ba22f8ede.
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 27d54f6b46f..2e6ebdf1d94 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -10,8 +10,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController before_action :module_enabled before_action :merge_request, only: [ :edit, :update, :show, :diffs, :commits, :conflicts, :builds, :merge, :merge_check, - :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts, - :undo_last_resolution + :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts ] before_action :validates_merge_request, only: [:show, :diffs, :commits, :builds] before_action :define_show_vars, only: [:show, :diffs, :commits, :conflicts, :builds] @@ -158,16 +157,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController end end - def undo_last_resolution - rugged = @merge_request.project.repository.rugged - ref = Gitlab::Git::BRANCH_REF_PREFIX + @merge_request.source_branch - prev = rugged.ref(ref).target - - rugged.references.update(ref, prev.parents.first.oid) if prev.parents.length == 2 - - head :ok - end - def builds respond_to do |format| format.html do |