From d014775d13add961624db1b59a5e582b0c58b29a Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Thu, 19 Apr 2018 13:57:12 +0300 Subject: Move discussion actions to the right for small viewports --- .../javascripts/notes/components/note_header.vue | 30 +++++++++++----------- app/assets/stylesheets/pages/notes.scss | 5 ---- 2 files changed, 15 insertions(+), 20 deletions(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue index c3d1ef1fcc6..fbfd6f92c85 100644 --- a/app/assets/javascripts/notes/components/note_header.vue +++ b/app/assets/javascripts/notes/components/note_header.vue @@ -62,6 +62,21 @@ export default { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 6d5c6cb136f..817c956da31 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -473,11 +473,6 @@ ul.notes { margin-left: 10px; color: $gray-darkest; - @include notes-media('max', $screen-md-max) { - float: none; - margin-left: 0; - } - .btn-group > .discussion-next-btn { margin-left: -1px; } -- cgit v1.2.1 From c866b5e4401ec50567b3eaa3bffa11bc3831850f Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Thu, 26 Apr 2018 11:46:43 +0300 Subject: Move note actions to the right --- app/assets/stylesheets/pages/notes.scss | 4 ---- 1 file changed, 4 deletions(-) (limited to 'app/assets') diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 817c956da31..42fe319b931 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -407,10 +407,6 @@ ul.notes { .note-header { display: flex; justify-content: space-between; - - @include notes-media('max', $screen-xs-max) { - flex-flow: row wrap; - } } .note-header-info { -- cgit v1.2.1 From 86b8fd3b1aa8b5724d4aa425f43a812519a4c8d0 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Thu, 3 May 2018 09:29:17 +0100 Subject: Changed delete wiki prompt from 'confirm' for 'gl_modal' --- .../wikis/components/delete_wiki_modal.vue | 63 ++++++++++++++++++++++ .../javascripts/pages/projects/wikis/index.js | 22 ++++++++ 2 files changed, 85 insertions(+) create mode 100644 app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue (limited to 'app/assets') diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue new file mode 100644 index 00000000000..6a4d3f56229 --- /dev/null +++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue @@ -0,0 +1,63 @@ + + + + diff --git a/app/assets/javascripts/pages/projects/wikis/index.js b/app/assets/javascripts/pages/projects/wikis/index.js index ec01c66ffda..467f65541ec 100644 --- a/app/assets/javascripts/pages/projects/wikis/index.js +++ b/app/assets/javascripts/pages/projects/wikis/index.js @@ -1,12 +1,34 @@ import $ from 'jquery'; +import Vue from 'vue'; +import Translate from '~/vue_shared/translate'; +import csrf from '~/lib/utils/csrf'; import Wikis from './wikis'; import ShortcutsWiki from '../../../shortcuts_wiki'; import ZenMode from '../../../zen_mode'; import GLForm from '../../../gl_form'; +import deleteWikiModal from './components/delete_wiki_modal.vue'; document.addEventListener('DOMContentLoaded', () => { new Wikis(); // eslint-disable-line no-new new ShortcutsWiki(); // eslint-disable-line no-new new ZenMode(); // eslint-disable-line no-new new GLForm($('.wiki-form'), true); // eslint-disable-line no-new + + Vue.use(Translate); + const { deleteWikiUrl } = document.getElementById('delete-wiki-button').dataset; + const deleteWikiModalEl = document.getElementById('delete-wiki-modal'); + const deleteModal = new Vue({ + el: deleteWikiModalEl, + data: { + deleteWikiUrl: '', + }, + render(createElement) { + return createElement(deleteWikiModal, { + props: { + deleteWikiUrl, + csrfToken: csrf.token, + }, + }); + }, + }); }); -- cgit v1.2.1 From c9b5c42b1862675ad43e4e8e7411f7048be8abfc Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Thu, 3 May 2018 12:41:28 +0100 Subject: Added commit form fields for delete page confirmation --- .../wikis/components/delete_wiki_modal.vue | 58 +++++++++++++++++++--- .../javascripts/pages/projects/wikis/index.js | 5 +- 2 files changed, 54 insertions(+), 9 deletions(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue index 6a4d3f56229..af0b86ea816 100644 --- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue +++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue @@ -1,6 +1,7 @@ - -- cgit v1.2.1 From fe7e18185f1bd22ed6952d90ff4dede34b5c68f5 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Mon, 7 May 2018 13:46:25 +0100 Subject: Fixed linit errors --- .../wikis/components/delete_wiki_modal.vue | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue index 85c14b6af77..1943113fc1b 100644 --- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue +++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue @@ -34,7 +34,7 @@ export default { { pageTitle: `'${_.escape(this.pageTitle)}'`, }, - false + false, ); }, }, @@ -56,22 +56,22 @@ export default { > {{ message }}
- - -
+ ref="form" + :action="deleteWikiUrl" + method="post" + class="form-horizontal js-requires-input" + > + + + -- cgit v1.2.1 From 22651a63901c04445be571c788c51921b1ddac45 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Mon, 7 May 2018 15:00:13 +0100 Subject: Removed quotes around page title --- .../javascripts/pages/projects/wikis/components/delete_wiki_modal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue index 1943113fc1b..ce5f28b464c 100644 --- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue +++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue @@ -30,9 +30,9 @@ export default { }, title() { return sprintf( - s__('WikiPageConfirmDelete|Delete Page %{pageTitle}?'), + s__('WikiPageConfirmDelete|Delete %{pageTitle}?'), { - pageTitle: `'${_.escape(this.pageTitle)}'`, + pageTitle: _.escape(this.pageTitle), }, false, ); -- cgit v1.2.1 From 504ef7a5a2e6203c8bc4db091f0876e05b8b8f67 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Mon, 7 May 2018 17:45:33 +0100 Subject: Made delete wiki modal component props required and changed the component init behaviour --- .../wikis/components/delete_wiki_modal.vue | 6 ++-- .../javascripts/pages/projects/wikis/index.js | 41 ++++++++++++---------- 2 files changed, 26 insertions(+), 21 deletions(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue index ce5f28b464c..e59758b14a0 100644 --- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue +++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue @@ -10,17 +10,17 @@ export default { props: { deleteWikiUrl: { type: String, - required: false, + required: true, default: '', }, pageTitle: { type: String, - required: false, + required: true, default: '', }, csrfToken: { type: String, - required: false, + required: true, default: '', }, }, diff --git a/app/assets/javascripts/pages/projects/wikis/index.js b/app/assets/javascripts/pages/projects/wikis/index.js index 169fa5d85a8..0295653cb29 100644 --- a/app/assets/javascripts/pages/projects/wikis/index.js +++ b/app/assets/javascripts/pages/projects/wikis/index.js @@ -14,22 +14,27 @@ document.addEventListener('DOMContentLoaded', () => { new ZenMode(); // eslint-disable-line no-new new GLForm($('.wiki-form'), true); // eslint-disable-line no-new - Vue.use(Translate); - const { deleteWikiUrl, pageTitle } = document.getElementById('delete-wiki-button').dataset; - const deleteWikiModalEl = document.getElementById('delete-wiki-modal'); - const deleteModal = new Vue({ // eslint-disable-line - el: deleteWikiModalEl, - data: { - deleteWikiUrl: '', - }, - render(createElement) { - return createElement(deleteWikiModal, { - props: { - pageTitle, - deleteWikiUrl, - csrfToken: csrf.token, - }, - }); - }, - }); + const deleteWikiButton = document.getElementById('delete-wiki-button'); + + if (deleteWikiButton) { + Vue.use(Translate); + + const { deleteWikiUrl, pageTitle } = deleteWikiButton.dataset; + const deleteWikiModalEl = document.getElementById('delete-wiki-modal'); + const deleteModal = new Vue({ // eslint-disable-line + el: deleteWikiModalEl, + data: { + deleteWikiUrl: '', + }, + render(createElement) { + return createElement(deleteWikiModal, { + props: { + pageTitle, + deleteWikiUrl, + csrfToken: csrf.token, + }, + }); + }, + }); + } }); -- cgit v1.2.1 From f30de1bf431f5e668d0d296ca304c489ad8e2fcf Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Mon, 7 May 2018 23:31:00 +0100 Subject: Changed copy of delete button to sentence case --- .../javascripts/pages/projects/wikis/components/delete_wiki_modal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue index e59758b14a0..df21e2f8771 100644 --- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue +++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue @@ -30,7 +30,7 @@ export default { }, title() { return sprintf( - s__('WikiPageConfirmDelete|Delete %{pageTitle}?'), + s__('WikiPageConfirmDelete|Delete page %{pageTitle}?'), { pageTitle: _.escape(this.pageTitle), }, @@ -51,7 +51,7 @@ export default { id="delete-wiki-modal" :header-title-text="title" footer-primary-button-variant="danger" - :footer-primary-button-text="s__('WikiPageConfirmDelete|Delete Page')" + :footer-primary-button-text="s__('WikiPageConfirmDelete|Delete page')" @submit="onSubmit" > {{ message }} -- cgit v1.2.1 From e286942185b85149f21531e491c0c93a04acbe0f Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Tue, 8 May 2018 14:06:11 +0300 Subject: Move SquashBeforeMerge vue component --- .../components/states/mr_widget_squash_before_merge.js | 15 --------------- .../components/states/mr_widget_squash_before_merge.vue | 15 +++++++++++++++ .../javascripts/vue_merge_request_widget/dependencies.js | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js create mode 100644 app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue (limited to 'app/assets') diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js deleted file mode 100644 index bf8628d18a6..00000000000 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js +++ /dev/null @@ -1,15 +0,0 @@ -/* -The squash-before-merge button is EE only, but it's located right in the middle -of the readyToMerge state component template. - -If we didn't declare this component in CE, we'd need to maintain a separate copy -of the readyToMergeState template in EE, which is pretty big and likely to change. - -Instead, in CE, we declare the component, but it's hidden and is configured to do nothing. -In EE, the configuration extends this object to add a functioning squash-before-merge -button. -*/ - -export default { - template: '', -}; diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue new file mode 100644 index 00000000000..926a3172412 --- /dev/null +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue @@ -0,0 +1,15 @@ +/* +The squash-before-merge button is EE only, but it's located right in the middle +of the readyToMerge state component template. + +If we didn't declare this component in CE, we'd need to maintain a separate copy +of the readyToMergeState template in EE, which is pretty big and likely to change. + +Instead, in CE, we declare the component, but it's hidden and is configured to do nothing. +In EE, the configuration extends this object to add a functioning squash-before-merge +button. +*/ + + diff --git a/app/assets/javascripts/vue_merge_request_widget/dependencies.js b/app/assets/javascripts/vue_merge_request_widget/dependencies.js index 7f5f28091da..5cb84b7a226 100644 --- a/app/assets/javascripts/vue_merge_request_widget/dependencies.js +++ b/app/assets/javascripts/vue_merge_request_widget/dependencies.js @@ -41,7 +41,7 @@ export { default as MRWidgetService } from './services/mr_widget_service'; export { default as eventHub } from './event_hub'; export { default as getStateKey } from './stores/get_state_key'; export { default as stateMaps } from './stores/state_maps'; -export { default as SquashBeforeMerge } from './components/states/mr_widget_squash_before_merge'; +export { default as SquashBeforeMerge } from './components/states/mr_widget_squash_before_merge.vue'; export { default as notify } from '../lib/utils/notify'; export { default as SourceBranchRemovalStatus } from './components/source_branch_removal_status.vue'; -- cgit v1.2.1 From e9e414a79af53c2155d10993d8580c386120a983 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Thu, 10 May 2018 18:04:17 +0100 Subject: Moves mr widget to a vue component Prevents maintainer edit to render a blank div Properly names sha mismatch component --- .../components/mr_widget_maintainer_edit.vue | 20 -- .../vue_merge_request_widget/dependencies.js | 3 +- .../vue_merge_request_widget/mr_widget_options.js | 277 -------------------- .../vue_merge_request_widget/mr_widget_options.vue | 290 +++++++++++++++++++++ 4 files changed, 291 insertions(+), 299 deletions(-) delete mode 100644 app/assets/javascripts/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue delete mode 100644 app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js create mode 100644 app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue (limited to 'app/assets') diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue deleted file mode 100644 index f0298f732ea..00000000000 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - diff --git a/app/assets/javascripts/vue_merge_request_widget/dependencies.js b/app/assets/javascripts/vue_merge_request_widget/dependencies.js index 7f5f28091da..c056d2a8709 100644 --- a/app/assets/javascripts/vue_merge_request_widget/dependencies.js +++ b/app/assets/javascripts/vue_merge_request_widget/dependencies.js @@ -15,7 +15,6 @@ export { default as WidgetHeader } from './components/mr_widget_header.vue'; export { default as WidgetMergeHelp } from './components/mr_widget_merge_help.vue'; export { default as WidgetPipeline } from './components/mr_widget_pipeline.vue'; export { default as Deployment } from './components/deployment.vue'; -export { default as WidgetMaintainerEdit } from './components/mr_widget_maintainer_edit.vue'; export { default as WidgetRelatedLinks } from './components/mr_widget_related_links.vue'; export { default as MergedState } from './components/states/mr_widget_merged.vue'; export { default as FailedToMerge } from './components/states/mr_widget_failed_to_merge.vue'; @@ -45,4 +44,4 @@ export { default as SquashBeforeMerge } from './components/states/mr_widget_squa export { default as notify } from '../lib/utils/notify'; export { default as SourceBranchRemovalStatus } from './components/source_branch_removal_status.vue'; -export { default as mrWidgetOptions } from './mr_widget_options'; +export { default as mrWidgetOptions } from './mr_widget_options.vue'; diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js deleted file mode 100644 index 345f9ac1b4b..00000000000 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js +++ /dev/null @@ -1,277 +0,0 @@ -import Project from '~/pages/projects/project'; -import SmartInterval from '~/smart_interval'; -import Flash from '../flash'; -import { - WidgetHeader, - WidgetMergeHelp, - WidgetPipeline, - Deployment, - WidgetMaintainerEdit, - WidgetRelatedLinks, - MergedState, - ClosedState, - MergingState, - RebaseState, - WorkInProgressState, - ArchivedState, - ConflictsState, - NothingToMergeState, - MissingBranchState, - NotAllowedState, - ReadyToMergeState, - ShaMismatchState, - UnresolvedDiscussionsState, - PipelineBlockedState, - PipelineFailedState, - FailedToMerge, - MergeWhenPipelineSucceedsState, - AutoMergeFailed, - CheckingState, - MRWidgetStore, - MRWidgetService, - eventHub, - stateMaps, - SquashBeforeMerge, - notify, - SourceBranchRemovalStatus, -} from './dependencies'; -import { setFavicon } from '../lib/utils/common_utils'; - -export default { - el: '#js-vue-mr-widget', - name: 'MRWidget', - props: { - mrData: { - type: Object, - required: false, - }, - }, - data() { - const store = new MRWidgetStore(this.mrData || window.gl.mrWidgetData); - const service = this.createService(store); - return { - mr: store, - service, - }; - }, - computed: { - componentName() { - return stateMaps.stateToComponentMap[this.mr.state]; - }, - shouldRenderMergeHelp() { - return stateMaps.statesToShowHelpWidget.indexOf(this.mr.state) > -1; - }, - shouldRenderPipelines() { - return this.mr.hasCI; - }, - shouldRenderRelatedLinks() { - return !!this.mr.relatedLinks && !this.mr.isNothingToMergeState; - }, - shouldRenderSourceBranchRemovalStatus() { - return !this.mr.canRemoveSourceBranch && this.mr.shouldRemoveSourceBranch && - (!this.mr.isNothingToMergeState && !this.mr.isMergedState); - }, - }, - methods: { - createService(store) { - const endpoints = { - mergePath: store.mergePath, - mergeCheckPath: store.mergeCheckPath, - cancelAutoMergePath: store.cancelAutoMergePath, - removeWIPPath: store.removeWIPPath, - sourceBranchPath: store.sourceBranchPath, - ciEnvironmentsStatusPath: store.ciEnvironmentsStatusPath, - statusPath: store.statusPath, - mergeActionsContentPath: store.mergeActionsContentPath, - rebasePath: store.rebasePath, - }; - return new MRWidgetService(endpoints); - }, - checkStatus(cb) { - return this.service.checkStatus() - .then(res => res.data) - .then((data) => { - this.handleNotification(data); - this.mr.setData(data); - this.setFaviconHelper(); - - if (cb) { - cb.call(null, data); - } - }) - .catch(() => new Flash('Something went wrong. Please try again.')); - }, - initPolling() { - this.pollingInterval = new SmartInterval({ - callback: this.checkStatus, - startingInterval: 10000, - maxInterval: 30000, - hiddenInterval: 120000, - incrementByFactorOf: 5000, - }); - }, - initDeploymentsPolling() { - this.deploymentsInterval = new SmartInterval({ - callback: this.fetchDeployments, - startingInterval: 30000, - maxInterval: 120000, - hiddenInterval: 240000, - incrementByFactorOf: 15000, - immediateExecution: true, - }); - }, - setFaviconHelper() { - if (this.mr.ciStatusFaviconPath) { - setFavicon(this.mr.ciStatusFaviconPath); - } - }, - fetchDeployments() { - return this.service.fetchDeployments() - .then(res => res.data) - .then((data) => { - if (data.length) { - this.mr.deployments = data; - } - }) - .catch(() => { - new Flash('Something went wrong while fetching the environments for this merge request. Please try again.'); // eslint-disable-line - }); - }, - fetchActionsContent() { - this.service.fetchMergeActionsContent() - .then((res) => { - if (res.data) { - const el = document.createElement('div'); - el.innerHTML = res.data; - document.body.appendChild(el); - Project.initRefSwitcher(); - } - }) - .catch(() => new Flash('Something went wrong. Please try again.')); - }, - handleNotification(data) { - if (data.ci_status === this.mr.ciStatus) return; - if (!data.pipeline) return; - - const label = data.pipeline.details.status.label; - const title = `Pipeline ${label}`; - const message = `Pipeline ${label} for "${data.title}"`; - - notify.notifyMe(title, message, this.mr.gitlabLogo); - }, - resumePolling() { - this.pollingInterval.resume(); - }, - stopPolling() { - this.pollingInterval.stopTimer(); - }, - bindEventHubListeners() { - eventHub.$on('MRWidgetUpdateRequested', (cb) => { - this.checkStatus(cb); - }); - - // `params` should be an Array contains a Boolean, like `[true]` - // Passing parameter as Boolean didn't work. - eventHub.$on('SetBranchRemoveFlag', (params) => { - this.mr.isRemovingSourceBranch = params[0]; - }); - - eventHub.$on('FailedToMerge', (mergeError) => { - this.mr.state = 'failedToMerge'; - this.mr.mergeError = mergeError; - }); - - eventHub.$on('UpdateWidgetData', (data) => { - this.mr.setData(data); - }); - - eventHub.$on('FetchActionsContent', () => { - this.fetchActionsContent(); - }); - - eventHub.$on('EnablePolling', () => { - this.resumePolling(); - }); - - eventHub.$on('DisablePolling', () => { - this.stopPolling(); - }); - }, - handleMounted() { - this.setFaviconHelper(); - this.initDeploymentsPolling(); - }, - }, - created() { - this.initPolling(); - this.bindEventHubListeners(); - }, - mounted() { - this.handleMounted(); - }, - components: { - 'mr-widget-header': WidgetHeader, - 'mr-widget-merge-help': WidgetMergeHelp, - 'mr-widget-pipeline': WidgetPipeline, - Deployment, - 'mr-widget-maintainer-edit': WidgetMaintainerEdit, - 'mr-widget-related-links': WidgetRelatedLinks, - 'mr-widget-merged': MergedState, - 'mr-widget-closed': ClosedState, - 'mr-widget-merging': MergingState, - 'mr-widget-failed-to-merge': FailedToMerge, - 'mr-widget-wip': WorkInProgressState, - 'mr-widget-archived': ArchivedState, - 'mr-widget-conflicts': ConflictsState, - 'mr-widget-nothing-to-merge': NothingToMergeState, - 'mr-widget-not-allowed': NotAllowedState, - 'mr-widget-missing-branch': MissingBranchState, - 'mr-widget-ready-to-merge': ReadyToMergeState, - 'mr-widget-sha-mismatch': ShaMismatchState, - 'mr-widget-squash-before-merge': SquashBeforeMerge, - 'mr-widget-checking': CheckingState, - 'mr-widget-unresolved-discussions': UnresolvedDiscussionsState, - 'mr-widget-pipeline-blocked': PipelineBlockedState, - 'mr-widget-pipeline-failed': PipelineFailedState, - 'mr-widget-merge-when-pipeline-succeeds': MergeWhenPipelineSucceedsState, - 'mr-widget-auto-merge-failed': AutoMergeFailed, - 'mr-widget-rebase': RebaseState, - SourceBranchRemovalStatus, - }, - template: ` -
- - - -
- - - - -
-
- -
-
- `, -}; diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue new file mode 100644 index 00000000000..53b14664625 --- /dev/null +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -0,0 +1,290 @@ + + \ No newline at end of file -- cgit v1.2.1 From ece350218405a10495912a94863fd29d3ebe3da3 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Thu, 10 May 2018 18:08:52 +0100 Subject: Fixes eslint --- .../vue_merge_request_widget/mr_widget_options.vue | 73 +++++++++++----------- 1 file changed, 37 insertions(+), 36 deletions(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index 53b14664625..b03f22607e5 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -41,10 +41,39 @@ import { setFavicon } from '../lib/utils/common_utils'; export default { el: '#js-vue-mr-widget', name: 'MRWidget', + components: { + 'mr-widget-header': WidgetHeader, + 'mr-widget-merge-help': WidgetMergeHelp, + 'mr-widget-pipeline': WidgetPipeline, + Deployment, + 'mr-widget-related-links': WidgetRelatedLinks, + 'mr-widget-merged': MergedState, + 'mr-widget-closed': ClosedState, + 'mr-widget-merging': MergingState, + 'mr-widget-failed-to-merge': FailedToMerge, + 'mr-widget-wip': WorkInProgressState, + 'mr-widget-archived': ArchivedState, + 'mr-widget-conflicts': ConflictsState, + 'mr-widget-nothing-to-merge': NothingToMergeState, + 'mr-widget-not-allowed': NotAllowedState, + 'mr-widget-missing-branch': MissingBranchState, + 'mr-widget-ready-to-merge': ReadyToMergeState, + 'sha-mismatch': ShaMismatchState, + 'mr-widget-squash-before-merge': SquashBeforeMerge, + 'mr-widget-checking': CheckingState, + 'mr-widget-unresolved-discussions': UnresolvedDiscussionsState, + 'mr-widget-pipeline-blocked': PipelineBlockedState, + 'mr-widget-pipeline-failed': PipelineFailedState, + 'mr-widget-merge-when-pipeline-succeeds': MergeWhenPipelineSucceedsState, + 'mr-widget-auto-merge-failed': AutoMergeFailed, + 'mr-widget-rebase': RebaseState, + SourceBranchRemovalStatus, + }, props: { mrData: { type: Object, required: false, + default: () => ({}), }, }, data() { @@ -73,6 +102,13 @@ export default { (!this.mr.isNothingToMergeState && !this.mr.isMergedState); }, }, + created() { + this.initPolling(); + this.bindEventHubListeners(); + }, + mounted() { + this.handleMounted(); + }, methods: { createService(store) { const endpoints = { @@ -203,41 +239,6 @@ export default { this.initDeploymentsPolling(); }, }, - created() { - this.initPolling(); - this.bindEventHubListeners(); - }, - mounted() { - this.handleMounted(); - }, - components: { - 'mr-widget-header': WidgetHeader, - 'mr-widget-merge-help': WidgetMergeHelp, - 'mr-widget-pipeline': WidgetPipeline, - Deployment, - 'mr-widget-related-links': WidgetRelatedLinks, - 'mr-widget-merged': MergedState, - 'mr-widget-closed': ClosedState, - 'mr-widget-merging': MergingState, - 'mr-widget-failed-to-merge': FailedToMerge, - 'mr-widget-wip': WorkInProgressState, - 'mr-widget-archived': ArchivedState, - 'mr-widget-conflicts': ConflictsState, - 'mr-widget-nothing-to-merge': NothingToMergeState, - 'mr-widget-not-allowed': NotAllowedState, - 'mr-widget-missing-branch': MissingBranchState, - 'mr-widget-ready-to-merge': ReadyToMergeState, - 'sha-mismatch': ShaMismatchState, - 'mr-widget-squash-before-merge': SquashBeforeMerge, - 'mr-widget-checking': CheckingState, - 'mr-widget-unresolved-discussions': UnresolvedDiscussionsState, - 'mr-widget-pipeline-blocked': PipelineBlockedState, - 'mr-widget-pipeline-failed': PipelineFailedState, - 'mr-widget-merge-when-pipeline-succeeds': MergeWhenPipelineSucceedsState, - 'mr-widget-auto-merge-failed': AutoMergeFailed, - 'mr-widget-rebase': RebaseState, - SourceBranchRemovalStatus, - }, }; \ No newline at end of file + -- cgit v1.2.1 From 9c8129267117985996a9ccb958072c7705ecfe62 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Fri, 11 May 2018 17:46:27 +0100 Subject: Fix broken tests --- app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index b03f22607e5..f69fe03fcb3 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -73,7 +73,7 @@ export default { mrData: { type: Object, required: false, - default: () => ({}), + default: null, }, }, data() { -- cgit v1.2.1 From 4c4110efe162e80f37d6be6087fac597d8320626 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 15 May 2018 14:07:56 +0000 Subject: Remote table-section from div holding cluster error messages --- app/assets/javascripts/clusters/components/application_row.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue index c2a35341eb2..40cafb54606 100644 --- a/app/assets/javascripts/clusters/components/application_row.vue +++ b/app/assets/javascripts/clusters/components/application_row.vue @@ -179,7 +179,7 @@ role="row" >
-- cgit v1.2.1 From 6a20cf91229bed0935b77a7a1886c80c78e5e7a2 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Sat, 28 Apr 2018 22:49:31 +0200 Subject: Fix width of contributors graphs The contributors graphs were sized with the full .content width in mind, but at some point GitLab changed to a more narrow design, so graphs would be too wide for their container divs. This change resizes contributors graphs relative to their correct container widths. --- .../pages/projects/graphs/show/stat_graph_contributors_graph.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js index a99ce0f1c36..d7f4cae971b 100644 --- a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js +++ b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js @@ -109,7 +109,7 @@ export const ContributorsMasterGraph = (function(superClass) { this.data = data1; this.update_content = this.update_content.bind(this); - this.width = $('.content').width() - parentPadding - (this.MARGIN.left + this.MARGIN.right); + this.width = $('.stat-graph').width() - parentPadding - (this.MARGIN.left + this.MARGIN.right); this.height = 200; this.x = null; this.y = null; @@ -218,12 +218,15 @@ export const ContributorsAuthorGraph = (function(superClass) { extend(ContributorsAuthorGraph, superClass); function ContributorsAuthorGraph(data1) { + const $parentElements = $('.person'); + const parentPadding = parseFloat($parentElements.css('padding-left')) + parseFloat($parentElements.css('padding-right')); + this.data = data1; // Don't split graph size in half for mobile devices. if ($(window).width() < 768) { - this.width = $('.content').width() - 80; + this.width = $('.stat-graph').width() - parentPadding - (this.MARGIN.left + this.MARGIN.right); } else { - this.width = ($('.content').width() / 2) - 100; + this.width = ($('.stat-graph').width() / 2) - parentPadding - (this.MARGIN.left + this.MARGIN.right); } this.height = 200; this.x = null; -- cgit v1.2.1 From 2b1321288a911d8c1336aff9fd712cef2592bfb5 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Sat, 28 Apr 2018 22:53:02 +0200 Subject: Use ES6 `const` more consistently --- .../projects/graphs/show/stat_graph_contributors_graph.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js index d7f4cae971b..9f73e099066 100644 --- a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js +++ b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js @@ -1,4 +1,4 @@ -/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, max-len, no-restricted-syntax, vars-on-top, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, comma-dangle, no-return-assign, prefer-arrow-callback, quotes, prefer-template, newline-per-chained-call, no-else-return, no-shadow */ +/* eslint-disable func-names, space-before-function-paren, prefer-rest-params, max-len, no-restricted-syntax, vars-on-top, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, comma-dangle, no-return-assign, prefer-arrow-callback, quotes, prefer-template, newline-per-chained-call, no-else-return, no-shadow */ import $ from 'jquery'; import _ from 'underscore'; @@ -13,7 +13,7 @@ import { dateTickFormat } from '~/lib/utils/tick_formats'; const d3 = { extent, max, select, scaleTime, scaleLinear, axisLeft, axisBottom, area, brushX, timeParse }; -const extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; +const extend = function(child, parent) { for (const key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; const hasProp = {}.hasOwnProperty; export const ContributorsGraph = (function() { @@ -122,8 +122,7 @@ export const ContributorsMasterGraph = (function(superClass) { } ContributorsMasterGraph.prototype.process_dates = function(data) { - var dates; - dates = this.get_dates(data); + const dates = this.get_dates(data); this.parse_dates(data); return ContributorsGraph.set_dates(dates); }; @@ -133,8 +132,7 @@ export const ContributorsMasterGraph = (function(superClass) { }; ContributorsMasterGraph.prototype.parse_dates = function(data) { - var parseDate; - parseDate = d3.timeParse("%Y-%m-%d"); + const parseDate = d3.timeParse("%Y-%m-%d"); return data.forEach(function(d) { return d.date = parseDate(d.date); }); @@ -252,8 +250,7 @@ export const ContributorsAuthorGraph = (function(superClass) { ContributorsAuthorGraph.prototype.create_area = function(x, y) { return this.area = d3.area().x(function(d) { - var parseDate; - parseDate = d3.timeParse("%Y-%m-%d"); + const parseDate = d3.timeParse("%Y-%m-%d"); return x(parseDate(d)); }).y0(this.height).y1((function(_this) { return function(d) { @@ -267,7 +264,7 @@ export const ContributorsAuthorGraph = (function(superClass) { }; ContributorsAuthorGraph.prototype.create_svg = function() { - var persons = document.querySelectorAll('.person'); + const persons = document.querySelectorAll('.person'); this.list_item = persons[persons.length - 1]; return this.svg = d3.select(this.list_item).append("svg").attr("width", this.width + this.MARGIN.left + this.MARGIN.right).attr("height", this.height + this.MARGIN.top + this.MARGIN.bottom).attr("class", "spark").append("g").attr("transform", "translate(" + this.MARGIN.left + "," + this.MARGIN.top + ")"); }; -- cgit v1.2.1 From e9fcaed3fed3e1dddae8a0f70503f49f4084c270 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Sun, 29 Apr 2018 16:07:15 +0200 Subject: Refactor duplicate code --- .../graphs/show/stat_graph_contributors_graph.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js index 9f73e099066..f3e6c371ead 100644 --- a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js +++ b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js @@ -13,8 +13,8 @@ import { dateTickFormat } from '~/lib/utils/tick_formats'; const d3 = { extent, max, select, scaleTime, scaleLinear, axisLeft, axisBottom, area, brushX, timeParse }; -const extend = function(child, parent) { for (const key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; const hasProp = {}.hasOwnProperty; +const extend = function(child, parent) { for (const key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; export const ContributorsGraph = (function() { function ContributorsGraph() {} @@ -32,6 +32,12 @@ export const ContributorsGraph = (function() { ContributorsGraph.prototype.dates = []; + ContributorsGraph.prototype.determine_width = function(baseWidth, $parentElement) { + const parentPaddingWidth = parseFloat($parentElement.css('padding-left')) + parseFloat($parentElement.css('padding-right')); + const marginWidth = this.MARGIN.left + this.MARGIN.right; + return baseWidth - parentPaddingWidth - marginWidth; + }; + ContributorsGraph.set_x_domain = function(data) { return ContributorsGraph.prototype.x_domain = data; }; @@ -105,11 +111,10 @@ export const ContributorsMasterGraph = (function(superClass) { function ContributorsMasterGraph(data1) { const $parentElement = $('#contributors-master'); - const parentPadding = parseFloat($parentElement.css('padding-left')) + parseFloat($parentElement.css('padding-right')); this.data = data1; this.update_content = this.update_content.bind(this); - this.width = $('.stat-graph').width() - parentPadding - (this.MARGIN.left + this.MARGIN.right); + this.width = this.determine_width($('.stat-graph').width(), $parentElement); this.height = 200; this.x = null; this.y = null; @@ -217,14 +222,13 @@ export const ContributorsAuthorGraph = (function(superClass) { function ContributorsAuthorGraph(data1) { const $parentElements = $('.person'); - const parentPadding = parseFloat($parentElements.css('padding-left')) + parseFloat($parentElements.css('padding-right')); this.data = data1; // Don't split graph size in half for mobile devices. if ($(window).width() < 768) { - this.width = $('.stat-graph').width() - parentPadding - (this.MARGIN.left + this.MARGIN.right); + this.width = this.determine_width($('.stat-graph').width(), $parentElements); } else { - this.width = ($('.stat-graph').width() / 2) - parentPadding - (this.MARGIN.left + this.MARGIN.right); + this.width = this.determine_width($('.stat-graph').width() / 2, $parentElements); } this.height = 200; this.x = null; -- cgit v1.2.1 From 8b36485ce7217e2b10f765576ec4e816e556263b Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Tue, 15 May 2018 22:53:55 +0200 Subject: Use correct base width --- .../graphs/show/stat_graph_contributors_graph.js | 30 ++++++++++++++++------ 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js index f3e6c371ead..5316d3e9f3c 100644 --- a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js +++ b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js @@ -21,9 +21,9 @@ export const ContributorsGraph = (function() { ContributorsGraph.prototype.MARGIN = { top: 20, - right: 20, + right: 10, bottom: 30, - left: 50 + left: 40 }; ContributorsGraph.prototype.x_domain = null; @@ -114,7 +114,7 @@ export const ContributorsMasterGraph = (function(superClass) { this.data = data1; this.update_content = this.update_content.bind(this); - this.width = this.determine_width($('.stat-graph').width(), $parentElement); + this.width = this.determine_width($('.js-graphs-show').width(), $parentElement); this.height = 200; this.x = null; this.y = null; @@ -155,7 +155,14 @@ export const ContributorsMasterGraph = (function(superClass) { }; ContributorsMasterGraph.prototype.create_svg = function() { - return this.svg = d3.select("#contributors-master").append("svg").attr("width", this.width + this.MARGIN.left + this.MARGIN.right).attr("height", this.height + this.MARGIN.top + this.MARGIN.bottom).attr("class", "tint-box").append("g").attr("transform", "translate(" + this.MARGIN.left + "," + this.MARGIN.top + ")"); + this.svg = d3.select("#contributors-master") + .append("svg") + .attr("width", this.width + this.MARGIN.left + this.MARGIN.right) + .attr("height", this.height + this.MARGIN.top + this.MARGIN.bottom) + .attr("class", "tint-box") + .append("g") + .attr("transform", "translate(" + this.MARGIN.left + "," + this.MARGIN.top + ")"); + return this.svg; }; ContributorsMasterGraph.prototype.create_area = function(x, y) { @@ -225,10 +232,10 @@ export const ContributorsAuthorGraph = (function(superClass) { this.data = data1; // Don't split graph size in half for mobile devices. - if ($(window).width() < 768) { - this.width = this.determine_width($('.stat-graph').width(), $parentElements); + if ($(window).width() < 790) { + this.width = this.determine_width($('.js-graphs-show').width(), $parentElements); } else { - this.width = this.determine_width($('.stat-graph').width() / 2, $parentElements); + this.width = this.determine_width($('.js-graphs-show').width() / 2, $parentElements); } this.height = 200; this.x = null; @@ -270,7 +277,14 @@ export const ContributorsAuthorGraph = (function(superClass) { ContributorsAuthorGraph.prototype.create_svg = function() { const persons = document.querySelectorAll('.person'); this.list_item = persons[persons.length - 1]; - return this.svg = d3.select(this.list_item).append("svg").attr("width", this.width + this.MARGIN.left + this.MARGIN.right).attr("height", this.height + this.MARGIN.top + this.MARGIN.bottom).attr("class", "spark").append("g").attr("transform", "translate(" + this.MARGIN.left + "," + this.MARGIN.top + ")"); + this.svg = d3.select(this.list_item) + .append("svg") + .attr("width", this.width + this.MARGIN.left + this.MARGIN.right) + .attr("height", this.height + this.MARGIN.top + this.MARGIN.bottom) + .attr("class", "spark") + .append("g") + .attr("transform", "translate(" + this.MARGIN.left + "," + this.MARGIN.top + ")"); + return this.svg; }; ContributorsAuthorGraph.prototype.draw_path = function(data) { -- cgit v1.2.1 From 3fb8d1011dc5ffdb5ad3c64248c4649a0ab39dd0 Mon Sep 17 00:00:00 2001 From: Paul Slaughter Date: Tue, 15 May 2018 21:00:51 +0000 Subject: Fix bug with long strings in issue boards --- app/assets/stylesheets/framework/mixins.scss | 12 ++++++++++++ app/assets/stylesheets/pages/boards.scss | 8 +++++--- 2 files changed, 17 insertions(+), 3 deletions(-) (limited to 'app/assets') diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index 9ff24ebc127..0ea0b65b95f 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -210,3 +210,15 @@ margin-left: -$size; } } + +/* + * Mixin that fixes wrapping issues with long strings (e.g. URLs) + * + * Note: the width needs to be set for it to work in Firefox + */ +@mixin overflow-break-word { + overflow-wrap: break-word; + word-wrap: break-word; + word-break: break-word; + max-width: 100%; +} diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 681242f8d85..011d38532b4 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -284,6 +284,9 @@ box-shadow: 0 1px 2px $issue-boards-card-shadow; list-style: none; + // as a fallback, hide overflow content so that dragging and dropping still works + overflow: hidden; + &:not(:last-child) { margin-bottom: 5px; } @@ -310,14 +313,13 @@ } .card-title { + @include overflow-break-word(); margin: 0 30px 0 0; font-size: 1em; line-height: inherit; a { color: $gl-text-color; - word-wrap: break-word; - word-break: break-word; margin-right: 2px; } } @@ -462,8 +464,8 @@ } .issuable-header-text { + @include overflow-break-word(); padding-right: 35px; - word-break: break-word; > strong { font-weight: $gl-font-weight-bold; -- cgit v1.2.1 From 207a38d014bcc9cafd76c863fe3f200f60e073fa Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 16 May 2018 07:28:34 +0000 Subject: Remove unnecessary section-100 css class from application_row.vue --- app/assets/javascripts/clusters/components/application_row.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue index 40cafb54606..fae580c091b 100644 --- a/app/assets/javascripts/clusters/components/application_row.vue +++ b/app/assets/javascripts/clusters/components/application_row.vue @@ -179,7 +179,7 @@ role="row" >
-- cgit v1.2.1 From e6cbf40263ccf160cc97216e395e5c8ede8d13d2 Mon Sep 17 00:00:00 2001 From: Lars Greiss Date: Wed, 16 May 2018 10:19:41 +0000 Subject: Remove docker pull prefix from registry clipboard feature --- .../javascripts/registry/components/collapsible_container.vue | 7 +------ app/assets/javascripts/registry/components/table_registry.vue | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'app/assets') 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 @@ 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 @@ -- cgit v1.2.1 From 9b4ab0af3edfaabf63277ff245f8d1c5ab358475 Mon Sep 17 00:00:00 2001 From: haseeb Date: Wed, 16 May 2018 17:02:20 +0000 Subject: fixed copy to cliboard button in embedded snippets --- app/assets/stylesheets/framework/snippets.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/assets') diff --git a/app/assets/stylesheets/framework/snippets.scss b/app/assets/stylesheets/framework/snippets.scss index 606d4675f19..430633bb01b 100644 --- a/app/assets/stylesheets/framework/snippets.scss +++ b/app/assets/stylesheets/framework/snippets.scss @@ -67,7 +67,8 @@ padding: 8px 40px; } - .embed-toggle { + .embed-toggle, + .snippet-clipboard-btn { height: 35px; } } -- cgit v1.2.1