diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-09-01 22:23:08 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-09-01 22:23:08 +0300 |
| commit | 223849fa173b7059e717ba4f9c02075a452cbd49 (patch) | |
| tree | 19dd9e840010234164a4461ac081889c07e05c9a /app/views/profiles | |
| parent | dd825c0f5d00cef3cac89480bcf2027064c5d89d (diff) | |
| parent | 29b40db58944a32db6cf1ae9906653a2e5f4be9d (diff) | |
Merge branch '17849-allow-admin-to-restrict-min-key-length-and-techno' into 'master'
Add settings for minimum key strength and allowed key type
Closes #17849
See merge request !13712
Diffstat (limited to 'app/views/profiles')
| -rw-r--r-- | app/views/profiles/keys/_key.html.haml | 8 | ||||
| -rw-r--r-- | app/views/profiles/keys/_key_details.html.haml | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/views/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml index d2a60ac2867..103446243e5 100644 --- a/app/views/profiles/keys/_key.html.haml +++ b/app/views/profiles/keys/_key.html.haml @@ -1,6 +1,12 @@ %li.key-list-item .pull-left.append-right-10 - = icon 'key', class: "settings-list-icon hidden-xs" + - if key.valid? + = icon 'key', class: 'settings-list-icon hidden-xs' + - else + = icon 'exclamation-triangle', class: 'settings-list-icon hidden-xs has-tooltip', + title: key.errors.full_messages.join(', ') + + .key-list-item-info = link_to path_to_key(key, is_admin), class: "title" do = key.title diff --git a/app/views/profiles/keys/_key_details.html.haml b/app/views/profiles/keys/_key_details.html.haml index d44603c638c..77521417f47 100644 --- a/app/views/profiles/keys/_key_details.html.haml +++ b/app/views/profiles/keys/_key_details.html.haml @@ -16,6 +16,7 @@ %strong= @key.last_used_at.try(:to_s, :medium) || 'N/A' .col-md-8 + = form_errors(@key, type: 'key') unless @key.valid? %p %span.light Fingerprint: %code.key-fingerprint= @key.fingerprint |