summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2016-10-05 10:12:46 -0500
committerMike Greiling <mike@pixelcog.com>2016-10-05 10:12:46 -0500
commita4a8ff65f330cd2917c92d0419b4ebe07660bc8c (patch)
tree87bedb9de4169267e61dfe36d04e0045685296ba
parentc7617dd086b53d77994c87fc7e3bf89996e611dc (diff)
downloadgitlab-ce-21812-fix-cherry-pick-source-project.tar.gz
fix awkward verb conjugation in cherry-pick and revert errors21812-fix-cherry-pick-source-project
-rw-r--r--app/services/commits/change_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/commits/change_service.rb b/app/services/commits/change_service.rb
index 1c82599c579..8c257a89044 100644
--- a/app/services/commits/change_service.rb
+++ b/app/services/commits/change_service.rb
@@ -35,7 +35,7 @@ module Commits
success
else
error_msg = "Sorry, we cannot #{action.to_s.dasherize} this #{@commit.change_type_title} automatically.
- It may have already been #{action.to_s.dasherize}, or a more recent commit may have updated some of its content."
+ A #{action.to_s.dasherize} may have already been performed with this #{@commit.change_type_title}, or a more recent commit may have updated some of its content."
raise ChangeError, error_msg
end
end