Commit 778e4c9a authored by Frederic Caplette's avatar Frederic Caplette

Rebase to latest master due to conflict

There are now 2 graph components, one of which is a legacy component
so this reapply the changes to the right component.
parent e8631e51
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
import { escape, capitalize } from 'lodash'; import { escape, capitalize } from 'lodash';
import { GlLoadingIcon } from '@gitlab/ui'; import { GlLoadingIcon } from '@gitlab/ui';
import StageColumnComponentLegacy from './stage_column_component_legacy.vue'; import StageColumnComponentLegacy from './stage_column_component_legacy.vue';
import GraphWidthMixin from '../../mixins/graph_width_mixin';
import LinkedPipelinesColumnLegacy from './linked_pipelines_column_legacy.vue'; import LinkedPipelinesColumnLegacy from './linked_pipelines_column_legacy.vue';
import GraphBundleMixin from '../../mixins/graph_pipeline_bundle_mixin'; import GraphBundleMixin from '../../mixins/graph_pipeline_bundle_mixin';
import { UPSTREAM, DOWNSTREAM, MAIN } from './constants'; import { UPSTREAM, DOWNSTREAM, MAIN } from './constants';
...@@ -14,7 +13,7 @@ export default { ...@@ -14,7 +13,7 @@ export default {
LinkedPipelinesColumnLegacy, LinkedPipelinesColumnLegacy,
StageColumnComponentLegacy, StageColumnComponentLegacy,
}, },
mixins: [GraphWidthMixin, GraphBundleMixin], mixins: [GraphBundleMixin],
props: { props: {
isLoading: { isLoading: {
type: Boolean, type: Boolean,
...@@ -183,14 +182,9 @@ export default { ...@@ -183,14 +182,9 @@ export default {
class="pipeline-visualization pipeline-graph" class="pipeline-visualization pipeline-graph"
:class="{ 'pipeline-tab-content': !isLinkedPipeline }" :class="{ 'pipeline-tab-content': !isLinkedPipeline }"
> >
<div <div class="gl-w-full">
:style="{ <div class="container-fluid container-limited">
paddingLeft: `${graphLeftPadding}px`,
paddingRight: `${graphRightPadding}px`,
}"
>
<gl-loading-icon v-if="isLoading" class="m-auto" size="lg" /> <gl-loading-icon v-if="isLoading" class="m-auto" size="lg" />
<pipeline-graph-legacy <pipeline-graph-legacy
v-if="pipelineTypeUpstream" v-if="pipelineTypeUpstream"
:type="$options.upstream" :type="$options.upstream"
...@@ -267,4 +261,5 @@ export default { ...@@ -267,4 +261,5 @@ export default {
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment