diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-12 03:16:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-12 03:16:35 +0300 |
commit | d237ada361f68864b2f46af58a097dcbde844675 (patch) | |
tree | dcd6cb863d7ca8dd929f4d1acd13f369797b43d9 /app/assets/javascripts/pipeline_editor | |
parent | 830c9943a95cbd755700d6624c64a158b2602cd0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipeline_editor')
-rw-r--r-- | app/assets/javascripts/pipeline_editor/components/header/validation_segment.vue | 5 | ||||
-rw-r--r-- | app/assets/javascripts/pipeline_editor/components/pipeline_editor_tabs.vue | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/pipeline_editor/components/header/validation_segment.vue b/app/assets/javascripts/pipeline_editor/components/header/validation_segment.vue index 280ad2951a7..23f1592cac1 100644 --- a/app/assets/javascripts/pipeline_editor/components/header/validation_segment.vue +++ b/app/assets/javascripts/pipeline_editor/components/header/validation_segment.vue @@ -111,7 +111,10 @@ export default { <span v-else class="gl-display-inline-flex gl-white-space-nowrap gl-max-w-full"> <tooltip-on-truncate :title="message" class="gl-text-truncate"> - <gl-icon :name="icon" /> <span data-testid="validationMsg">{{ message }}</span> + <gl-icon :name="icon" /> + <span data-qa-selector="validation_message_content" data-testid="validationMsg"> + {{ message }} + </span> </tooltip-on-truncate> <span v-if="!isEmpty" class="gl-flex-shrink-0 gl-pl-2"> <gl-link data-testid="learnMoreLink" :href="helpPath"> diff --git a/app/assets/javascripts/pipeline_editor/components/pipeline_editor_tabs.vue b/app/assets/javascripts/pipeline_editor/components/pipeline_editor_tabs.vue index a418668933b..c75b1d4bb11 100644 --- a/app/assets/javascripts/pipeline_editor/components/pipeline_editor_tabs.vue +++ b/app/assets/javascripts/pipeline_editor/components/pipeline_editor_tabs.vue @@ -146,6 +146,7 @@ export default { <template> <gl-tabs class="file-editor gl-mb-3" + data-qa-selector="file_editor_container" :query-param-name="$options.query.TAB_QUERY_PARAM" sync-active-tab-with-query-params > |