Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
26eac21fc744
Commit
83925ef4
authored
Aug 10, 2016
by
Douwe Maan
Committed by
Fatih Acet
Aug 12, 2016
Browse files
Use a regular flash message after resolution is complete
parent
abc8d099dfca
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/controllers/projects/merge_requests_controller.rb
View file @
26eac21f
...
...
@@ -165,8 +165,7 @@ def resolve_conflicts
begin
MergeRequests
::
ResolveService
.
new
(
@merge_request
.
source_project
,
current_user
,
params
).
execute
(
@merge_request
)
flash
[
:conflicts_message
]
=
'Merge conflicts resolved.'
flash
.
keep
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
)
}
rescue
Gitlab
::
Conflict
::
File
::
MissingResolution
=>
e
...
...
app/views/projects/merge_requests/widget/_heading.html.haml
View file @
26eac21f
...
...
@@ -42,9 +42,3 @@
.ci_widget.ci-error
{
style:
"display:none"
}
=
icon
(
"times-circle"
)
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
]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment