diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-17 12:08:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-17 12:08:20 +0300 |
| commit | 91c2554bcf93c3c41aa830da4dd7a2d4b7483e2d (patch) | |
| tree | db4ba29b7ad5398b3eebd845c442d4c26558817c /app/assets/javascripts/pipelines | |
| parent | 3974bc83f3bfc8a7757dcac0319e966042dc4356 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipelines')
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_list/pipeline_mini_graph.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_mini_graph.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_mini_graph.vue index 6ed9d8d4dc9..e35fccf2d7e 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_mini_graph.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_mini_graph.vue @@ -36,7 +36,7 @@ export default { }; </script> <template> - <div data-testid="pipeline-mini-graph" class="gl-display-inline-flex gl-flex-wrap gl-my-1"> + <div data-testid="pipeline-mini-graph" class="gl-display-inline gl-vertical-align-middle gl-my-1"> <div v-for="stage in stages" :key="stage.name" diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue index 5fe7c48b380..53da98434b0 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue @@ -169,7 +169,7 @@ export default { </template> <template #cell(stages)="{ item }"> - <div class="gl-align-items-center gl-display-inline-flex gl-flex-wrap stage-cell"> + <div class="stage-cell"> <!-- This empty div should be removed, see https://gitlab.com/gitlab-org/gitlab/-/issues/323488 --> <div></div> <linked-pipelines-mini-list |