diff options
| author | Robin Bobbitt <ryehle@us.ibm.com> | 2017-06-12 19:13:22 +0300 |
|---|---|---|
| committer | Robin Bobbitt <ryehle@us.ibm.com> | 2017-06-26 21:41:27 +0300 |
| commit | 7eb26c7ff7a78df9cb8fe5b30d48c80ce4eb8a99 (patch) | |
| tree | e2add1651b79dd3a24a524f165a0b14fee8e8804 /app/helpers/button_helper.rb | |
| parent | 4988c3a8740324fbc7e66e67a8373d783f9c1ae4 (diff) | |
Provide hint to create a personal access token for Git over HTTP
If internal auth is disabled and user is not an LDAP user, present
the user with an alert to create a personal access token if he does
not have one already.
Diffstat (limited to 'app/helpers/button_helper.rb')
| -rw-r--r-- | app/helpers/button_helper.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb index 00464810054..ba84dbe4a7a 100644 --- a/app/helpers/button_helper.rb +++ b/app/helpers/button_helper.rb @@ -50,10 +50,17 @@ module ButtonHelper def http_clone_button(project, placement = 'right', append_link: true) klass = 'http-selector' - klass << ' has-tooltip' if current_user.try(:require_password?) + klass << ' has-tooltip' if current_user.try(:require_password?) || current_user.try(:require_personal_access_token?) protocol = gitlab_config.protocol.upcase + tooltip_title = + if current_user.try(:require_password?) + _("Set a password on your account to pull or push via %{protocol}.") % { protocol: protocol } + else + _("Create a personal access token on your account to pull or push via %{protocol}.") % { protocol: protocol } + end + content_tag (append_link ? :a : :span), protocol, class: klass, href: (project.http_url_to_repo if append_link), @@ -61,7 +68,7 @@ module ButtonHelper html: true, placement: placement, container: 'body', - title: _("Set a password on your account to pull or push via %{protocol}") % { protocol: protocol } + title: tooltip_title } end |