diff options
Diffstat (limited to 'app/assets/javascripts/pages/projects')
7 files changed, 42 insertions, 154 deletions
diff --git a/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue b/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue index e8b646f3f6e..e723cd3fea9 100644 --- a/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue +++ b/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue @@ -89,13 +89,7 @@ export default { footer-primary-button-variant="warning" @submit="onSubmit" > - <div - slot="title" - class="modal-title-with-label" - v-html="title" - > - {{ title }} - </div> + <div slot="title" class="modal-title-with-label" v-html="title">{{ title }}</div> {{ text }} </gl-modal> diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue index ab6f42d928c..db2a4041ec0 100644 --- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue +++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue @@ -70,20 +70,13 @@ export default { :checked="isEditable" class="label-bold" type="radio" - @click="toggleCustomInput(true)" + @click="toggleCustomInput(true);" /> - <label for="custom"> - {{ s__('PipelineSheduleIntervalPattern|Custom') }} - </label> + <label for="custom"> {{ s__('PipelineSheduleIntervalPattern|Custom') }} </label> <span class="cron-syntax-link-wrap"> - (<a - :href="cronSyntaxUrl" - target="_blank" - > - {{ __('Cron syntax') }} - </a>) + (<a :href="cronSyntaxUrl" target="_blank"> {{ __('Cron syntax') }} </a>) </span> </div> @@ -95,15 +88,10 @@ export default { :value="cronIntervalPresets.everyDay" class="label-bold" type="radio" - @click="toggleCustomInput(false)" + @click="toggleCustomInput(false);" /> - <label - class="label-bold" - for="every-day" - > - {{ __('Every day (at 4:00am)') }} - </label> + <label class="label-bold" for="every-day"> {{ __('Every day (at 4:00am)') }} </label> </div> <div class="cron-preset-radio-input"> @@ -114,13 +102,10 @@ export default { :value="cronIntervalPresets.everyWeek" class="label-bold" type="radio" - @click="toggleCustomInput(false)" + @click="toggleCustomInput(false);" /> - <label - class="label-bold" - for="every-week" - > + <label class="label-bold" for="every-week"> {{ __('Every week (Sundays at 4:00am)') }} </label> </div> @@ -133,13 +118,10 @@ export default { :value="cronIntervalPresets.everyMonth" class="label-bold" type="radio" - @click="toggleCustomInput(false)" + @click="toggleCustomInput(false);" /> - <label - class="label-bold" - for="every-month" - > + <label class="label-bold" for="every-month"> {{ __('Every month (on the 1st at 4:00am)') }} </label> </div> diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue index 33fc2420e4d..1edd076604c 100644 --- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue +++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue @@ -28,37 +28,26 @@ export default { }; </script> <template> - <div - v-if="!calloutDismissed" - class="pipeline-schedules-user-callout user-callout"> + <div v-if="!calloutDismissed" class="pipeline-schedules-user-callout user-callout"> <div class="bordered-box landing content-block"> - <button - id="dismiss-callout-btn" - class="btn btn-default close" - @click="dismissCallout"> - <i - aria-hidden="true" - class="fa fa-times"> - </i> + <button id="dismiss-callout-btn" class="btn btn-default close" @click="dismissCallout"> + <i aria-hidden="true" class="fa fa-times"> </i> </button> - <div - class="svg-container" - v-html="illustrationSvg"> - </div> + <div class="svg-container" v-html="illustrationSvg"></div> <div class="user-callout-copy"> <h4>{{ __('Scheduling Pipelines') }}</h4> <p> - {{ __(`The pipelines schedule runs pipelines in the future, + {{ + __(`The pipelines schedule runs pipelines in the future, repeatedly, for specific branches or tags. -Those scheduled pipelines will inherit limited project access based on their associated user.`) }} +Those scheduled pipelines will inherit limited project access based on their associated user.`) + }} </p> - <p> {{ __('Learn more in the') }} - <a - :href="docsUrl" - target="_blank" - rel="nofollow" - > - {{ s__('Learn more in the|pipeline schedules documentation') }}</a>. + <p> + {{ __('Learn more in the') }} + <a :href="docsUrl" target="_blank" rel="nofollow"> + {{ s__('Learn more in the|pipeline schedules documentation') }}</a + >. <!-- oneline to prevent extra space before period --> </p> </div> diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue index dced839c883..ff6dadeff7d 100644 --- a/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue +++ b/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue @@ -69,16 +69,8 @@ export default { </script> <template> - <div - :data-for="name" - class="project-feature-controls" - > - <input - v-if="name" - :name="name" - :value="value" - type="hidden" - /> + <div :data-for="name" class="project-feature-controls"> + <input v-if="name" :name="name" :value="value" type="hidden" /> <project-feature-toggle :value="featureEnabled" :disabled-input="disabledInput" @@ -99,11 +91,7 @@ export default { {{ optionName }} </option> </select> - <i - aria-hidden="true" - class="fa fa-chevron-down" - > - </i> + <i aria-hidden="true" class="fa fa-chevron-down"> </i> </div> </div> </template> diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue index 898d605463f..92d23772565 100644 --- a/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue +++ b/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue @@ -22,30 +22,12 @@ export default { <template> <div class="project-feature-row"> - <label - v-if="label" - class="label-bold" - > + <label v-if="label" class="label-bold"> {{ label }} - <a - v-if="helpPath" - :href="helpPath" - target="_blank" - > - <i - aria-hidden="true" - data-hidden="true" - class="fa fa-question-circle" - > - </i> + <a v-if="helpPath" :href="helpPath" target="_blank"> + <i aria-hidden="true" data-hidden="true" class="fa fa-question-circle"> </i> </a> </label> - <span - v-if="helpText" - class="form-text text-muted" - > - {{ helpText }} - </span> - <slot></slot> + <span v-if="helpText" class="form-text text-muted"> {{ helpText }} </span> <slot></slot> </div> </template> diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue index c0ec7a5dc94..08c7719dcf2 100644 --- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue +++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue @@ -200,10 +200,7 @@ export default { <template> <div> <div class="project-visibility-setting"> - <project-setting-row - :help-path="visibilityHelpPath" - label="Project visibility" - > + <project-setting-row :help-path="visibilityHelpPath" label="Project visibility"> <div class="project-feature-controls"> <div class="select-wrapper"> <select @@ -231,36 +228,21 @@ export default { Public </option> </select> - <i - aria-hidden="true" - data-hidden="true" - class="fa fa-chevron-down" - > - </i> + <i aria-hidden="true" data-hidden="true" class="fa fa-chevron-down"> </i> </div> </div> <span class="form-text text-muted">{{ visibilityLevelDescription }}</span> - <label - v-if="visibilityLevel !== visibilityOptions.PRIVATE" - class="request-access" - > + <label v-if="visibilityLevel !== visibilityOptions.PRIVATE" class="request-access"> <input :value="requestAccessEnabled" type="hidden" name="project[request_access_enabled]" /> - <input - v-model="requestAccessEnabled" - type="checkbox" - /> - Allow users to request access + <input v-model="requestAccessEnabled" type="checkbox" /> Allow users to request access </label> </project-setting-row> </div> - <div - :class="{ 'highlight-changes': highlightChangesClass }" - class="project-feature-settings" - > + <div :class="{ 'highlight-changes': highlightChangesClass }" class="project-feature-settings"> <project-setting-row label="Issues" help-text="Lightweight issue tracking system for this project" @@ -271,10 +253,7 @@ export default { name="project[project_feature_attributes][issues_access_level]" /> </project-setting-row> - <project-setting-row - label="Repository" - help-text="View and edit files in this project" - > + <project-setting-row label="Repository" help-text="View and edit files in this project"> <project-feature-setting v-model="repositoryAccessLevel" :options="featureAccessLevelOptions" @@ -293,10 +272,7 @@ export default { name="project[project_feature_attributes][merge_requests_access_level]" /> </project-setting-row> - <project-setting-row - label="Pipelines" - help-text="Build, test, and deploy your changes" - > + <project-setting-row label="Pipelines" help-text="Build, test, and deploy your changes"> <project-feature-setting v-model="buildsAccessLevel" :options="repoFeatureAccessLevelOptions" @@ -329,10 +305,7 @@ export default { /> </project-setting-row> </div> - <project-setting-row - label="Wiki" - help-text="Pages for project documentation" - > + <project-setting-row label="Wiki" help-text="Pages for project documentation"> <project-feature-setting v-model="wikiAccessLevel" :options="featureAccessLevelOptions" diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue index cbe85eaa590..b0c9ca3ec0d 100644 --- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue +++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue @@ -54,13 +54,7 @@ export default { <template> <div class="d-inline-block"> - <button - v-gl-modal="modalId" - type="button" - class="btn btn-danger" - > - {{ __('Delete') }} - </button> + <button v-gl-modal="modalId" type="button" class="btn btn-danger">{{ __('Delete') }}</button> <gl-modal :title="title" :ok-title="s__('WikiPageConfirmDelete|Delete page')" @@ -70,23 +64,9 @@ export default { @ok="onSubmit" > {{ message }} - <form - ref="form" - :action="deleteWikiUrl" - method="post" - class="js-requires-input" - > - <input - ref="method" - type="hidden" - name="_method" - value="delete" - /> - <input - :value="csrfToken" - type="hidden" - name="authenticity_token" - /> + <form ref="form" :action="deleteWikiUrl" method="post" class="js-requires-input"> + <input ref="method" type="hidden" name="_method" value="delete" /> + <input :value="csrfToken" type="hidden" name="authenticity_token" /> </form> </gl-modal> </div> |