kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Error message needs to be correct.

Browse source
This commit is contained in:
Marin Jankovski 2014-07-14 12:11:01 +02:00
parent 207bc8a0e7
commit 7435b879a6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/projects/merge_requests_controller.rb
View file

@ -105,7 +105,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@suppress_diff = Commit::diff_suppress?(@diffs, diff_line_count)
@force_suppress_diff = @suppress_diff
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