diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-24 12:12:59 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-24 12:15:37 +0300 |
| commit | 09a9fcc9b0e36a8276c53127bbe171d6ff336ad0 (patch) | |
| tree | ced7d7022813dd46b70fc7171d67b8a54eb2c84d /app/assets/javascripts/pipelines | |
| parent | 2c3065c1601c31864c5d4b74d637473aa5973168 (diff) | |
Updates CSS for non a tags inside dropdown
Diffstat (limited to 'app/assets/javascripts/pipelines')
3 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/javascripts/pipelines/components/graph/job_component.vue b/app/assets/javascripts/pipelines/components/graph/job_component.vue index 4fcd4b79f4a..c1f0f051b63 100644 --- a/app/assets/javascripts/pipelines/components/graph/job_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/job_component.vue @@ -108,7 +108,7 @@ export default { <div v-else v-tooltip - class="js-job-component-tooltip" + class="js-job-component-tooltip non-details-job-component" :title="tooltipText" :class="cssClassJobName" data-html="true" diff --git a/app/assets/javascripts/pipelines/components/stage.vue b/app/assets/javascripts/pipelines/components/stage.vue index 5a74dfed0ff..0b7130517d3 100644 --- a/app/assets/javascripts/pipelines/components/stage.vue +++ b/app/assets/javascripts/pipelines/components/stage.vue @@ -96,7 +96,7 @@ export default { axios .get(this.stage.dropdown_path) .then(({ data }) => { - this.dropdownContent = data; + this.dropdownContent = data.latest_statuses; this.isLoading = false; }) .catch(() => { @@ -117,7 +117,7 @@ export default { */ stopDropdownClickPropagation() { $( - this.$el.querySelectorAll('.js-builds-dropdown-list a.mini-pipeline-graph-dropdown-item') + this.$el.querySelectorAll('.js-builds-dropdown-list a.mini-pipeline-graph-dropdown-item'), ).on('click', e => { e.stopPropagation(); }); @@ -183,7 +183,7 @@ export default { <li v-for="job in dropdownContent" :key="job.id" - > + > <job-component :job="job" css-class-job-name="mini-pipeline-graph-dropdown-item" diff --git a/app/assets/javascripts/pipelines/pipeline_details_bundle.js b/app/assets/javascripts/pipelines/pipeline_details_bundle.js index b743364ff43..6584f96130b 100644 --- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js +++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js @@ -48,7 +48,6 @@ export default () => { .catch(() => { this.requestFinishedFor = action; Flash(__('An error occurred while making the request.')); - eventHub.$emit('graphActionFinished', action); }); }, }, |