diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-02 14:04:16 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:46 +0300 |
| commit | 3cc07e7e391a995361bb2523fef5e092570643f3 (patch) | |
| tree | 60bac8be0defedcdc72f3a3d86711f0259f5f29c | |
| parent | 3b84cfdc74e27c5f0b94187f5a15c95e3f292554 (diff) | |
| download | gitlab-ce-3cc07e7e391a995361bb2523fef5e092570643f3.tar.gz | |
Fix resolve_conflicts endpoint
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index abea9ced624..42dc0bb4a43 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -152,10 +152,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController def resolve_conflicts begin - Gitlab::Conflict::FileCollection.new(@merge_request).resolve_conflicts!(params[:merge_request], nil, user: current_user) + Gitlab::Conflict::FileCollection.new(@merge_request).resolve_conflicts!(params, user: current_user) - redirect_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), - notice: 'Merge conflicts resolved. The merge request can now be merged.' + head :ok rescue Gitlab::Conflict::File::MissingResolution => e render status: :bad_request, json: { message: e.message } end |