diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-12-10 01:27:56 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-12-10 01:27:56 +0800 |
| commit | e0df1b5f9944cff1ee7234c9fa292a7a06456c08 (patch) | |
| tree | bd3e760fb41f1974bd6aac0ccefbc6f97cdce04f /app/services/commits | |
| parent | 3e01385bca92dc8c0df3aa4032cc58d708dc0ff5 (diff) | |
| parent | ad4c2a08104cba0557d824fac6a70eedd45921b7 (diff) | |
| download | gitlab-ce-e0df1b5f9944cff1ee7234c9fa292a7a06456c08.tar.gz | |
Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file
* upstream/master: (60 commits)
Refactor SSH keys docs
Improvements to setting up ssh
Do not reload diff for merge request made from fork when target branch in fork is updated
Add 8.12.10, 8.12.11, and 8.12.12 CHANGELOG.md items
Changes after review
Fix broken test
Adds CHANGELOG entry
Adds tests
Uniformize props name format
Replace commit icon svg logic
Replace play icon svg logic
Update docs to reflect new defaults on omnibus
Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'
Merge branch 'html-safe-diff-line-content' into 'security'
Merge branch 'rs-filter-authentication_token' into 'security'
Merge branch 'destroy-session' into 'security'
remove unnecessary issues event filter on comments tab
Updating reference to database password
Add CHANGELOG entry
Displays milestone remaining days only when it's present
...
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 d49fcd42a08..99d459908e7 100644 --- a/app/services/commits/change_service.rb +++ b/app/services/commits/change_service.rb @@ -41,7 +41,7 @@ module Commits success else - error_msg = "Sorry, we cannot #{action.to_s.dasherize} this #{@commit.change_type_title} automatically. + 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." raise ChangeError, error_msg end |