diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-06-29 12:06:35 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-07-05 11:11:59 -0500 |
| commit | fe13f110412d85c05dc68e5ee1db499f681bf722 (patch) | |
| tree | 4a2d172bb5a490ac8cadbcf376fbf815393ef22b /app/controllers/projects/merge_requests/conflicts_controller.rb | |
| parent | dc7939337e0d72d2391c3bbb3082d644a54195af (diff) | |
| download | gitlab-ce-fe13f110412d85c05dc68e5ee1db499f681bf722.tar.gz | |
Create and use project path helpers that only need a project, no namespace
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 a71f23e790d..28afef101a9 100644 --- a/app/controllers/projects/merge_requests/conflicts_controller.rb +++ b/app/controllers/projects/merge_requests/conflicts_controller.rb @@ -52,7 +52,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: namespace_project_merge_request_url(@project.namespace, @project, @merge_request, resolved_conflicts: true) } + render json: { redirect_to: project_merge_request_url(@project, @merge_request, resolved_conflicts: true) } rescue Gitlab::Conflict::ResolutionError => e render status: :bad_request, json: { message: e.message } end |