diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-05-28 12:53:58 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-05-28 12:53:58 +0300 |
commit | a45b9fc96ca568b19fd9d09a8b40846c2c8b5b36 (patch) | |
tree | ecc3e3274e9d13be5c294068d44ff12b9d92ccb8 /lib | |
parent | 5f5fc69dde0d7098b72b047090c8a4f56d495002 (diff) | |
parent | 7a139c1602016485b8a2038dfc6121e47039c669 (diff) |
Merge branch 'bvl-add-username-to-terms-message' into 'master'
Add username to terms message in git and API calls
Closes #46649
See merge request gitlab-org/gitlab-ce!19126
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/auth/user_access_denied_reason.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/auth/user_access_denied_reason.rb b/lib/gitlab/auth/user_access_denied_reason.rb index af310aa12fc..1893cb001b2 100644 --- a/lib/gitlab/auth/user_access_denied_reason.rb +++ b/lib/gitlab/auth/user_access_denied_reason.rb @@ -8,12 +8,12 @@ module Gitlab def rejection_message case rejection_type when :internal - 'This action cannot be performed by internal users' + "This action cannot be performed by internal users" when :terms_not_accepted - 'You must accept the Terms of Service in order to perform this action. '\ - 'Please access GitLab from a web browser to accept these terms.' + "You (#{@user.to_reference}) must accept the Terms of Service in order to perform this action. "\ + "Please access GitLab from a web browser to accept these terms." else - 'Your account has been blocked.' + "Your account has been blocked." end end |