diff options
Diffstat (limited to 'app/assets/javascripts/ci/runner/components/runner_form_fields.vue')
| -rw-r--r-- | app/assets/javascripts/ci/runner/components/runner_form_fields.vue | 87 |
1 files changed, 47 insertions, 40 deletions
diff --git a/app/assets/javascripts/ci/runner/components/runner_form_fields.vue b/app/assets/javascripts/ci/runner/components/runner_form_fields.vue index 180c41e7ed6..d090a562ff7 100644 --- a/app/assets/javascripts/ci/runner/components/runner_form_fields.vue +++ b/app/assets/javascripts/ci/runner/components/runner_form_fields.vue @@ -74,11 +74,56 @@ export default { <template> <div> <h2 class="gl-font-size-h2 gl-my-5"> + {{ s__('Runners|Tags') }} + </h2> + <gl-skeleton-loader v-if="loading" :lines="12" /> + <template v-else-if="model"> + <gl-form-group :label="__('Tags')" label-for="runner-tags"> + <template #description> + <gl-sprintf + :message=" + s__('Runners|Multiple tags must be separated by a comma. For example, %{example}.') + " + > + <template #example> + <!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings --> + <code>macos, shared</code> + </template> + </gl-sprintf> + </template> + <template #label-description> + <gl-sprintf + :message=" + s__( + 'Runners|Add tags for the types of jobs the runner processes to ensure that the runner only runs jobs that you intend it to. %{helpLinkStart}Learn more.%{helpLinkEnd}', + ) + " + > + <template #helpLink="{ content }"> + <gl-link :href="$options.HELP_LABELS_PAGE_PATH" target="_blank">{{ + content + }}</gl-link> + </template> + </gl-sprintf> + </template> + <gl-form-input id="runner-tags" v-model="model.tagList" name="tags" /> + </gl-form-group> + <gl-form-checkbox v-model="model.runUntagged" name="run-untagged"> + {{ __('Run untagged jobs') }} + <template #help> + {{ s__('Runners|Use the runner for jobs without tags in addition to tagged jobs.') }} + </template> + </gl-form-checkbox> + </template> + + <hr aria-hidden="true" /> + + <h2 class="gl-font-size-h2 gl-my-5"> {{ s__('Runners|Details') }} {{ __('(optional)') }} </h2> - <gl-skeleton-loader v-if="loading" :lines="9" /> + <gl-skeleton-loader v-if="loading" :lines="15" /> <template v-else-if="model"> <gl-form-group :label="s__('Runners|Runner description')" label-for="runner-description"> <gl-form-input id="runner-description" v-model="model.description" name="description" /> @@ -93,7 +138,7 @@ export default { {{ __('(optional)') }} </h2> - <gl-skeleton-loader v-if="loading" :lines="27" /> + <gl-skeleton-loader v-if="loading" :lines="15" /> <template v-else-if="model"> <div class="gl-mb-5"> <gl-form-checkbox v-model="model.paused" name="paused"> @@ -115,13 +160,6 @@ export default { </template> </gl-form-checkbox> - <gl-form-checkbox v-model="model.runUntagged" name="run-untagged"> - {{ __('Run untagged jobs') }} - <template #help> - {{ s__('Runners|Use the runner for jobs without tags in addition to tagged jobs.') }} - </template> - </gl-form-checkbox> - <gl-form-checkbox v-if="canBeLockedToProject" v-model="model.locked" name="locked"> {{ __('Lock to current projects') }} <gl-icon name="lock" /> <template #help> @@ -134,37 +172,6 @@ export default { </gl-form-checkbox> </div> - <gl-form-group :label="__('Tags')" label-for="runner-tags"> - <template #description> - <gl-sprintf - :message=" - s__('Runners|Multiple tags must be separated by a comma. For example, %{example}.') - " - > - <template #example> - <!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings --> - <code>macos, shared</code> - </template> - </gl-sprintf> - </template> - <template #label-description> - <gl-sprintf - :message=" - s__( - 'Runners|Add tags for the types of jobs the runner processes to ensure that the runner only runs jobs that you intend it to. %{helpLinkStart}Learn more.%{helpLinkEnd}', - ) - " - > - <template #helpLink="{ content }"> - <gl-link :href="$options.HELP_LABELS_PAGE_PATH" target="_blank">{{ - content - }}</gl-link> - </template> - </gl-sprintf> - </template> - <gl-form-input id="runner-tags" v-model="model.tagList" name="tags" /> - </gl-form-group> - <gl-form-group :label="__('Maximum job timeout')" :label-description=" |