diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-09 16:40:37 -0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-12 22:03:15 -0300 |
| commit | faa9bd402d3521b3f7b4cc2583f8ef1b3cceb821 (patch) | |
| tree | 550ca6c6907c1075d8c0a4092710c500dcf12329 /app/controllers/projects/merge_requests/conflicts_controller.rb | |
| parent | 3fcab51ebb0f3156b5d732d050b292cd3e081262 (diff) | |
| download | gitlab-ce-faa9bd402d3521b3f7b4cc2583f8ef1b3cceb821.tar.gz | |
Create a Gitlab::Git submodule for conlict-related files
Rename classes to (hopefully) clearer names while we're doing that.
Diffstat (limited to 'app/controllers/projects/merge_requests/conflicts_controller.rb')
| -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 39814c1795c..366524b0783 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::Git::Merge::ResolutionError => e + rescue Gitlab::Git::Conflict::Resolver::ResolutionError => e render status: :bad_request, json: { message: e.message } end end |