Commit 83925ef4 authored by Douwe Maan's avatar Douwe Maan Committed by Fatih Acet

Use a regular flash message after resolution is complete

parent 1711a384
...@@ -165,8 +165,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -165,8 +165,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
begin begin
MergeRequests::ResolveService.new(@merge_request.source_project, current_user, params).execute(@merge_request) MergeRequests::ResolveService.new(@merge_request.source_project, current_user, params).execute(@merge_request)
flash[:conflicts_message] = 'Merge conflicts resolved.' flash[:notice] = 'All merge conflicts were resolved. The merge request can now be merged.'
flash.keep
render json: { redirect_to: namespace_project_merge_request_url(@project.namespace, @project, @merge_request, resolved_conflicts: true) } render json: { redirect_to: namespace_project_merge_request_url(@project.namespace, @project, @merge_request, resolved_conflicts: true) }
rescue Gitlab::Conflict::File::MissingResolution => e rescue Gitlab::Conflict::File::MissingResolution => e
......
...@@ -42,9 +42,3 @@ ...@@ -42,9 +42,3 @@
.ci_widget.ci-error{style: "display:none"} .ci_widget.ci-error{style: "display:none"}
= icon("times-circle") = icon("times-circle")
Could not connect to the CI server. Please check your settings and try again. Could not connect to the CI server. Please check your settings and try again.
- if flash[:conflicts_message]
.mr-widget-heading
.ci_widget
= ci_icon_for_status('success')
= flash[:conflicts_message]
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment