diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 15:07:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 15:07:58 +0300 |
| commit | 93c6764dacd4c605027ef1cd367d3aebe420b223 (patch) | |
| tree | 5213b1fc874ee3e31701a81007f97d7664b95205 /app/views/profiles | |
| parent | aa10b541b6a3fbc7fa712abcc59d073fc8dc620a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/profiles')
| -rw-r--r-- | app/views/profiles/accounts/_providers.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/gpg_keys/_key.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/keys/_key.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/passwords/edit.html.haml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/profiles/accounts/_providers.html.haml b/app/views/profiles/accounts/_providers.html.haml index 068f9cc70f7..dc17de1b220 100644 --- a/app/views/profiles/accounts/_providers.html.haml +++ b/app/views/profiles/accounts/_providers.html.haml @@ -16,6 +16,6 @@ %a.provider-btn = s_('Profiles|Active') - elsif link_allowed - = link_to omniauth_authorize_path(:user, provider), method: :post, class: 'provider-btn not-active' do + = link_to omniauth_authorize_path(:user, provider), method: :post, class: 'provider-btn gl-bg-blue-500' do = s_('Profiles|Connect') = render_if_exists 'profiles/accounts/group_saml_unlink_buttons', group_saml_identities: group_saml_identities diff --git a/app/views/profiles/gpg_keys/_key.html.haml b/app/views/profiles/gpg_keys/_key.html.haml index f8351644df5..2de5cf2f506 100644 --- a/app/views/profiles/gpg_keys/_key.html.haml +++ b/app/views/profiles/gpg_keys/_key.html.haml @@ -5,7 +5,7 @@ - key.emails_with_verified_status.map do |email, verified| = render partial: 'shared/email_with_badge', locals: { email: email, verified: verified } - .description + %span.text-truncate %code= key.fingerprint - if key.subkeys.present? .subkeys diff --git a/app/views/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml index b9d73d89334..0e94e6563fd 100644 --- a/app/views/profiles/keys/_key.html.haml +++ b/app/views/profiles/keys/_key.html.haml @@ -10,7 +10,7 @@ .key-list-item-info = link_to path_to_key(key, is_admin), class: "title" do = key.title - .description + %span.text-truncate = key.fingerprint .last-used-at last used: diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml index 0e2b0430fec..af6fa6b1b61 100644 --- a/app/views/profiles/passwords/edit.html.haml +++ b/app/views/profiles/passwords/edit.html.haml @@ -32,4 +32,4 @@ .prepend-top-default.append-bottom-default = f.submit _('Save password'), class: "btn btn-success append-right-10", data: { qa_selector: 'save_password_button' } - unless @user.password_automatically_set? - = link_to _('I forgot my password'), reset_profile_password_path, method: :put, class: "account-btn-link" + = link_to _('I forgot my password'), reset_profile_password_path, method: :put |