diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-16 10:19:59 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-16 10:19:59 +0000 |
commit | 75f94fc39bedbc635bd4bc52cdf145d1e81752dd (patch) | |
tree | c0a63ac57dedb7e6f16f8689f68f3c0ac49efdde | |
parent | 4790e726d31562b68fec283173e9885df8a5cdda (diff) | |
parent | e6cbf40263ccf160cc97216e395e5c8ede8d13d2 (diff) | |
download | gitlab-ce-75f94fc39bedbc635bd4bc52cdf145d1e81752dd.tar.gz |
Merge branch 'registry-ux-improvements-remove-clipboard-prefix' into 'master'
Remove docker pull prefix from registry clipboard feature
Closes #46314 and #45968
See merge request gitlab-org/gitlab-ce!18933
3 files changed, 7 insertions, 11 deletions
diff --git a/app/assets/javascripts/registry/components/collapsible_container.vue b/app/assets/javascripts/registry/components/collapsible_container.vue index a03180e80e6..2ce43ef0125 100644 --- a/app/assets/javascripts/registry/components/collapsible_container.vue +++ b/app/assets/javascripts/registry/components/collapsible_container.vue @@ -28,11 +28,6 @@ isOpen: false, }; }, - computed: { - clipboardText() { - return `docker pull ${this.repo.location}`; - }, - }, methods: { ...mapActions([ 'fetchRepos', @@ -84,7 +79,7 @@ <clipboard-button v-if="repo.location" - :text="clipboardText" + :text="repo.location" :title="repo.location" css-class="btn-default btn-transparent btn-clipboard" /> diff --git a/app/assets/javascripts/registry/components/table_registry.vue b/app/assets/javascripts/registry/components/table_registry.vue index a2227b2f554..673b1db6769 100644 --- a/app/assets/javascripts/registry/components/table_registry.vue +++ b/app/assets/javascripts/registry/components/table_registry.vue @@ -56,10 +56,6 @@ .catch(() => this.showError(errorMessagesTypes.FETCH_REGISTRY)); }, - clipboardText(text) { - return `docker pull ${text}`; - }, - showError(message) { Flash(errorMessages[message]); }, @@ -89,7 +85,7 @@ <clipboard-button v-if="item.location" :title="item.location" - :text="clipboardText(item.location)" + :text="item.location" css-class="btn-default btn-transparent btn-clipboard" /> </td> diff --git a/changelogs/unreleased/registry-ux-improvements-remove-clipboard-prefix.yml b/changelogs/unreleased/registry-ux-improvements-remove-clipboard-prefix.yml new file mode 100644 index 00000000000..ddf7f51aa5e --- /dev/null +++ b/changelogs/unreleased/registry-ux-improvements-remove-clipboard-prefix.yml @@ -0,0 +1,5 @@ +--- +title: Remove docker pull prefix from registry clipboard feature +merge_request: 18933 +author: Lars Greiss +type: changed |