Commit 7435b879 authored by Marin Jankovski's avatar Marin Jankovski

Error message needs to be correct.

parent 207bc8a0
...@@ -105,7 +105,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -105,7 +105,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@suppress_diff = Commit::diff_suppress?(@diffs, diff_line_count) @suppress_diff = Commit::diff_suppress?(@diffs, diff_line_count)
@force_suppress_diff = @suppress_diff @force_suppress_diff = @suppress_diff
rescue Gitlab::Satellite::BranchesWithoutParent rescue Gitlab::Satellite::BranchesWithoutParent
@error = "Selected branches have no common commit so they cannot be compared." @error = "Selected branches have no common commit so they cannot be merged."
end end
end end
end end
......
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