Error message needs to be correct.
This commit is contained in:
parent
207bc8a0e7
commit
7435b879a6
1 changed files with 1 additions and 1 deletions
|
@ -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…
Reference in a new issue