diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2019-04-07 17:40:39 +0100 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2019-05-03 01:06:34 +0100 |
| commit | 102468d3a9afb407f2da2f76cae6c09bb9e4be66 (patch) | |
| tree | 60d56a2c250918df223f5a4926bf3697ca66b336 | |
| parent | 3d72e5739934fe73bc15fa2163bc2df0e7730c76 (diff) | |
| download | gitlab-ce-its-simple-just-destroy-the-mirrors.tar.gz | |
Add clipboard copy btn to pull ssh public keysits-simple-just-destroy-the-mirrors
Push mirrors have a copy to clipboard button for their
public ssh keys, this commit adds it to pull mirror rows.
| -rw-r--r-- | app/views/layouts/_flash.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/ce-its-simple-just-destroy-the-mirrors.yml | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 9 |
3 files changed, 3 insertions, 11 deletions
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml index dab6f5e8725..2cdaa85bdaa 100644 --- a/app/views/layouts/_flash.html.haml +++ b/app/views/layouts/_flash.html.haml @@ -3,7 +3,8 @@ .flash-container.flash-container-page -# We currently only support `alert`, `notice`, `success` - flash.each do |key, value| - - if value.is_a? String + -# Don't show a flash message if the message is nil + - if value %div{ class: "flash-#{key}" } %div{ class: "#{(container_class unless fluid_layout)} #{(extra_flash_class unless @no_container)} #{@content_class}" } %span= value diff --git a/changelogs/unreleased/ce-its-simple-just-destroy-the-mirrors.yml b/changelogs/unreleased/ce-its-simple-just-destroy-the-mirrors.yml index 9bcc646d91e..ac5fc27cf36 100644 --- a/changelogs/unreleased/ce-its-simple-just-destroy-the-mirrors.yml +++ b/changelogs/unreleased/ce-its-simple-just-destroy-the-mirrors.yml @@ -1,5 +1,5 @@ --- title: Destroy project remote mirrors instead of disabling -merge_request: 26444 +merge_request: 27087 author: type: security diff --git a/locale/gitlab.pot b/locale/gitlab.pot index fbb70902114..7d57028f6a5 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -2784,9 +2784,6 @@ msgstr "" msgid "Copy SSH public key" msgstr "" -msgid "Copy SSH public key to clipboard" -msgstr "" - msgid "Copy URL to clipboard" msgstr "" @@ -4732,9 +4729,6 @@ msgstr "" msgid "Help page text and support page url." msgstr "" -msgid "Here is the public SSH key that needs to be added to the remote server. For more information, please refer to the documentation." -msgstr "" - msgid "Hide file browser" msgstr "" @@ -10118,9 +10112,6 @@ msgstr "" msgid "Unable to load the diff. %{button_try_again}" msgstr "" -msgid "Unable to regenerate public ssh key." -msgstr "" - msgid "Unable to resolve" msgstr "" |