diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-07 04:41:23 +0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-13 04:03:14 +0300 |
| commit | 3fcab51ebb0f3156b5d732d050b292cd3e081262 (patch) | |
| tree | 7292079f50121aae6e457bfd3dadb944fb2feeec /app/controllers/projects/merge_requests | |
| parent | 9cc15172deaa4582c5fd956cc163539041d018b1 (diff) | |
Refactor conflict resolution to contain git ops within Gitlab::Git
This prepares the codebase for a Gitaly migration. See
https://gitlab.com/gitlab-org/gitaly/issues/553
Diffstat (limited to 'app/controllers/projects/merge_requests')
| -rw-r--r-- | app/controllers/projects/merge_requests/conflicts_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests/conflicts_controller.rb b/app/controllers/projects/merge_requests/conflicts_controller.rb index 28afef101a9..39814c1795c 100644 --- a/app/controllers/projects/merge_requests/conflicts_controller.rb +++ b/app/controllers/projects/merge_requests/conflicts_controller.rb @@ -53,7 +53,7 @@ class Projects::MergeRequests::ConflictsController < Projects::MergeRequests::Ap flash[:notice] = 'All merge conflicts were resolved. The merge request can now be merged.' render json: { redirect_to: project_merge_request_url(@project, @merge_request, resolved_conflicts: true) } - rescue Gitlab::Conflict::ResolutionError => e + rescue Gitlab::Git::Merge::ResolutionError => e render status: :bad_request, json: { message: e.message } end end |