diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-10-11 16:08:34 +0000 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-10-11 16:43:59 -0500 |
| commit | d96d2f7df78c94883e23d663e5238ea93566bcb2 (patch) | |
| tree | f475c5ee4080d6d642fcab96df72063e5faab778 | |
| parent | 6ffcd1f4be63897dcea08c8ef03eafb2fb328451 (diff) | |
| download | gitlab-ce-d96d2f7df78c94883e23d663e5238ea93566bcb2.tar.gz | |
Merge branch 'gt-update-application-copy-secret-to-clipboard-data' into 'master'
Update copy to clipboard button data for application secret
Closes #52572
See merge request gitlab-org/gitlab-ce!22268
3 files changed, 7 insertions, 2 deletions
diff --git a/app/views/admin/applications/show.html.haml b/app/views/admin/applications/show.html.haml index e69143abe45..df3eeba907c 100644 --- a/app/views/admin/applications/show.html.haml +++ b/app/views/admin/applications/show.html.haml @@ -22,7 +22,7 @@ .input-group %input.label.label-monospace{ id: "secret", type: "text", autocomplete: 'off', value: @application.secret, readonly: true } .input-group-append - = clipboard_button(target: '#application_id', title: _("Copy secret to clipboard"), class: "btn btn btn-default") + = clipboard_button(target: '#secret', title: _("Copy secret to clipboard"), class: "btn btn btn-default") %tr %td = _('Callback URL') diff --git a/app/views/doorkeeper/applications/show.html.haml b/app/views/doorkeeper/applications/show.html.haml index 776bbc36ec2..cac00f9c854 100644 --- a/app/views/doorkeeper/applications/show.html.haml +++ b/app/views/doorkeeper/applications/show.html.haml @@ -25,7 +25,7 @@ .input-group %input.label.label-monospace{ id: "secret", type: "text", autocomplete: 'off', value: @application.secret, readonly: true } .input-group-append - = clipboard_button(target: '#application_id', title: _("Copy secret to clipboard"), class: "btn btn btn-default") + = clipboard_button(target: '#secret', title: _("Copy secret to clipboard"), class: "btn btn btn-default") %tr %td = _('Callback URL') diff --git a/changelogs/unreleased/gt-update-application-copy-secret-to-clipboard-data.yml b/changelogs/unreleased/gt-update-application-copy-secret-to-clipboard-data.yml new file mode 100644 index 00000000000..7205c138777 --- /dev/null +++ b/changelogs/unreleased/gt-update-application-copy-secret-to-clipboard-data.yml @@ -0,0 +1,5 @@ +--- +title: Update copy to clipboard button data for application secret +merge_request: 22268 +author: George Tsiolis +type: fixed |