Skip to content
Snippets Groups Projects
Commit 7435b879 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Error message needs to be correct.

parent 207bc8a0
No related branches found
No related tags found
No related merge requests found
Loading
@@ -105,7 +105,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
Loading
@@ -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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment