diff options
author | Rémy Coutable <remy@rymai.me> | 2017-06-27 10:29:45 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-06-27 10:29:45 +0000 |
commit | 6a2186c7e4d94a6d85573dd207be615a4a4d1b04 (patch) | |
tree | 984284f01148ae3cfd948fb79081b2f392639c79 /app/helpers | |
parent | 7e9a52d05bf3378c5bb730fd54b4da4db1e705be (diff) | |
parent | 7eb26c7ff7a78df9cb8fe5b30d48c80ce4eb8a99 (diff) | |
download | gitlab-ce-6a2186c7e4d94a6d85573dd207be615a4a4d1b04.tar.gz |
Merge branch 'pat-alert-when-signin-disabled' into 'master'
Provide hint to create a personal access token for Git over HTTP
See merge request !12105
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/button_helper.rb | 11 | ||||
-rw-r--r-- | app/helpers/projects_helper.rb | 17 |
2 files changed, 26 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 diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index d10e0bd45b0..c04b1419a19 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -198,6 +198,23 @@ module ProjectsHelper .load_in_batch_for_projects(projects) end + def show_no_ssh_key_message? + cookies[:hide_no_ssh_message].blank? && !current_user.hide_no_ssh_key && current_user.require_ssh_key? + end + + def show_no_password_message? + cookies[:hide_no_password_message].blank? && !current_user.hide_no_password && + ( current_user.require_password? || current_user.require_personal_access_token? ) + end + + def link_to_set_password + if current_user.require_password? + link_to s_('SetPasswordToCloneLink|set a password'), edit_profile_password_path + else + link_to s_('CreateTokenToCloneLink|create a personal access token'), profile_personal_access_tokens_path + end + end + private def repo_children_classes(field) |