diff options
author | Mike Greiling <mike@pixelcog.com> | 2016-10-05 10:12:46 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2016-12-10 00:56:52 -0600 |
commit | 79aad815272fdebca30080cb33dd3fa77ef72350 (patch) | |
tree | 33ee6cd1bbdf316767d43180688fb249a9329941 /app/services/commits | |
parent | 7876e83d0c91e75b91e21ddb9993fc39fde96731 (diff) | |
download | gitlab-ce-79aad815272fdebca30080cb33dd3fa77ef72350.tar.gz |
fix awkward verb conjugation in cherry-pick and revert errors
Diffstat (limited to 'app/services/commits')
-rw-r--r-- | app/services/commits/change_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/commits/change_service.rb b/app/services/commits/change_service.rb index db5f2bf9b2e..4d410f66c55 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(current_user)} 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(current_user)}, or a more recent commit may have updated some of its content." raise ChangeError, error_msg end end |