From 46f8e6421adc9e2e30c8c3f58fe0e00ae326f0c5 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Thu, 4 Aug 2016 14:32:10 +0100 Subject: [PATCH] Remove undo endpoint This reverts commit 2536fea8db0967a817615eb3e951eb6ba22f8ede. --- .../projects/merge_requests_controller.rb | 13 +------------ config/routes.rb | 1 - .../projects/merge_requests_controller_spec.rb | 13 ------------- 3 files changed, 1 insertion(+), 26 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 diff --git a/config/routes.rb b/config/routes.rb index 91d33ea43e9..93da084b64a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -729,7 +729,6 @@ Rails.application.routes.draw do post :remove_wip get :diff_for_path post :resolve_conflicts - post :undo_last_resolution end collection do diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 7d1028c11bf..88bab0c08e8 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -639,19 +639,6 @@ describe Projects::MergeRequestsController do it 'returns an OK resposne' do expect(response).to have_http_status(:ok) end - - context 'undoing the resolution' do - before do - post :undo_last_resolution, - namespace_id: merge_request_with_conflicts.project.namespace.to_param, - project_id: merge_request_with_conflicts.project.to_param, - id: merge_request_with_conflicts.iid - end - - it 'undoes the commit' do - expect(original_head_sha).to eq(merge_request_with_conflicts.source_branch_head.sha) - end - end end context 'when sections are missing' do