Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-09-03 14:06:26 +0300
committerNick Thomas <nick@gitlab.com>2018-09-03 14:06:26 +0300
commit0e05e3a0ff751868edf76c1a220b2154462eec6e (patch)
tree887d1e32afb07716306b07f5872ae50783a622b8 /app/helpers
parent4ee68672e4078c339d93acaf414332ac7200774c (diff)
parent9dcbeca88955a02358b507730931e390dcfc63af (diff)
Merge branch 'fix-download-dropdown-link' into 'master'
Hide PAT creation advice for HTTP clone if PAT exists Closes #44111 See merge request gitlab-org/gitlab-ce!18208
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/button_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb
index 7adc882bc47..26e3850a540 100644
--- a/app/helpers/button_helper.rb
+++ b/app/helpers/button_helper.rb
@@ -67,7 +67,7 @@ module ButtonHelper
def http_dropdown_description(protocol)
if current_user.try(:require_password_creation_for_git?)
_("Set a password on your account to pull or push via %{protocol}.") % { protocol: protocol }
- else
+ elsif current_user.try(:require_personal_access_token_creation_for_git_auth?)
_("Create a personal access token on your account to pull or push via %{protocol}.") % { protocol: protocol }
end
end