kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2020-06-26 06:09:03 +00:00
parent df7a85f372
commit d15cc2684c
155 changed files with 232 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/alert_management/components/alert_management_list.vue
View File

@ -441,7 +441,7 @@ export default {
:prev-page="prevPage" :prev-page="prevPage"
:next-page="nextPage" :next-page="nextPage"
align="center" align="center"
class="gl-pagination prepend-top-default" class="gl-pagination gl-mt-3"
@input="handlePageChange" @input="handlePageChange"
/> />
</div> </div>

2
app/assets/javascripts/badges/components/badge_form.vue
View File

@ -164,7 +164,7 @@ export default {
<template> <template>
<form <form
:class="{ 'was-validated': wasValidated }" :class="{ 'was-validated': wasValidated }"
class="prepend-top-default gl-mb-3 needs-validation" class="gl-mt-3 gl-mb-3 needs-validation"
novalidate novalidate
@submit.prevent.stop="onSubmit" @submit.prevent.stop="onSubmit"
> >

2
app/assets/javascripts/batch_comments/components/preview_dropdown.vue
View File

@ -96,7 +96,7 @@ export default {
<preview-item :draft="draft" :is-last="isLast(index)" /> <preview-item :draft="draft" :is-last="isLast(index)" />
</li> </li>
</ul> </ul>
<gl-loading-icon v-else size="lg" class="prepend-top-default gl-mb-3" /> <gl-loading-icon v-else size="lg" class="gl-mt-3 gl-mb-3" />
</div> </div>
<div class="dropdown-footer"> <div class="dropdown-footer">
<publish-button <publish-button

2
app/assets/javascripts/blob/notebook/notebook_viewer.vue
View File

@ -62,7 +62,7 @@ export default {
</script> </script>
<template> <template>
<div class="js-notebook-viewer-mounted container-fluid md prepend-top-default gl-mb-3"> <div class="js-notebook-viewer-mounted container-fluid md gl-mt-3 gl-mb-3">
<div v-if="loading && !error" class="text-center loading"> <div v-if="loading && !error" class="text-center loading">
<gl-loading-icon class="mt-5" size="lg" /> <gl-loading-icon class="mt-5" size="lg" />
</div> </div>

2
app/assets/javascripts/blob/pdf/pdf_viewer.vue
View File

@ -34,7 +34,7 @@ export default {
</script> </script>
<template> <template>
<div class="js-pdf-viewer container-fluid md prepend-top-default gl-mb-3"> <div class="js-pdf-viewer container-fluid md gl-mt-3 gl-mb-3">
<div v-if="loading && !error" class="text-center loading"> <div v-if="loading && !error" class="text-center loading">
<gl-loading-icon class="mt-5" size="lg" /> <gl-loading-icon class="mt-5" size="lg" />
</div> </div>

2
app/assets/javascripts/blob/sketch/index.js
View File

@ -56,7 +56,7 @@ export default class SketchLoader {
error() { error() {
const errorMsg = document.createElement('p'); const errorMsg = document.createElement('p');
errorMsg.className = 'prepend-top-default gl-mb-3 text-center'; errorMsg.className = 'gl-mt-3 gl-mb-3 text-center';
errorMsg.textContent = __(` errorMsg.textContent = __(`
Cannot show preview. For previews on sketch files, they must have the file format Cannot show preview. For previews on sketch files, they must have the file format
introduced by Sketch version 43 and above. introduced by Sketch version 43 and above.

7
app/assets/javascripts/environments/components/container.vue
View File

@ -67,12 +67,7 @@ export default {
<template> <template>
<div class="environments-container"> <div class="environments-container">
<gl-loading-icon <gl-loading-icon v-if="isLoading" size="md" class="gl-mt-3" label="Loading environments" />
v-if="isLoading"
size="md"
class="prepend-top-default"
label="Loading environments"
/>
<slot name="emptyState"></slot> <slot name="emptyState"></slot>

2
app/assets/javascripts/groups/components/groups.vue
View File

@ -49,7 +49,7 @@ export default {
<pagination-links <pagination-links
:change="change" :change="change"
:page-info="pageInfo" :page-info="pageInfo"
class="d-flex justify-content-center prepend-top-default" class="d-flex justify-content-center gl-mt-3"
/> />
</template> </template>
</div> </div>

2
app/assets/javascripts/ide/components/jobs/list.vue
View File

@ -26,7 +26,7 @@ export default {
<template> <template>
<div> <div>
<gl-loading-icon v-if="loading && !stages.length" size="lg" class="prepend-top-default" /> <gl-loading-icon v-if="loading && !stages.length" size="lg" class="gl-mt-3" />
<template v-else> <template v-else>
<stage <stage
v-for="stage in stages" v-for="stage in stages"

2
app/assets/javascripts/ide/components/jobs/stage.vue
View File

@ -56,7 +56,7 @@ export default {
</script> </script>
<template> <template>
<div class="ide-stage card prepend-top-default"> <div class="ide-stage card gl-mt-3">
<div <div
ref="cardHeader" ref="cardHeader"
:class="{ :class="{

5
app/assets/javascripts/ide/components/new_dropdown/modal.vue
View File

@ -154,10 +154,7 @@ export default {
data-qa-selector="file_name_field" data-qa-selector="file_name_field"
:placeholder="placeholder" :placeholder="placeholder"
/> />
<ul <ul v-if="isCreatingNewFile" class="file-templates gl-mt-3 list-inline qa-template-list">
v-if="isCreatingNewFile"
class="file-templates prepend-top-default list-inline qa-template-list"
>
<li v-for="(template, index) in templateTypes" :key="index" class="list-inline-item"> <li v-for="(template, index) in templateTypes" :key="index" class="list-inline-item">
<button <button
type="button" type="button"

2
app/assets/javascripts/ide/components/pipelines/list.vue
View File

@ -59,7 +59,7 @@ export default {
<template> <template>
<div class="ide-pipeline"> <div class="ide-pipeline">
<gl-loading-icon v-if="showLoadingIcon" size="lg" class="prepend-top-default" /> <gl-loading-icon v-if="showLoadingIcon" size="lg" class="gl-mt-3" />
<template v-else-if="hasLoadedPipeline"> <template v-else-if="hasLoadedPipeline">
<header v-if="latestPipeline" class="ide-tree-header ide-pipeline-header"> <header v-if="latestPipeline" class="ide-tree-header ide-pipeline-header">
<ci-icon :status="latestPipeline.details.status" :size="24" class="d-flex" /> <ci-icon :status="latestPipeline.details.status" :size="24" class="d-flex" />

2
app/assets/javascripts/ide/components/terminal/empty_state.vue
View File

@ -43,7 +43,7 @@ export default {
<div class="text-center p-3"> <div class="text-center p-3">
<div v-if="illustrationPath" class="svg-content svg-130"><img :src="illustrationPath" /></div> <div v-if="illustrationPath" class="svg-content svg-130"><img :src="illustrationPath" /></div>
<h4>{{ __('Web Terminal') }}</h4> <h4>{{ __('Web Terminal') }}</h4>
<gl-loading-icon v-if="isLoading" size="lg" class="prepend-top-default" /> <gl-loading-icon v-if="isLoading" size="lg" class="gl-mt-3" />
<template v-else> <template v-else>
<p>{{ __('Run tests against your code live using the Web Terminal') }}</p> <p>{{ __('Run tests against your code live using the Web Terminal') }}</p>
<p> <p>

2
app/assets/javascripts/issue_show/components/edit_actions.vue
View File

@ -63,7 +63,7 @@ export default {
</script> </script>
<template> <template>
<div class="prepend-top-default gl-mb-3 clearfix"> <div class="gl-mt-3 gl-mb-3 clearfix">
<button <button
:class="{ disabled: formState.updateLoading || !isSubmitEnabled }" :class="{ disabled: formState.updateLoading || !isSubmitEnabled }"
:disabled="formState.updateLoading || !isSubmitEnabled" :disabled="formState.updateLoading || !isSubmitEnabled"

2
app/assets/javascripts/jobs/components/environments_block.vue
View File

@ -274,7 +274,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div class="prepend-top-default gl-mb-3 js-environment-container"> <div class="gl-mt-3 gl-mb-3 js-environment-container">
<div class="environment-information"> <div class="environment-information">
<ci-icon :status="iconStatus" /> <ci-icon :status="iconStatus" />
<p class="inline gl-mb-0" v-html="environment"></p> <p class="inline gl-mb-0" v-html="environment"></p>

2
app/assets/javascripts/jobs/components/erased_block.vue
View File

@ -27,7 +27,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div class="prepend-top-default js-build-erased"> <div class="gl-mt-3 js-build-erased">
<div class="erased alert alert-warning"> <div class="erased alert alert-warning">
<template v-if="isErasedByUser"> <template v-if="isErasedByUser">
{{ s__('Job|Job has been erased by') }} {{ s__('Job|Job has been erased by') }}

4
app/assets/javascripts/jobs/components/job_app.vue
View File

@ -270,7 +270,7 @@ export default {
<div <div
v-if="job.archived" v-if="job.archived"
ref="sticky" ref="sticky"
class="js-archived-job prepend-top-default archived-job" class="js-archived-job gl-mt-3 archived-job"
:class="{ 'sticky-top border-bottom-0': hasTrace }" :class="{ 'sticky-top border-bottom-0': hasTrace }"
> >
<icon name="lock" class="align-text-bottom" /> <icon name="lock" class="align-text-bottom" />
@ -280,7 +280,7 @@ export default {
<div <div
v-if="hasTrace" v-if="hasTrace"
class="build-trace-container position-relative" class="build-trace-container position-relative"
:class="{ 'prepend-top-default': !job.archived }" :class="{ 'gl-mt-3': !job.archived }"
> >
<log-top-bar <log-top-bar
:class="{ :class="{

2
app/assets/javascripts/jobs/components/manual_variables_form.vue
View File

@ -172,7 +172,7 @@ export default {
</div> </div>
</div> </div>
</div> </div>
<div class="d-flex prepend-top-default justify-content-center"> <div class="d-flex gl-mt-3 justify-content-center">
<p class="text-muted" v-html="helpText"></p> <p class="text-muted" v-html="helpText"></p>
</div> </div>
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">

2
app/assets/javascripts/pipelines/components/header_component.vue
View File

@ -108,7 +108,7 @@ export default {
/> />
</ci-header> </ci-header>
<gl-loading-icon v-if="isLoading" size="lg" class="prepend-top-default gl-mb-3" /> <gl-loading-icon v-if="isLoading" size="lg" class="gl-mt-3 gl-mb-3" />
<gl-modal <gl-modal
:modal-id="$options.DELETE_MODAL_ID" :modal-id="$options.DELETE_MODAL_ID"

4
app/assets/javascripts/pipelines/components/test_reports/test_reports.vue
View File

@ -45,7 +45,7 @@ export default {
<template> <template>
<div v-if="isLoading"> <div v-if="isLoading">
<gl-loading-icon size="lg" class="prepend-top-default js-loading-spinner" /> <gl-loading-icon size="lg" class="gl-mt-3 js-loading-spinner" />
</div> </div>
<div <div
@ -73,7 +73,7 @@ export default {
</div> </div>
<div v-else> <div v-else>
<div class="row prepend-top-default"> <div class="row gl-mt-3">
<div class="col-12"> <div class="col-12">
<p class="js-no-tests-to-show">{{ s__('TestReports|There are no tests to show.') }}</p> <p class="js-no-tests-to-show">{{ s__('TestReports|There are no tests to show.') }}</p>
</div> </div>

2
app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue
View File

@ -36,7 +36,7 @@ export default {
<template> <template>
<div> <div>
<div class="row prepend-top-default"> <div class="row gl-mt-3">
<div class="col-12"> <div class="col-12">
<h4>{{ heading }}</h4> <h4>{{ heading }}</h4>
</div> </div>

2
app/assets/javascripts/pipelines/components/test_reports/test_summary_table.vue
View File

@ -40,7 +40,7 @@ export default {
<template> <template>
<div> <div>
<div class="row prepend-top-default"> <div class="row gl-mt-3">
<div class="col-12"> <div class="col-12">
<h4>{{ heading }}</h4> <h4>{{ heading }}</h4>
</div> </div>

2
app/assets/javascripts/projects/pipelines/charts/components/pipelines_area_chart.vue
View File

@ -28,7 +28,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div class="prepend-top-default"> <div class="gl-mt-3">
<p> <p>
<slot></slot> <slot></slot>
</p> </p>

2
app/assets/javascripts/releases/components/app_show.vue
View File

@ -21,7 +21,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div class="prepend-top-default"> <div class="gl-mt-3">
<gl-skeleton-loading v-if="isFetchingRelease" /> <gl-skeleton-loading v-if="isFetchingRelease" />
<release-block v-else-if="!fetchError" :release="release" /> <release-block v-else-if="!fetchError" :release="release" />

2
app/assets/javascripts/releases/components/evidence_block.vue
View File

@ -59,7 +59,7 @@ export default {
<template> <template>
<div> <div>
<div class="card-text prepend-top-default"> <div class="card-text gl-mt-3">
<b>{{ __('Evidence collection') }}</b> <b>{{ __('Evidence collection') }}</b>
</div> </div>
<div v-for="(evidence, index) in evidences" :key="evidenceTitle(index)" class="mb-2"> <div v-for="(evidence, index) in evidences" :key="evidenceTitle(index)" class="mb-2">

2
app/assets/javascripts/releases/components/release_block.vue
View File

@ -108,7 +108,7 @@ export default {
<release-block-assets v-if="shouldRenderAssets" :assets="assets" /> <release-block-assets v-if="shouldRenderAssets" :assets="assets" />
<evidence-block v-if="hasEvidence && shouldShowEvidence" :release="release" /> <evidence-block v-if="hasEvidence && shouldShowEvidence" :release="release" />
<div ref="gfm-content" class="card-text prepend-top-default"> <div ref="gfm-content" class="card-text gl-mt-3">
<div class="md" v-html="release.descriptionHtml"></div> <div class="md" v-html="release.descriptionHtml"></div>
</div> </div>
</div> </div>

2
app/assets/javascripts/releases/components/release_block_assets.vue
View File

@ -96,7 +96,7 @@ export default {
</script> </script>
<template> <template>
<div class="card-text prepend-top-default"> <div class="card-text gl-mt-3">
<template v-if="glFeatures.releaseAssetLinkType"> <template v-if="glFeatures.releaseAssetLinkType">
<gl-button <gl-button
data-testid="accordion-button" data-testid="accordion-button"

8
app/assets/javascripts/serverless/components/functions.vue
View File

@ -75,7 +75,7 @@ export default {
<template> <template>
<section id="serverless-functions" class="flex-grow"> <section id="serverless-functions" class="flex-grow">
<gl-loading-icon v-if="checkingInstalled" size="lg" class="prepend-top-default gl-mb-3" /> <gl-loading-icon v-if="checkingInstalled" size="lg" class="gl-mt-3 gl-mb-3" />
<div v-else-if="isInstalled"> <div v-else-if="isInstalled">
<div v-if="hasFunctionData"> <div v-if="hasFunctionData">
@ -91,11 +91,7 @@ export default {
</ul> </ul>
</div> </div>
</template> </template>
<gl-loading-icon <gl-loading-icon v-if="isLoading" size="lg" class="gl-mt-3 gl-mb-3 js-functions-loader" />
v-if="isLoading"
size="lg"
class="prepend-top-default gl-mb-3 js-functions-loader"
/>
</div> </div>
<div v-else class="empty-state js-empty-state"> <div v-else class="empty-state js-empty-state">
<div class="text-content"> <div class="text-content">

2
app/assets/javascripts/vue_merge_request_widget/components/loading.vue
View File

@ -9,7 +9,7 @@ export default {
</script> </script>
<template> <template>
<div class="prepend-top-default"> <div class="gl-mt-3">
<div class="mr-widget-heading p-3"> <div class="mr-widget-heading p-3">
<gl-skeleton-loader :width="577" :height="12"> <gl-skeleton-loader :width="577" :height="12">
<rect width="86" height="12" rx="2" /> <rect width="86" height="12" rx="2" />

2
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View File

@ -365,7 +365,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div v-if="mr" class="mr-state-widget prepend-top-default"> <div v-if="mr" class="mr-state-widget gl-mt-3">
<mr-widget-header :mr="mr" /> <mr-widget-header :mr="mr" />
<mr-widget-suggest-pipeline <mr-widget-suggest-pipeline
v-if="shouldSuggestPipelines" v-if="shouldSuggestPipelines"

2
app/assets/javascripts/vue_shared/components/markdown/field.vue
View File

@ -231,7 +231,7 @@ export default {
<template> <template>
<div <div
ref="gl-form" ref="gl-form"
:class="{ 'prepend-top-default gl-mb-3': addSpacingClasses }" :class="{ 'gl-mt-3 gl-mb-3': addSpacingClasses }"
class="js-vue-markdown-field md-area position-relative" class="js-vue-markdown-field md-area position-relative"
> >
<markdown-header <markdown-header

2
app/assets/javascripts/vue_shared/components/pagination/table_pagination.vue
View File

@ -64,7 +64,7 @@ export default {
<template> <template>
<gl-pagination <gl-pagination
v-if="showPagination" v-if="showPagination"
class="justify-content-center prepend-top-default" class="justify-content-center gl-mt-3"
v-bind="$attrs" v-bind="$attrs"
:value="pageInfo.page" :value="pageInfo.page"
:per-page="pageInfo.perPage" :per-page="pageInfo.perPage"

1
app/assets/stylesheets/framework/common.scss
View File

@ -399,7 +399,6 @@ img.emoji {
.prepend-top-5 { margin-top: 5px; } .prepend-top-5 { margin-top: 5px; }
.prepend-top-10 { margin-top: 10px; } .prepend-top-10 { margin-top: 10px; }
.prepend-top-15 { margin-top: 15px; } .prepend-top-15 { margin-top: 15px; }
.prepend-top-default { margin-top: $gl-padding !important; }
.prepend-top-16 { margin-top: 16px; } .prepend-top-16 { margin-top: 16px; }
.prepend-top-20 { margin-top: 20px; } .prepend-top-20 { margin-top: 20px; }
.prepend-left-5 { margin-left: 5px; } .prepend-left-5 { margin-left: 5px; }

2
app/helpers/projects_helper.rb
View File

@ -568,7 +568,7 @@ module ProjectsHelper
end end
def project_child_container_class(view_path) def project_child_container_class(view_path)
view_path == "projects/issues/issues" ? "prepend-top-default" : "project-show-#{view_path}" view_path == "projects/issues/issues" ? "gl-mt-3" : "project-show-#{view_path}"
end end
def project_issues(project) def project_issues(project)

4
app/views/admin/appearances/_form.html.haml
View File

@ -1,6 +1,6 @@
- parsed_with_gfm = "Content parsed with #{link_to('GitLab Flavored Markdown', help_page_path('user/markdown'), target: '_blank')}.".html_safe - parsed_with_gfm = "Content parsed with #{link_to('GitLab Flavored Markdown', help_page_path('user/markdown'), target: '_blank')}.".html_safe
= form_for @appearance, url: admin_appearances_path, html: { class: 'prepend-top-default' } do |f| = form_for @appearance, url: admin_appearances_path, html: { class: 'gl-mt-3' } do |f|
= form_errors(@appearance) = form_errors(@appearance)
@ -100,7 +100,7 @@
.hint .hint
= parsed_with_gfm = parsed_with_gfm
.prepend-top-default.gl-mb-3 .gl-mt-3.gl-mb-3
= f.submit 'Update appearance settings', class: 'btn btn-success' = f.submit 'Update appearance settings', class: 'btn btn-success'
- if @appearance.persisted? || @appearance.updated_at - if @appearance.persisted? || @appearance.updated_at
.mt-4 .mt-4

2
app/views/admin/dashboard/index.html.haml
View File

@ -10,7 +10,7 @@
dismissible: true.to_s } } dismissible: true.to_s } }
= notice[:message].html_safe = notice[:message].html_safe
.admin-dashboard.prepend-top-default .admin-dashboard.gl-mt-3
.row .row
.col-sm-4 .col-sm-4
.info-well.dark-well .info-well.dark-well

2
app/views/admin/groups/index.html.haml
View File

@ -1,7 +1,7 @@
- page_title _("Groups") - page_title _("Groups")
.top-area .top-area
.prepend-top-default.gl-mb-3 .gl-mt-3.gl-mb-3
= form_tag admin_groups_path, method: :get, class: 'js-search-form' do |f| = form_tag admin_groups_path, method: :get, class: 'js-search-form' do |f|
= hidden_field_tag :sort, @sort = hidden_field_tag :sort, @sort
.search-holder .search-holder

2
app/views/admin/hook_logs/_index.html.haml
View File

@ -1,4 +1,4 @@
.row.prepend-top-default.gl-mb-3 .row.gl-mt-3.gl-mb-3
.col-lg-3 .col-lg-3
%h4.gl-mt-0 %h4.gl-mt-0
Recent Deliveries Recent Deliveries

2
app/views/admin/hooks/_form.html.haml
View File

@ -16,7 +16,7 @@
System hook will be triggered on set of events like creating project System hook will be triggered on set of events like creating project
or adding ssh key. But you can also enable extra triggers like Push events. or adding ssh key. But you can also enable extra triggers like Push events.
.prepend-top-default .gl-mt-3
= form.check_box :repository_update_events, class: 'float-left' = form.check_box :repository_update_events, class: 'float-left'
.prepend-left-20 .prepend-left-20
= form.label :repository_update_events, class: 'list-label' do = form.label :repository_update_events, class: 'list-label' do

2
app/views/admin/hooks/edit.html.haml
View File

@ -1,7 +1,7 @@
- add_to_breadcrumbs @hook.pluralized_name, admin_hooks_path - add_to_breadcrumbs @hook.pluralized_name, admin_hooks_path
- page_title _('Edit System Hook') - page_title _('Edit System Hook')
.row.prepend-top-default .row.gl-mt-3
.col-lg-3 .col-lg-3
= render 'shared/web_hooks/title_and_docs', hook: @hook = render 'shared/web_hooks/title_and_docs', hook: @hook

2
app/views/admin/hooks/index.html.haml
View File

@ -1,6 +1,6 @@
- page_title @hook.pluralized_name - page_title @hook.pluralized_name
.row.prepend-top-default .row.gl-mt-3
.col-lg-4 .col-lg-4
= render 'shared/web_hooks/title_and_docs', hook: @hook = render 'shared/web_hooks/title_and_docs', hook: @hook

2
app/views/admin/impersonation_tokens/index.html.haml
View File

@ -6,7 +6,7 @@
= render 'admin/users/head' = render 'admin/users/head'
.row.prepend-top-default .row.gl-mt-3
.col-lg-12 .col-lg-12
- if @new_impersonation_token - if @new_impersonation_token
= render 'shared/access_tokens/created_container', = render 'shared/access_tokens/created_container',

2
app/views/admin/requests_profiles/index.html.haml
View File

@ -9,7 +9,7 @@
to profile the request to profile the request
- if @profiles.present? - if @profiles.present?
.prepend-top-default .gl-mt-3
- @profiles.each do |path, profiles| - @profiles.each do |path, profiles|
.card.card-small .card.card-small
.card-header .card-header

2
app/views/admin/sessions/new.html.haml
View File

@ -15,7 +15,7 @@
-# Show a message if none of the mechanisms above are enabled -# Show a message if none of the mechanisms above are enabled
- if !allow_admin_mode_password_authentication_for_web? && !ldap_sign_in_enabled? && !omniauth_enabled? - if !allow_admin_mode_password_authentication_for_web? && !ldap_sign_in_enabled? && !omniauth_enabled?
.prepend-top-default.center .gl-mt-3.center
= _('No authentication methods configured.') = _('No authentication methods configured.')
- if omniauth_enabled? && button_based_providers_enabled? - if omniauth_enabled? && button_based_providers_enabled?

6
app/views/admin/system_info/show.html.haml
View File

@ -1,6 +1,6 @@
- page_title _('System Info') - page_title _('System Info')
.prepend-top-default .gl-mt-3
.row .row
.col-sm .col-sm
.bg-light.light-well .bg-light.light-well
@ -11,7 +11,7 @@
- else - else
= icon('warning', class: 'text-warning') = icon('warning', class: 'text-warning')
= _('Unable to collect CPU info') = _('Unable to collect CPU info')
.bg-light.light-well.prepend-top-default .bg-light.light-well.gl-mt-3
%h4= _('Memory Usage') %h4= _('Memory Usage')
.data .data
- if @memory - if @memory
@ -19,7 +19,7 @@
- else - else
= icon('warning', class: 'text-warning') = icon('warning', class: 'text-warning')
= _('Unable to collect memory info') = _('Unable to collect memory info')
.bg-light.light-well.prepend-top-default .bg-light.light-well.gl-mt-3
%h4= _('Uptime') %h4= _('Uptime')
.data .data
%h2= distance_of_time_in_words_to_now(Rails.application.config.booted_at) %h2= distance_of_time_in_words_to_now(Rails.application.config.booted_at)

2
app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml
View File

@ -1,5 +1,5 @@
- link = link_to(s_('ClusterIntegration|sign up'), 'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral', target: '_blank', rel: 'noopener noreferrer') - link = link_to(s_('ClusterIntegration|sign up'), 'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral', target: '_blank', rel: 'noopener noreferrer')
.bs-callout.gcp-signup-offer.alert.alert-block.alert-dismissable.prepend-top-default.gl-mb-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: user_callouts_path } } .bs-callout.gcp-signup-offer.alert.alert-block.alert-dismissable.gl-mt-3.gl-mb-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: user_callouts_path } }
%button.close.js-close{ type: "button" } &times; %button.close.js-close{ type: "button" } &times;
.gcp-signup-offer--content .gcp-signup-offer--content
.gcp-signup-offer--icon.gl-mr-3 .gcp-signup-offer--icon.gl-mr-3

2
app/views/clusters/clusters/new.html.haml
View File

@ -6,7 +6,7 @@
= render_gcp_signup_offer = render_gcp_signup_offer
.row.prepend-top-default .row.gl-mt-3
.col-md-3 .col-md-3
= render 'sidebar' = render 'sidebar'
.col-md-9.js-toggle-container .col-md-9.js-toggle-container

2
app/views/doorkeeper/applications/_form.html.haml
View File

@ -25,5 +25,5 @@
= f.label :scopes, class: 'label-bold' = f.label :scopes, class: 'label-bold'
= render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes
.prepend-top-default .gl-mt-3
= f.submit _('Save application'), class: "btn btn-success" = f.submit _('Save application'), class: "btn btn-success"

2
app/views/doorkeeper/applications/index.html.haml
View File

@ -1,7 +1,7 @@
- page_title _("Applications") - page_title _("Applications")
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= page_title = page_title

6
app/views/groups/_home_panel.html.haml
View File

@ -27,7 +27,7 @@
- new_project_label = _("New project") - new_project_label = _("New project")
- new_subgroup_label = _("New subgroup") - new_subgroup_label = _("New subgroup")
- if can_create_projects and can_create_subgroups - if can_create_projects and can_create_subgroups
.btn-group.new-project-subgroup.droplab-dropdown.home-panel-action-button.prepend-top-default.js-new-project-subgroup.qa-new-project-or-subgroup-dropdown{ data: { project_path: new_project_path(namespace_id: @group.id), subgroup_path: new_group_path(parent_id: @group.id) } } .btn-group.new-project-subgroup.droplab-dropdown.home-panel-action-button.gl-mt-3.js-new-project-subgroup.qa-new-project-or-subgroup-dropdown{ data: { project_path: new_project_path(namespace_id: @group.id), subgroup_path: new_group_path(parent_id: @group.id) } }
%input.btn.btn-success.dropdown-primary.js-new-group-child.qa-new-in-group-button{ type: "button", value: new_project_label, data: { action: "new-project" } } %input.btn.btn-success.dropdown-primary.js-new-group-child.qa-new-in-group-button{ type: "button", value: new_project_label, data: { action: "new-project" } }
%button.btn.btn-success.dropdown-toggle.js-dropdown-toggle.qa-new-project-or-subgroup-dropdown-toggle{ type: "button", data: { "dropdown-trigger" => "#new-project-or-subgroup-dropdown", 'display' => 'static' } } %button.btn.btn-success.dropdown-toggle.js-dropdown-toggle.qa-new-project-or-subgroup-dropdown-toggle{ type: "button", data: { "dropdown-trigger" => "#new-project-or-subgroup-dropdown", 'display' => 'static' } }
= sprite_icon("chevron-down", css_class: "icon dropdown-btn-icon") = sprite_icon("chevron-down", css_class: "icon dropdown-btn-icon")
@ -48,9 +48,9 @@
%strong= new_subgroup_label %strong= new_subgroup_label
%span= s_("GroupsTree|Create a subgroup in this group.") %span= s_("GroupsTree|Create a subgroup in this group.")
- elsif can_create_projects - elsif can_create_projects
= link_to new_project_label, new_project_path(namespace_id: @group.id), class: "btn btn-success prepend-top-default" = link_to new_project_label, new_project_path(namespace_id: @group.id), class: "btn btn-success gl-mt-3"
- elsif can_create_subgroups - elsif can_create_subgroups
= link_to new_subgroup_label, new_group_path(parent_id: @group.id), class: "btn btn-success prepend-top-default" = link_to new_subgroup_label, new_group_path(parent_id: @group.id), class: "btn btn-success gl-mt-3"
- if @group.description.present? - if @group.description.present?
.group-home-desc.mt-1 .group-home-desc.mt-1

2
app/views/groups/group_members/index.html.haml
View File

@ -4,7 +4,7 @@
- pending_active = params[:search_invited].present? - pending_active = params[:search_invited].present?
- total_count = @members.count + @group.shared_with_group_links.count - total_count = @members.count + @group.shared_with_group_links.count
.project-members-page.prepend-top-default .project-members-page.gl-mt-3
%h4 %h4
= _("Group members") = _("Group members")
%hr %hr

2
app/views/groups/new.html.haml
View File

@ -4,7 +4,7 @@
- header_title _("Groups"), dashboard_groups_path - header_title _("Groups"), dashboard_groups_path
- active_tab = local_assigns.fetch(:active_tab, 'create') - active_tab = local_assigns.fetch(:active_tab, 'create')
.group-edit-container.prepend-top-default .group-edit-container.gl-mt-3
.row .row
.col-lg-3.group-settings-sidebar .col-lg-3.group-settings-sidebar
%h4.prepend-top-0 %h4.prepend-top-0

2
app/views/groups/projects.html.haml
View File

@ -1,7 +1,7 @@
- breadcrumb_title _("Projects") - breadcrumb_title _("Projects")
- page_title _("Projects") - page_title _("Projects")
.card.prepend-top-default .card.gl-mt-3
.card-header .card-header
%strong= @group.name %strong= @group.name
projects: projects:

2
app/views/groups/settings/_general.html.haml
View File

@ -19,7 +19,7 @@
= render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group
.form-group.prepend-top-default.append-bottom-20 .form-group.gl-mt-3.append-bottom-20
.avatar-container.rect-avatar.s90 .avatar-container.rect-avatar.s90
= group_icon(@group, alt: '', class: 'avatar group-avatar s90') = group_icon(@group, alt: '', class: 'avatar group-avatar s90')
= f.label :avatar, _('Group avatar'), class: 'label-bold d-block' = f.label :avatar, _('Group avatar'), class: 'label-bold d-block'

2
app/views/groups/settings/_permissions.html.haml
View File

@ -40,4 +40,4 @@
= render_if_exists 'groups/personal_access_token_expiration_policy', f: f, group: @group = render_if_exists 'groups/personal_access_token_expiration_policy', f: f, group: @group
= render_if_exists 'groups/member_lock_setting', f: f, group: @group = render_if_exists 'groups/member_lock_setting', f: f, group: @group
= f.submit _('Save changes'), class: 'btn btn-success prepend-top-default js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' } = f.submit _('Save changes'), class: 'btn btn-success gl-mt-3 js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' }

2
app/views/groups/settings/ci_cd/_form.html.haml
View File

@ -1,4 +1,4 @@
.row.prepend-top-default .row.gl-mt-3
.col-lg-12 .col-lg-12
= form_for group, url: group_settings_ci_cd_path(group, anchor: 'js-general-pipeline-settings') do |f| = form_for group, url: group_settings_ci_cd_path(group, anchor: 'js-general-pipeline-settings') do |f|
= form_errors(group) = form_errors(group)

4
app/views/help/index.html.haml
View File

@ -1,6 +1,6 @@
%div %div
- if Gitlab::CurrentSettings.help_page_text.present? - if Gitlab::CurrentSettings.help_page_text.present?
.prepend-top-default.md .gl-mt-3.md
= markdown_field(Gitlab::CurrentSettings.current_application_settings, :help_page_text) = markdown_field(Gitlab::CurrentSettings.current_application_settings, :help_page_text)
%hr %hr
@ -28,7 +28,7 @@
%p= link_to 'Check the current instance configuration ', help_instance_configuration_url %p= link_to 'Check the current instance configuration ', help_instance_configuration_url
%hr %hr
.row.prepend-top-default .row.gl-mt-3
.col-md-8 .col-md-8
.documentation-index.md .documentation-index.md
= markdown(@help_index) = markdown(@help_index)

2
app/views/help/show.html.haml
View File

@ -1,5 +1,5 @@
- page_title @path.split("/").reverse.map(&:humanize) - page_title @path.split("/").reverse.map(&:humanize)
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
.documentation.md.prepend-top-default .documentation.md.gl-mt-3
= markdown @markdown = markdown @markdown

2
app/views/instance_statistics/dev_ops_score/_callout.html.haml
View File

@ -1,4 +1,4 @@
.prepend-top-default .gl-mt-3
.user-callout{ data: { uid: 'dev_ops_score_intro_callout_dismissed' } } .user-callout{ data: { uid: 'dev_ops_score_intro_callout_dismissed' } }
.bordered-box.landing.content-block .bordered-box.landing.content-block
%button.btn.btn-default.close.js-close-callout{ type: 'button', %button.btn.btn-default.close.js-close-callout{ type: 'button',

2
app/views/instance_statistics/dev_ops_score/index.html.haml
View File

@ -5,7 +5,7 @@
- if usage_ping_enabled && show_callout?('dev_ops_score_intro_callout_dismissed') - if usage_ping_enabled && show_callout?('dev_ops_score_intro_callout_dismissed')
= render 'callout' = render 'callout'
.prepend-top-default .gl-mt-3
- if !usage_ping_enabled - if !usage_ping_enabled
= render 'disabled' = render 'disabled'
- elsif @metric.blank? - elsif @metric.blank?

2
app/views/kaminari/gitlab/_paginator.html.haml
View File

@ -6,7 +6,7 @@
-# remote: data-remote -# remote: data-remote
-# paginator: the paginator that renders the pagination tags inside -# paginator: the paginator that renders the pagination tags inside
= paginator.render do = paginator.render do
.gl-pagination.prepend-top-default .gl-pagination.gl-mt-3
%ul.pagination.justify-content-center %ul.pagination.justify-content-center
= prev_page_tag = prev_page_tag
- each_page do |page| - each_page do |page|

2
app/views/kaminari/gitlab/_without_count.html.haml
View File

@ -1,4 +1,4 @@
.gl-pagination.prepend-top-default .gl-pagination.gl-mt-3
%ul.pagination.justify-content-center %ul.pagination.justify-content-center
- if previous_path - if previous_path
%li.page-item.prev %li.page-item.prev

8
app/views/profiles/accounts/show.html.haml
View File

@ -5,7 +5,7 @@
.alert.alert-info .alert.alert-info
= s_('Profiles|Some options are unavailable for LDAP accounts') = s_('Profiles|Some options are unavailable for LDAP accounts')
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= s_('Profiles|Two-Factor Authentication') = s_('Profiles|Two-Factor Authentication')
@ -22,7 +22,7 @@
%hr %hr
- if display_providers_on_profile? - if display_providers_on_profile?
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= s_('Profiles|Social sign-in') = s_('Profiles|Social sign-in')
@ -32,7 +32,7 @@
= render 'providers', providers: button_based_providers, group_saml_identities: local_assigns[:group_saml_identities] = render 'providers', providers: button_based_providers, group_saml_identities: local_assigns[:group_saml_identities]
%hr %hr
- if current_user.can_change_username? - if current_user.can_change_username?
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0.warning-title %h4.gl-mt-0.warning-title
= s_('Profiles|Change username') = s_('Profiles|Change username')
@ -45,7 +45,7 @@
#update-username{ data: data } #update-username{ data: data }
%hr %hr
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0.danger-title %h4.gl-mt-0.danger-title
= s_('Profiles|Delete account') = s_('Profiles|Delete account')

2
app/views/profiles/active_sessions/index.html.haml
View File

@ -1,7 +1,7 @@
- page_title _('Active Sessions') - page_title _('Active Sessions')
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= page_title = page_title

2
app/views/profiles/audit_log.html.haml
View File

@ -1,7 +1,7 @@
- page_title _('Authentication log') - page_title _('Authentication log')
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= page_title = page_title

2
app/views/profiles/chat_names/index.html.haml
View File

@ -1,7 +1,7 @@
- page_title _('Chat') - page_title _('Chat')
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= page_title = page_title

4
app/views/profiles/emails/index.html.haml
View File

@ -1,7 +1,7 @@
- page_title _('Emails') - page_title _('Emails')
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= page_title = page_title
@ -14,7 +14,7 @@
.form-group .form-group
= f.label :email, _('Email'), class: 'label-bold' = f.label :email, _('Email'), class: 'label-bold'
= f.text_field :email, class: 'form-control', data: { qa_selector: 'email_address_field' } = f.text_field :email, class: 'form-control', data: { qa_selector: 'email_address_field' }
.prepend-top-default .gl-mt-3
= f.submit _('Add email address'), class: 'btn btn-success', data: { qa_selector: 'add_email_address_button' } = f.submit _('Add email address'), class: 'btn btn-success', data: { qa_selector: 'add_email_address_button' }
%hr %hr
%h4.gl-mt-0 %h4.gl-mt-0

2
app/views/profiles/gpg_keys/_form.html.haml
View File

@ -6,5 +6,5 @@
= f.label :key, s_('Profiles|Key'), class: 'label-bold' = f.label :key, s_('Profiles|Key'), class: 'label-bold'
= f.text_area :key, class: "form-control", rows: 8, required: true, placeholder: _("Don't paste the private part of the GPG key. Paste the public part which begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'.") = f.text_area :key, class: "form-control", rows: 8, required: true, placeholder: _("Don't paste the private part of the GPG key. Paste the public part which begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'.")
.prepend-top-default .gl-mt-3
= f.submit s_('Profiles|Add key'), class: "btn btn-success" = f.submit s_('Profiles|Add key'), class: "btn btn-success"

2
app/views/profiles/gpg_keys/index.html.haml
View File

@ -1,7 +1,7 @@
- page_title _('GPG Keys') - page_title _('GPG Keys')
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= page_title = page_title

2
app/views/profiles/keys/_form.html.haml
View File

@ -23,5 +23,5 @@
%button.btn.btn-success.js-add-ssh-key-validation-confirm-submit= _("Yes, add it") %button.btn.btn-success.js-add-ssh-key-validation-confirm-submit= _("Yes, add it")
.prepend-top-default .gl-mt-3
= f.submit s_('Profiles|Add key'), class: "btn btn-success js-add-ssh-key-validation-original-submit qa-add-key-button" = f.submit s_('Profiles|Add key'), class: "btn btn-success js-add-ssh-key-validation-original-submit qa-add-key-button"

2
app/views/profiles/keys/_key_details.html.haml
View File

@ -1,5 +1,5 @@
- is_admin = defined?(admin) ? true : false - is_admin = defined?(admin) ? true : false
.row.prepend-top-default .row.gl-mt-3
.col-md-4 .col-md-4
.card .card
.card-header .card-header

2
app/views/profiles/keys/index.html.haml
View File

@ -1,7 +1,7 @@
- page_title _('SSH Keys') - page_title _('SSH Keys')
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= page_title = page_title

4
app/views/profiles/notifications/show.html.haml
View File

@ -9,7 +9,7 @@
%li= msg %li= msg
= hidden_field_tag :notification_type, 'global' = hidden_field_tag :notification_type, 'global'
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= page_title = page_title
@ -21,7 +21,7 @@
%h5.gl-mt-0 %h5.gl-mt-0
= _('Global notification settings') = _('Global notification settings')
= form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications prepend-top-default' } do |f| = form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications gl-mt-3' } do |f|
= render_if_exists 'profiles/notifications/email_settings', form: f = render_if_exists 'profiles/notifications/email_settings', form: f
= label_tag :global_notification_level, "Global notification level", class: "label-bold" = label_tag :global_notification_level, "Global notification level", class: "label-bold"

4
app/views/profiles/passwords/edit.html.haml
View File

@ -2,7 +2,7 @@
- page_title _('Password') - page_title _('Password')
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= page_title = page_title
@ -29,7 +29,7 @@
.form-group .form-group
= f.label :password_confirmation, _('Password confirmation'), class: 'label-bold' = f.label :password_confirmation, _('Password confirmation'), class: 'label-bold'
= f.password_field :password_confirmation, required: true, class: 'form-control', data: { qa_selector: 'confirm_password_field' } = f.password_field :password_confirmation, required: true, class: 'form-control', data: { qa_selector: 'confirm_password_field' }
.prepend-top-default.gl-mb-3 .gl-mt-3.gl-mb-3
= f.submit _('Save password'), class: "btn btn-success append-right-10", data: { qa_selector: 'save_password_button' } = f.submit _('Save password'), class: "btn btn-success append-right-10", data: { qa_selector: 'save_password_button' }
- unless @user.password_automatically_set? - unless @user.password_automatically_set?
= link_to _('I forgot my password'), reset_profile_password_path, method: :put = link_to _('I forgot my password'), reset_profile_password_path, method: :put

8
app/views/profiles/personal_access_tokens/index.html.haml
View File

@ -4,7 +4,7 @@
- type_plural = _('personal access tokens') - type_plural = _('personal access tokens')
- @content_class = 'limit-container-width' unless fluid_layout - @content_class = 'limit-container-width' unless fluid_layout
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= page_title = page_title
@ -33,7 +33,7 @@
revoke_route_helper: ->(token) { revoke_profile_personal_access_token_path(token) } revoke_route_helper: ->(token) { revoke_profile_personal_access_token_path(token) }
%hr %hr
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= s_('AccessTokens|Feed token') = s_('AccessTokens|Feed token')
@ -51,7 +51,7 @@
- if incoming_email_token_enabled? - if incoming_email_token_enabled?
%hr %hr
.row.prepend-top-default .row.gl-mt-3
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4.gl-mt-0 %h4.gl-mt-0
= s_('AccessTokens|Incoming email token') = s_('AccessTokens|Incoming email token')
@ -69,7 +69,7 @@
- if static_objects_external_storage_enabled? - if static_objects_external_storage_enabled?
%hr %hr
.row.prepend-top-default .row.gl-mt-3
.col-lg-4 .col-lg-4
%h4.gl-mt-0 %h4.gl-mt-0
= s_('AccessTokens|Static object token') = s_('AccessTokens|Static object token')

2
app/views/profiles/preferences/show.html.haml
View File

@ -1,7 +1,7 @@
- page_title _('Preferences') - page_title _('Preferences')
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
= form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row prepend-top-default js-preferences-form' } do |f| = form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row gl-mt-3 js-preferences-form' } do |f|
.col-lg-4.application-theme .col-lg-4.application-theme
%h4.gl-mt-0 %h4.gl-mt-0
= s_('Preferences|Navigation theme') = s_('Preferences|Navigation theme')

4
app/views/profiles/show.html.haml
View File

@ -3,7 +3,7 @@
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
- gravatar_link = link_to Gitlab.config.gravatar.host, 'https://' + Gitlab.config.gravatar.host - gravatar_link = link_to Gitlab.config.gravatar.host, 'https://' + Gitlab.config.gravatar.host
= bootstrap_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user prepend-top-default js-quick-submit gl-show-field-errors' }, authenticity_token: true do |f| = bootstrap_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user gl-mt-3 js-quick-submit gl-show-field-errors' }, authenticity_token: true do |f|
= form_errors(@user) = form_errors(@user)
.row .row
@ -118,7 +118,7 @@
= f.check_box :include_private_contributions, label: s_('Profiles|Include private contributions on my profile'), wrapper_class: 'mb-2', inline: true = f.check_box :include_private_contributions, label: s_('Profiles|Include private contributions on my profile'), wrapper_class: 'mb-2', inline: true
.help-block .help-block
= s_("Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information") = s_("Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information")
.prepend-top-default.gl-mb-3 .gl-mt-3.gl-mb-3
= f.submit s_("Profiles|Update profile settings"), class: 'btn btn-success' = f.submit s_("Profiles|Update profile settings"), class: 'btn btn-success'
= link_to _("Cancel"), user_path(current_user), class: 'btn btn-cancel' = link_to _("Cancel"), user_path(current_user), class: 'btn btn-cancel'

6
app/views/profiles/two_factor_auths/show.html.haml
View File

@ -3,7 +3,7 @@
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
.js-two-factor-auth{ 'data-two-factor-skippable' => "#{two_factor_skippable?}", 'data-two_factor_skip_url' => skip_profile_two_factor_auth_path } .js-two-factor-auth{ 'data-two-factor-skippable' => "#{two_factor_skippable?}", 'data-two_factor_skip_url' => skip_profile_two_factor_auth_path }
.row.prepend-top-default .row.gl-mt-3
.col-lg-4 .col-lg-4
%h4.gl-mt-0 %h4.gl-mt-0
= _('Register Two-Factor Authenticator') = _('Register Two-Factor Authenticator')
@ -50,12 +50,12 @@
.form-group .form-group
= label_tag :pin_code, _('Pin code'), class: "label-bold" = label_tag :pin_code, _('Pin code'), class: "label-bold"
= text_field_tag :pin_code, nil, class: "form-control", required: true = text_field_tag :pin_code, nil, class: "form-control", required: true
.prepend-top-default .gl-mt-3
= submit_tag _('Register with two-factor app'), class: 'btn btn-success' = submit_tag _('Register with two-factor app'), class: 'btn btn-success'
%hr %hr
.row.prepend-top-default .row.gl-mt-3
.col-lg-4 .col-lg-4
%h4.gl-mt-0 %h4.gl-mt-0
= _('Register Universal Two-Factor (U2F) Device') = _('Register Universal Two-Factor (U2F) Device')

2
app/views/projects/_wiki.html.haml
View File

@ -1,6 +1,6 @@
- if @wiki_home.present? - if @wiki_home.present?
%div{ class: container_class } %div{ class: container_class }
.md.prepend-top-default.gl-mb-3 .md.gl-mt-3.gl-mb-3
= render_wiki_content(@wiki_home) = render_wiki_content(@wiki_home)
- else - else
- can_create_wiki = can?(current_user, :create_wiki, @project) - can_create_wiki = can?(current_user, :create_wiki, @project)

2
app/views/projects/blob/viewers/_loading.html.haml
View File

@ -1,2 +1,2 @@
.text-center.prepend-top-default.gl-mb-3 .text-center.gl-mt-3.gl-mb-3
= icon('spinner spin 2x', 'aria-hidden' => 'true', 'aria-label' => 'Loading content…', class: 'qa-spinner') = icon('spinner spin 2x', 'aria-hidden' => 'true', 'aria-label' => 'Loading content…', class: 'qa-spinner')

2
app/views/projects/blob/viewers/_sketch.html.haml
View File

@ -1,3 +1,3 @@
.file-content#js-sketch-viewer{ data: { endpoint: blob_raw_path } } .file-content#js-sketch-viewer{ data: { endpoint: blob_raw_path } }
.js-loading-icon.text-center.prepend-top-default.gl-mb-3.js-loading-icon{ 'aria-label' => 'Loading Sketch preview' } .js-loading-icon.text-center.gl-mt-3.gl-mb-3.js-loading-icon{ 'aria-label' => 'Loading Sketch preview' }
= icon('spinner spin 2x', 'aria-hidden' => 'true'); = icon('spinner spin 2x', 'aria-hidden' => 'true');

4
app/views/projects/blob/viewers/_stl.html.haml
View File

@ -1,7 +1,7 @@
.file-content.is-stl-loading .file-content.is-stl-loading
.text-center#js-stl-viewer{ data: { endpoint: blob_raw_path } } .text-center#js-stl-viewer{ data: { endpoint: blob_raw_path } }
= icon('spinner spin 2x', class: 'prepend-top-default gl-mb-3', 'aria-hidden' => 'true', 'aria-label' => 'Loading') = icon('spinner spin 2x', class: 'gl-mt-3 gl-mb-3', 'aria-hidden' => 'true', 'aria-label' => 'Loading')
.text-center.prepend-top-default.gl-mb-3.stl-controls .text-center.gl-mt-3.gl-mb-3.stl-controls
.btn-group .btn-group
%button.btn.btn-default.btn-sm.js-material-changer{ data: { type: 'wireframe' } } %button.btn.btn-default.btn-sm.js-material-changer{ data: { type: 'wireframe' } }
Wireframe Wireframe

2
app/views/projects/environments/_form.html.haml
View File

@ -1,4 +1,4 @@
.row.prepend-top-default.gl-mb-3 .row.gl-mt-3.gl-mb-3
.col-lg-3 .col-lg-3
%h4.gl-mt-0 %h4.gl-mt-0
= _("Environments") = _("Environments")

2
app/views/projects/find_file/show.html.haml
View File

@ -23,5 +23,5 @@
= _('There are no matching files') = _('There are no matching files')
%p.text-secondary %p.text-secondary
= _('Try using a different search term to find the file you are looking for.') = _('Try using a different search term to find the file you are looking for.')
.text-center.prepend-top-default.loading .text-center.gl-mt-3.loading
.spinner.spinner-md .spinner.spinner-md

8
app/views/projects/forks/_fork_button.html.haml
View File

@ -2,17 +2,17 @@
- can_create_project = current_user.can?(:create_projects, namespace) - can_create_project = current_user.can?(:create_projects, namespace)
- if forked_project = namespace.find_fork_of(@project) - if forked_project = namespace.find_fork_of(@project)
.bordered-box.fork-thumbnail.text-center.prepend-left-default.append-right-default.prepend-top-default.gl-mb-3.forked .bordered-box.fork-thumbnail.text-center.prepend-left-default.append-right-default.gl-mt-3.gl-mb-3.forked
= link_to project_path(forked_project) do = link_to project_path(forked_project) do
- if /no_((\w*)_)*avatar/.match(avatar) - if /no_((\w*)_)*avatar/.match(avatar)
= group_icon(namespace, class: "avatar rect-avatar s100 identicon mx-auto") = group_icon(namespace, class: "avatar rect-avatar s100 identicon mx-auto")
- else - else
.avatar-container.s100.mx-auto .avatar-container.s100.mx-auto
= image_tag(avatar, class: "avatar s100") = image_tag(avatar, class: "avatar s100")
%h5.prepend-top-default %h5.gl-mt-3
= namespace.human_name = namespace.human_name
- else - else
.bordered-box.fork-thumbnail.text-center.prepend-left-default.append-right-default.prepend-top-default.gl-mb-3{ class: ("disabled" unless can_create_project) } .bordered-box.fork-thumbnail.text-center.prepend-left-default.append-right-default.gl-mt-3.gl-mb-3{ class: ("disabled" unless can_create_project) }
= link_to project_forks_path(@project, namespace_key: namespace.id), = link_to project_forks_path(@project, namespace_key: namespace.id),
method: "POST", method: "POST",
class: ("disabled has-tooltip" unless can_create_project), class: ("disabled has-tooltip" unless can_create_project),
@ -22,5 +22,5 @@
- else - else
.avatar-container.s100.mx-auto .avatar-container.s100.mx-auto
= image_tag(avatar, class: "avatar s100") = image_tag(avatar, class: "avatar s100")
%h5.prepend-top-default{ data: { qa_selector: 'fork_namespace_content', qa_name: namespace.human_name } } %h5.gl-mt-3{ data: { qa_selector: 'fork_namespace_content', qa_name: namespace.human_name } }
= namespace.human_name = namespace.human_name

4
app/views/projects/forks/new.html.haml
View File

@ -1,6 +1,6 @@
- page_title _("Fork project") - page_title _("Fork project")
.row.prepend-top-default .row.gl-mt-3
.col-lg-3 .col-lg-3
%h4.gl-mt-0 %h4.gl-mt-0
= _("Fork project") = _("Fork project")
@ -16,6 +16,6 @@
- else - else
%strong %strong
= _("No available namespaces to fork the project.") = _("No available namespaces to fork the project.")
%p.prepend-top-default %p.gl-mt-3
= _("You must have permission to create a project in a namespace before forking.") = _("You must have permission to create a project in a namespace before forking.")

2
app/views/projects/hook_logs/show.html.haml
View File

@ -2,7 +2,7 @@
- add_to_breadcrumbs _('Webhook Settings'), namespace_project_hooks_path - add_to_breadcrumbs _('Webhook Settings'), namespace_project_hooks_path
- page_title _('Webhook Logs') - page_title _('Webhook Logs')
.row.prepend-top-default.gl-mb-3 .row.gl-mt-3.gl-mb-3
.col-lg-3 .col-lg-3
%h4.gl-mt-0 %h4.gl-mt-0
Request details Request details

2
app/views/projects/hooks/edit.html.haml
View File

@ -2,7 +2,7 @@
- add_to_breadcrumbs _('Webhook Settings'), namespace_project_hooks_path - add_to_breadcrumbs _('Webhook Settings'), namespace_project_hooks_path
- page_title _('Webhook') - page_title _('Webhook')
.row.prepend-top-default .row.gl-mt-3
.col-lg-3 .col-lg-3
= render 'shared/web_hooks/title_and_docs', hook: @hook = render 'shared/web_hooks/title_and_docs', hook: @hook

2
app/views/projects/hooks/index.html.haml
View File

@ -2,7 +2,7 @@
- breadcrumb_title _('Webhook Settings') - breadcrumb_title _('Webhook Settings')
- page_title _('Webhooks') - page_title _('Webhooks')
.row.prepend-top-default .row.gl-mt-3
.col-lg-4 .col-lg-4
= render 'shared/web_hooks/title_and_docs', hook: @hook = render 'shared/web_hooks/title_and_docs', hook: @hook

2
app/views/projects/merge_requests/diffs/_commit_widget.html.haml
View File

@ -3,7 +3,7 @@
- `assets/javascripts/diffs/components/commit_widget.vue` - `assets/javascripts/diffs/components/commit_widget.vue`
-#----------------------------------------------------------------- -#-----------------------------------------------------------------
- if @commit - if @commit
.info-well.d-none.d-sm-block.prepend-top-default .info-well.d-none.d-sm-block.gl-mt-3
.well-segment .well-segment
%ul.blob-commit-info %ul.blob-commit-info
= render 'projects/commits/commit', commit: @commit, merge_request: @merge_request, view_details: true = render 'projects/commits/commit', commit: @commit, merge_request: @merge_request, view_details: true

4
app/views/projects/milestones/show.html.haml
View File

@ -9,10 +9,10 @@
= render_if_exists 'shared/milestones/burndown', milestone: @milestone, project: @project = render_if_exists 'shared/milestones/burndown', milestone: @milestone, project: @project
- if can?(current_user, :read_issue, @project) && @milestone.total_issues_count.zero? - if can?(current_user, :read_issue, @project) && @milestone.total_issues_count.zero?
.alert.alert-success.prepend-top-default .alert.alert-success.gl-mt-3
%span= _('Assign some issues to this milestone.') %span= _('Assign some issues to this milestone.')
- elsif @milestone.complete? && @milestone.active? - elsif @milestone.complete? && @milestone.active?
.alert.alert-success.prepend-top-default .alert.alert-success.gl-mt-3
%span= _('All issues for this milestone are closed. You may close this milestone now.') %span= _('All issues for this milestone are closed. You may close this milestone now.')
= render 'shared/milestones/tabs', milestone: @milestone = render 'shared/milestones/tabs', milestone: @milestone

2
app/views/projects/mirrors/_instructions.html.haml
View File

@ -1,4 +1,4 @@
.account-well.prepend-top-default.gl-mb-3 .account-well.gl-mt-3.gl-mb-3
%ul %ul
%li %li
= _('The repository must be accessible over <code>http://</code>, = _('The repository must be accessible over <code>http://</code>,

2
app/views/projects/mirrors/_ssh_host_keys.html.haml
View File

@ -28,6 +28,6 @@
= _('Input host keys manually') = _('Input host keys manually')
%span.label-hide %span.label-hide
= _('Hide host keys manual input') = _('Hide host keys manual input')
.js-ssh-known-hosts.collapse.prepend-top-default .js-ssh-known-hosts.collapse.gl-mt-3
= f.label :ssh_known_hosts, _('SSH host keys'), class: 'label-bold' = f.label :ssh_known_hosts, _('SSH host keys'), class: 'label-bold'
= f.text_area :ssh_known_hosts, class: 'form-control known-hosts js-known-hosts', rows: '10' = f.text_area :ssh_known_hosts, class: 'form-control known-hosts js-known-hosts', rows: '10'

2
app/views/projects/network/show.html.haml
View File

@ -16,5 +16,5 @@
- if @commit - if @commit
.network-graph{ data: { url: @url, commit_url: @commit_url, ref: @ref, commit_id: @commit.id } } .network-graph{ data: { url: @url, commit_url: @commit_url, ref: @ref, commit_id: @commit.id } }
.text-center.prepend-top-default .text-center.gl-mt-3
.spinner.spinner-md .spinner.spinner-md

2
app/views/projects/new.html.haml
View File

@ -4,7 +4,7 @@
- header_title _("Projects"), dashboard_projects_path - header_title _("Projects"), dashboard_projects_path
- active_tab = local_assigns.fetch(:active_tab, 'blank') - active_tab = local_assigns.fetch(:active_tab, 'blank')
.project-edit-container.prepend-top-default .project-edit-container.gl-mt-3
.project-edit-errors .project-edit-errors
= render 'projects/errors' = render 'projects/errors'

2
app/views/projects/project_members/index.html.haml
View File

@ -1,7 +1,7 @@
- page_title _("Members") - page_title _("Members")
- can_admin_project_members = can?(current_user, :admin_project_member, @project) - can_admin_project_members = can?(current_user, :admin_project_member, @project)
.row.prepend-top-default .row.gl-mt-3
.col-lg-12 .col-lg-12
- if project_can_be_shared? - if project_can_be_shared?
%h4 %h4

2
app/views/projects/protected_branches/show.html.haml
View File

@ -1,6 +1,6 @@
- page_title @protected_ref.name, _("Protected Branches") - page_title @protected_ref.name, _("Protected Branches")
.row.prepend-top-default.gl-mb-3 .row.gl-mt-3.gl-mb-3
.col-lg-3 .col-lg-3
%h4.gl-mt-0.ref-name %h4.gl-mt-0.ref-name
= @protected_ref.name = @protected_ref.name

2
app/views/projects/protected_tags/show.html.haml
View File

@ -1,6 +1,6 @@
- page_title @protected_ref.name, _("Protected Tags") - page_title @protected_ref.name, _("Protected Tags")
.row.prepend-top-default.gl-mb-3 .row.gl-mt-3.gl-mb-3
.col-lg-3 .col-lg-3
%h4.gl-mt-0.ref-name %h4.gl-mt-0.ref-name
= @protected_ref.name = @protected_ref.name

2
app/views/projects/services/_form.html.haml
View File

@ -1,4 +1,4 @@
.row.prepend-top-default.gl-mb-3 .row.gl-mt-3.gl-mb-3
.col-lg-4 .col-lg-4
%h4.gl-mt-0 %h4.gl-mt-0
= @service.title = @service.title

4
app/views/projects/services/prometheus/_configuration_banner.html.haml
View File

@ -12,14 +12,14 @@
.svg-container .svg-container
= image_tag 'illustrations/monitoring/getting_started.svg' = image_tag 'illustrations/monitoring/getting_started.svg'
.col-sm-10 .col-sm-10
%p.text-success.prepend-top-default %p.text-success.gl-mt-3
= s_('PrometheusService|Prometheus is being automatically managed on your clusters') = s_('PrometheusService|Prometheus is being automatically managed on your clusters')
= link_to s_('PrometheusService|Manage clusters'), project_clusters_path(project), class: 'btn' = link_to s_('PrometheusService|Manage clusters'), project_clusters_path(project), class: 'btn'
- else - else
.col-sm-2 .col-sm-2
= image_tag 'illustrations/monitoring/loading.svg' = image_tag 'illustrations/monitoring/loading.svg'
.col-sm-10 .col-sm-10
%p.prepend-top-default %p.gl-mt-3
= s_('PrometheusService|Automatically deploy and configure Prometheus on your clusters to monitor your project’s environments') = s_('PrometheusService|Automatically deploy and configure Prometheus on your clusters to monitor your project’s environments')
= link_to s_('PrometheusService|Install Prometheus on clusters'), project_clusters_path(project), class: 'btn btn-success' = link_to s_('PrometheusService|Install Prometheus on clusters'), project_clusters_path(project), class: 'btn btn-success'

Some files were not shown because too many files have changed in this diff Show More