Merge branch 'master' into fl-eslint-vue-house-keeping-ee

* master: (114 commits)
  Restoring user v3 endpoint
  Ee 44674 use one column form layout on admin area settings page
  Resolve "Add link to Jenkins integration page"
  Resolve "Participants tooltip is cutoff when too close to the window edge"
  Resolve conflicts in locale/gitlab.pot
  Resolve conflicts in doc/ci/variables/README.md
  Resolve conflicts in Gemfile.rails5.lock
  Fix group member filter layout
  Align nav bar items
  Fix labels too large
  Fix bootstrap popover class renames
  Added the correct checkbox markup for the push rules
  mergeError message has been binded using v-html directive
  Fixed IDE jobs empty state showing when loading
  Find and mark more Git disk access locations, part 2
  Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter
  i18n: document how to use links without splitting sentences
  Update HA docs for standby database nodes
  Ensure MR diffs always exist in the PR importer
  Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wiki/user_views_wiki_page_spec.rb"
  ...

.gitlab-ci.yml

@@ -550,6 +550,7 @@ setup-test-env:
   script:
     - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
     - scripts/gitaly-test-build # Do not use 'bundle exec' here
+    - BUNDLE_GEMFILE=Gemfile.rails5 bundle install $BUNDLE_INSTALL_FLAGS
   artifacts:
     expire_in: 7d
     paths:
@@ -743,6 +744,12 @@ downtime_check:
     - /(^docs[\/-].*|.*-docs$)/
     - /(^qa[\/-].*|.*-qa$)/
 
+rails5_gemfile_lock_check:
+  <<: *dedicated-no-docs-no-db-pull-cache-job
+  <<: *except-docs-and-qa
+  script:
+    - scripts/rails5-gemfile-lock-check
+
 ee_compat_check:
   <<: *rake-exec
   except:

Gemfile.lock

@@ -320,7 +320,7 @@ GEM
       flowdock (~> 0.7)
       gitlab-grit (>= 2.4.1)
       multi_json
-    gitlab-gollum-lib (4.2.7.2)
+    gitlab-gollum-lib (4.2.7.4)
       gemojione (~> 3.2)
       github-markup (~> 1.6)
       gollum-grit_adapter (~> 1.0)
@@ -328,7 +328,7 @@ GEM
       rouge (~> 3.1)
       sanitize (~> 2.1)
       stringex (~> 2.6)
-    gitlab-gollum-rugged_adapter (0.4.4)
+    gitlab-gollum-rugged_adapter (0.4.4.1)
       mime-types (>= 1.15)
       rugged (~> 0.25)
     gitlab-grit (2.8.2)

Gemfile.rails5.lock

@@ -340,7 +340,7 @@ GEM
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
     gitlab-license (1.0.0)
-    gitlab-markup (1.6.3)
+    gitlab-markup (1.6.4)
     gitlab-styles (2.3.2)
       rubocop (~> 0.51)
       rubocop-gitlab-security (~> 0.1.0)
@@ -780,36 +780,36 @@ GEM
       chunky_png
     rqrcode-rails3 (0.1.7)
       rqrcode (>= 0.4.2)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.7.0)
     rspec-parameterized (0.4.0)
       binding_of_caller
       parser
       proc_to_ast
       rspec (>= 2.13, < 4)
       unparser
-    rspec-rails (3.6.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.6.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
     rspec-retry (0.4.5)
       rspec-core
     rspec-set (0.1.3)
-    rspec-support (3.6.0)
+    rspec-support (3.7.1)
     rspec_profiling (0.0.5)
       activerecord
       pg
@@ -1089,7 +1089,7 @@ DEPENDENCIES
   gitlab-gollum-lib (~> 4.2)
   gitlab-gollum-rugged_adapter (~> 0.4.4)
   gitlab-license (~> 1.0)
-  gitlab-markup (~> 1.6.2)
+  gitlab-markup (~> 1.6.4)
   gitlab-styles (~> 2.3)
   gitlab_omniauth-ldap (~> 2.0.4)
   gon (~> 6.2)
@@ -1189,7 +1189,7 @@ DEPENDENCIES
   rouge (~> 3.1)
   rqrcode-rails3 (~> 0.1.7)
   rspec-parameterized
-  rspec-rails (~> 3.6.0)
+  rspec-rails (~> 3.7.0)
   rspec-retry (~> 0.4.5)
   rspec-set (~> 0.1.3)
   rspec_profiling (~> 0.0.5)

PROCESS.md

@@ -193,11 +193,7 @@ next patch release.
 
 If a merge request is to be picked into more than one release it will need one
 `Pick into X.Y` label per release where the merge request should be back-ported
-to.
-
-For example, if the current patch release is `10.1.1` and a regression fix needs
-to be backported down to the `9.5` release, you will need to assign it the
-`10.1` milestone and the following labels:
+to. For example:
 
 - `Pick into 10.1`
 - `Pick into 10.0`

app/assets/javascripts/ide/components/jobs/detail.vue

@@ -122,6 +122,7 @@ export default {
       @scroll="scrollBuildLog"
     >
       <code
+        v-show="!detailJob.isLoading"
         class="bash"
         v-html="jobOutput"
       >

app/assets/javascripts/ide/stores/modules/merge_requests/actions.js

@@ -31,10 +31,15 @@ export const openMergeRequest = ({ commit, dispatch }, { projectPath, id }) => {
   commit(rootTypes.CLEAR_PROJECTS, null, { root: true });
   commit(rootTypes.SET_CURRENT_MERGE_REQUEST, `${id}`, { root: true });
   commit(rootTypes.RESET_OPEN_FILES, null, { root: true });
-  dispatch('pipelines/stopPipelinePolling', null, { root: true });
-  dispatch('pipelines/clearEtagPoll', null, { root: true });
   dispatch('pipelines/resetLatestPipeline', null, { root: true });
   dispatch('setCurrentBranchId', '', { root: true });
+  dispatch('pipelines/stopPipelinePolling', null, { root: true })
+    .then(() => {
+      dispatch('pipelines/clearEtagPoll', null, { root: true });
+    })
+    .catch(e => {
+      throw e;
+    });
 
   router.push(`/project/${projectPath}/merge_requests/${id}`);
 };

app/assets/javascripts/ide/stores/modules/pipelines/actions.js

@@ -12,8 +12,12 @@ let eTagPoll;
 export const clearEtagPoll = () => {
   eTagPoll = null;
 };
-export const stopPipelinePolling = () => eTagPoll && eTagPoll.stop();
-export const restartPipelinePolling = () => eTagPoll && eTagPoll.restart();
+export const stopPipelinePolling = () => {
+  if (eTagPoll) eTagPoll.stop();
+};
+export const restartPipelinePolling = () => {
+  if (eTagPoll) eTagPoll.restart();
+};
 
 export const requestLatestPipeline = ({ commit }) => commit(types.REQUEST_LATEST_PIPELINE);
 export const receiveLatestPipelineError = ({ commit, dispatch }) => {
@@ -51,9 +55,9 @@ export const fetchLatestPipeline = ({ dispatch, rootGetters }) => {
 
   Visibility.change(() => {
     if (!Visibility.hidden()) {
-      eTagPoll.restart();
+      dispatch('restartPipelinePolling');
     } else {
-      eTagPoll.stop();
+      dispatch('stopPipelinePolling');
     }
   });
 };

app/assets/javascripts/monitoring/components/graph/flag.vue

@@ -126,7 +126,7 @@ export default {
       class="prometheus-graph-flag popover"
     >
       <div class="arrow"></div>
-      <div class="popover-title">
+      <div class="popover-header">
         <h5 v-if="deploymentFlagData">
           Deployed
         </h5>
@@ -135,7 +135,7 @@ export default {
       </div>
       <div
         v-if="deploymentFlagData"
-        class="popover-content deploy-meta-content"
+        class="popover-body deploy-meta-content"
       >
         <div>
           <icon
@@ -158,7 +158,7 @@ export default {
           </a>
         </div>
       </div>
-      <div class="popover-content">
+      <div class="popover-body">
         <table class="prometheus-table">
           <tr
             v-for="(series, index) in timeSeries"

app/assets/javascripts/pipelines/pipeline_details_bundle.js

@@ -115,6 +115,10 @@ export default () => {
     const dependencyScanningHelpPath = datasetOptions.dependencyScanningHelpPath;
     const vulnerabilityFeedbackPath = datasetOptions.vulnerabilityFeedbackPath;
     const vulnerabilityFeedbackHelpPath = datasetOptions.vulnerabilityFeedbackHelpPath;
+    const dastEndpoint = datasetOptions.dastEndpoint;
+    const sastContainerEndpoint = datasetOptions.sastContainerEndpoint;
+    const dastHelpPath = datasetOptions.dastHelpPath;
+    const sastContainerHelpPath = datasetOptions.sastContainerHelpPath;
     const pipelineId = parseInt(datasetOptions.pipelineId, 10);
 
     const store = createStore();
@@ -164,6 +168,10 @@ export default () => {
             vulnerabilityFeedbackPath,
             vulnerabilityFeedbackHelpPath,
             pipelineId,
+            dastHeadPath: dastEndpoint,
+            sastContainerHeadPath: sastContainerEndpoint,
+            dastHelpPath,
+            sastContainerHelpPath,
           },
           on: {
             updateBadgeCount: this.updateBadge,

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue

 <script>
+  import tooltip from '~/vue_shared/directives/tooltip';
   import MrWidgetAuthor from './mr_widget_author.vue';
 
   export default {
-    name: 'MRWidgetAuthorTime',
+    name: 'MrWidgetAuthorTime',
     components: {
       MrWidgetAuthor,
     },
+    directives: {
+      tooltip,
+    },
     props: {
       actionText: {
         type: String,
@@ -32,8 +36,7 @@
     <mr-widget-author :author="author" />
     <time
       :title="dateTitle"
-      data-toggle="tooltip"
-      data-placement="top"
+      v-tooltip
       data-container="body"
     >
       {{ dateReadable }}

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue

 <script>
-  import mrWidgetAuthorTime from '../../components/mr_widget_author_time.vue';
+  import MrWidgetAuthorTime from '../../components/mr_widget_author_time.vue';
   import statusIcon from '../mr_widget_status_icon.vue';
 
   export default {
     name: 'MRWidgetClosed',
     components: {
-      mrWidgetAuthorTime,
+      MrWidgetAuthorTime,
       statusIcon,
     },
     props: {

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue

 <script>
 import { n__ } from '~/locale';
+import { stripHtml } from '~/lib/utils/text_utility';
 import statusIcon from '../mr_widget_status_icon.vue';
 import eventHub from '../../event_hub';
 
@@ -27,6 +28,9 @@ export default {
   },
 
   computed: {
+    mergeError() {
+      return this.mr.mergeError ? stripHtml(this.mr.mergeError, ' ').trim() : '';
+    },
     timerText() {
       return n__(
         'Refreshing in a second to show the updated status...',
@@ -85,7 +89,7 @@ export default {
             v-if="mr.mergeError"
             class="has-error-message"
           >
-            {{ mr.mergeError }}.
+            {{ mergeError }}.
           </span>
           <span v-else>
             {{ s__("mrWidget|Merge failed.") }}

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue

@@ -4,7 +4,7 @@
   import loadingIcon from '~/vue_shared/components/loading_icon.vue';
   import { s__, __ } from '~/locale';
   import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
-  import mrWidgetAuthorTime from '../../components/mr_widget_author_time.vue';
+  import MrWidgetAuthorTime from '../../components/mr_widget_author_time.vue';
   import statusIcon from '../mr_widget_status_icon.vue';
   import eventHub from '../../event_hub';
 
@@ -14,7 +14,7 @@
       tooltip,
     },
     components: {
-      mrWidgetAuthorTime,
+      MrWidgetAuthorTime,
       loadingIcon,
       statusIcon,
       ClipboardButton,

app/assets/stylesheets/bootstrap_migration.scss

@@ -89,7 +89,12 @@ a {
   color: $gl-link-color;
 }
 
+hr {
+  overflow: hidden;
+}
+
 .form-group.row .col-form-label {
+  padding-top: 0;
   // Bootstrap 4 aligns labels to the left
   // for horizontal forms
   @include media-breakpoint-up(md) {
@@ -209,6 +214,10 @@ table {
       border-bottom: 1px solid $well-inner-border;
     }
   }
+
+  .badge.badge-gray {
+    background-color: $well-expand-item;
+  }
 }
 
 .card {
@@ -258,9 +267,17 @@ pre code {
 .alert-danger {
   background-color: $red-500;
   border-color: $red-500;
+}
+
+.alert-warning,
+.alert-danger,
+.flash-notice {
+  border-radius: 0;
   color: $white-light;
 
-  h4 {
+  h4,
+  a,
+  .alert-link {
     color: $white-light;
   }
 }
@@ -268,3 +285,11 @@ pre code {
 input[type=color].form-control {
   height: $input-height;
 }
+
+.toggle-sidebar-button {
+  .collapse-text,
+  .icon-angle-double-left,
+  .icon-angle-double-right {
+    color: $gl-text-color-secondary;
+  }
+}

app/assets/stylesheets/framework/common.scss

@@ -309,18 +309,6 @@ img.emoji {
   margin-bottom: 10px;
 }
 
-.available-groups form {
-  margin: 5px 0;
-}
-
-.btn-sign-in {
-  text-shadow: none;
-
-  @include media-breakpoint-up(sm) {
-    margin-top: 8px;
-  }
-}
-
 .side-filters {
   fieldset {
     margin-bottom: 15px;

app/assets/stylesheets/framework/forms.scss

@@ -170,7 +170,7 @@ label {
 }
 
 .form-control::-webkit-input-placeholder {
-  color: $gl-text-color-secondary;
+  color: $placeholder-text-color;
 }
 
 .input-group {

app/assets/stylesheets/framework/header.scss

@@ -268,6 +268,8 @@
 
 .navbar-sub-nav,
 .navbar-nav {
+  align-items: center;
+
   > li {
     > a:hover,
     > a:focus {
@@ -447,16 +449,16 @@
 .btn-sign-in {
   background-color: $indigo-100;
   color: $indigo-900;
-  margin-top: 3px;
   font-weight: $gl-font-weight-bold;
+  line-height: 18px;
 
   &:hover {
     background-color: $white-light;
   }
-}
 
-.with-performance-bar header.navbar-gitlab {
-  top: $performance-bar-height;
+  @include media-breakpoint-down(xs) {
+    margin-top: $gl-padding-4;
+  }
 }
 
 .navbar-nav {

app/assets/stylesheets/framework/pagination.scss

@@ -4,3 +4,11 @@
     text-decoration: none;
   }
 }
+
+.page-item {
+  &.active {
+    .page-link {
+      z-index: 3;
+    }
+  }
+}

app/assets/stylesheets/framework/tables.scss

@@ -58,8 +58,13 @@ table {
         display: none;
       }
 
+      table,
+      tbody,
       td {
         display: block;
+      }
+
+      td {
         color: $gl-text-color-secondary;
       }
 

app/assets/stylesheets/framework/timeline.scss

@@ -4,7 +4,7 @@
   padding: 0;
 
   &::before {
-    @include notes-media('max', map-get($grid-breakpoints, xs)) {
+    @include notes-media('max', map-get($grid-breakpoints, sm)) {
       background: none;
     }
   }
@@ -34,7 +34,7 @@
   .timeline-entry-inner {
     position: relative;
 
-    @include notes-media('max', map-get($grid-breakpoints, xs)) {
+    @include notes-media('max', map-get($grid-breakpoints, sm)) {
       .timeline-icon {
         display: none;
       }

app/assets/stylesheets/framework/variables.scss

@@ -100,7 +100,7 @@ $theme-gray-200: #dfdfdf;
 $theme-gray-300: #cccccc;
 $theme-gray-400: #bababa;
 $theme-gray-500: #a7a7a7;
-$theme-gray-600: #949494;
+$theme-gray-600: #919191;
 $theme-gray-700: #707070;
 $theme-gray-800: #4f4f4f;
 $theme-gray-900: #2e2e2e;
@@ -192,7 +192,7 @@ $gl-font-weight-normal: 400;
 $gl-font-weight-bold: 600;
 $gl-text-color: #2e2e2e;
 $gl-text-color-secondary: #707070;
-$gl-text-color-tertiary: #949494;
+$gl-text-color-tertiary: #919191;
 $gl-text-color-quaternary: #d6d6d6;
 $gl-text-color-inverted: rgba(255, 255, 255, 1);
 $gl-text-color-secondary-inverted: rgba(255, 255, 255, 0.85);
@@ -443,6 +443,22 @@ $gl-btn-horz-padding: 12px;
 $badge-bg: rgba(0, 0, 0, 0.07);
 $badge-color: $gl-text-color-secondary;
 
+/*
+* Pagination
+*/
+$pagination-padding-y: 6px;
+$pagination-padding-x: 16px;
+$pagination-line-height: 20px;
+$pagination-border-color: $border-color;
+$pagination-active-bg: $blue-600;
+$pagination-active-border-color: $blue-600;
+$pagination-hover-bg: $blue-50;
+$pagination-hover-border-color: $border-color;
+$pagination-hover-color: $gl-text-color;
+$pagination-disabled-color: #cdcdcd;
+$pagination-disabled-bg: $gray-light;
+$pagination-disabled-border-color: $border-color;
+
 /*
  *  Status icons
  */

app/assets/stylesheets/pages/environments.scss

@@ -495,14 +495,14 @@
       border-width: 8px;
     }
 
-    > .popover-title,
-    > .popover-content {
+    > .popover-header,
+    > .popover-body {
       padding: 8px;
       font-size: 12px;
       white-space: nowrap;
     }
 
-    > .popover-title {
+    > .popover-header {
       background-color: $theme-gray-50;
     }
   }

app/assets/stylesheets/pages/labels.scss

@@ -58,7 +58,7 @@
 }
 
 .color-label {
-  padding: $gl-padding-4 $grid-size;
+  padding: 0 $grid-size;
   line-height: 16px;
   border-radius: $label-border-radius;
   color: $white-light;
@@ -112,6 +112,10 @@
       }
     }
   }
+
+  .color-label {
+    padding: $gl-padding-4 $grid-size;
+  }
 }
 
 .prioritized-labels {

app/assets/stylesheets/pages/members.scss

@@ -127,10 +127,6 @@
   background: transparent;
   border: 0;
   outline: 0;
-
-  @include media-breakpoint-up(sm) {
-    right: 160px;
-  }
 }
 
 .members-ldap {

app/assets/stylesheets/pages/milestone.scss

@@ -206,7 +206,7 @@
     padding: 0;
   }
 
-  .popover-content {
+  .popover-body {
     padding: 0;
   }
 }

app/assets/stylesheets/pages/repo.scss

@@ -1129,7 +1129,7 @@
 
 .ide-context-header {
   .avatar {
-    flex: 0 0 40px;
+    flex: 0 0 38px;
   }
 
   .ide-merge-requests-dropdown.dropdown-menu {

app/assets/stylesheets/pages/search.scss

@@ -29,7 +29,7 @@ input[type="checkbox"]:hover {
 }
 
 .search {
-  margin: 4px 8px 0;
+  margin: 0 8px;
 
   form {
     @extend .form-control;

app/models/ci/build.rb

@@ -615,6 +615,7 @@ module Ci
         variables
           .concat(pipeline.persisted_variables)
           .append(key: 'CI_JOB_ID', value: id.to_s)
+          .append(key: 'CI_JOB_URL', value: Gitlab::Routing.url_helpers.project_job_url(project, self))
           .append(key: 'CI_JOB_TOKEN', value: token, public: false)
           .append(key: 'CI_BUILD_ID', value: id.to_s)
           .append(key: 'CI_BUILD_TOKEN', value: token, public: false)

app/models/ci/pipeline.rb

@@ -8,6 +8,7 @@ module Ci
     include Gitlab::OptimisticLocking
     include Gitlab::Utils::StrongMemoize
     include AtomicInternalId
+    include EnumWithNil
 
     prepend ::EE::Ci::Pipeline
 
@@ -65,7 +66,7 @@ module Ci
 
     after_create :keep_around_commits, unless: :importing?
 
-    enum source: {
+    enum_with_nil source: {
       unknown: nil,
       push: 1,
       web: 2,
@@ -77,7 +78,7 @@ module Ci
       chat: 8
     }
 
-    enum config_source: {
+    enum_with_nil config_source: {
       unknown_source: nil,
       repository_source: 1,
       auto_devops_source: 2
@@ -565,7 +566,10 @@ module Ci
 
     def persisted_variables
       Gitlab::Ci::Variables::Collection.new.tap do |variables|
-        variables.append(key: 'CI_PIPELINE_ID', value: id.to_s) if persisted?
+        break variables unless persisted?
+
+        variables.append(key: 'CI_PIPELINE_ID', value: id.to_s)
+        variables.append(key: 'CI_PIPELINE_URL', value: Gitlab::Routing.url_helpers.project_pipeline_url(project, self))
       end
     end
 
@@ -616,17 +620,6 @@ module Ci
       @latest_builds_with_artifacts ||= builds.latest.with_artifacts_archive.to_a
     end
 
-    # Rails 5.0 autogenerated question mark enum methods return wrong result if enum value is nil.
-    # They always return `false`.
-    # These methods overwrite autogenerated ones to return correct results.
-    def unknown?
-      Gitlab.rails5? ? source.nil? : super
-    end
-
-    def unknown_source?
-      Gitlab.rails5? ? config_source.nil? : super
-    end
-
     private
 
     def ci_yaml_from_repo

app/models/commit_status.rb

@@ -3,6 +3,7 @@ class CommitStatus < ActiveRecord::Base
   include Importable
   include AfterCommitQueue
   include Presentable
+  include EnumWithNil
 
   self.table_name = 'ci_builds'
 
@@ -39,7 +40,7 @@ class CommitStatus < ActiveRecord::Base
   scope :retried_ordered, -> { retried.ordered.includes(project: :namespace) }
   scope :after_stage, -> (index) { where('stage_idx > ?', index) }
 
-  enum failure_reason: {
+  enum_with_nil failure_reason: {
     unknown_failure: nil,
     script_failure: 1,
     api_failure: 2,
@@ -190,11 +191,4 @@ class CommitStatus < ActiveRecord::Base
       v =~ /\d+/ ? v.to_i : v
     end
   end
-
-  # Rails 5.0 autogenerated question mark enum methods return wrong result if enum value is nil.
-  # They always return `false`.
-  # This method overwrites the autogenerated one to return correct result.
-  def unknown_failure?
-    Gitlab.rails5? ? failure_reason.nil? : super
-  end
 end

app/models/concerns/enum_with_nil.rb

+module EnumWithNil
+  extend ActiveSupport::Concern
+
+  included do
+    def self.enum_with_nil(definitions)
+      # use original `enum` to auto-define all methods
+      enum(definitions)
+
+      # override auto-defined methods only for the
+      # key which uses nil value
+      definitions.each do |name, values|
+        next unless key_with_nil = values.key(nil)
+
+        # E.g. for enum_with_nil failure_reason: { unknown_failure: nil }
+        # this overrides auto-generated method `unknown_failure?`
+        define_method("#{key_with_nil}?") do
+          Gitlab.rails5? ? self[name].nil? : super()
+        end
+
+        # E.g. for enum_with_nil failure_reason: { unknown_failure: nil }
+        # this overrides auto-generated method `failure_reason`
+        define_method(name) do
+          orig = super()
+
+          return orig unless Gitlab.rails5?
+          return orig unless orig.nil?
+
+          self.class.public_send(name.to_s.pluralize).key(nil) # rubocop:disable GitlabSecurity/PublicSend
+        end
+      end
+    end
+  end
+end

app/models/project.rb

@@ -1634,6 +1634,7 @@ class Project < ActiveRecord::Base
 
   def after_import
     repository.after_import
+    wiki.repository.after_import
     import_finish
     remove_import_jid
     update_project_counter_caches
@@ -2153,10 +2154,14 @@ class Project < ActiveRecord::Base
     check_access = -> do
       next false if empty_repo?
 
-      merge_request = source_of_merge_requests.opened
-                        .where(allow_collaboration: true)
-                        .find_by(source_branch: branch_name)
-      merge_request&.can_be_merged_by?(user)
+      merge_requests = source_of_merge_requests.opened
+                         .where(allow_collaboration: true)
+
+      if branch_name
+        merge_requests.find_by(source_branch: branch_name)&.can_be_merged_by?(user)
+      else
+        merge_requests.any? { |merge_request| merge_request.can_be_merged_by?(user) }
+      end
     end
 
     if RequestStore.active?

app/services/commits/create_service.rb

@@ -19,7 +19,7 @@ module Commits
       new_commit = create_commit!
 
       success(result: new_commit)
-    rescue ValidationError, ChangeError, Gitlab::Git::Index::IndexError, Gitlab::Git::CommitError, Gitlab::Git::HooksService::PreReceiveError => ex
+    rescue ValidationError, ChangeError, Gitlab::Git::Index::IndexError, Gitlab::Git::CommitError, Gitlab::Git::PreReceiveError => ex
       error(ex.message)
     end
 

app/services/create_branch_service.rb

@@ -14,7 +14,7 @@ class CreateBranchService < BaseService
     else
       error('Invalid reference name')
     end
-  rescue Gitlab::Git::HooksService::PreReceiveError => ex
+  rescue Gitlab::Git::PreReceiveError => ex
     error(ex.message)
   end
 

app/services/delete_branch_service.rb

@@ -16,7 +16,7 @@ class DeleteBranchService < BaseService
     else
       error('Failed to remove branch')
     end
-  rescue Gitlab::Git::HooksService::PreReceiveError => ex
+  rescue Gitlab::Git::PreReceiveError => ex
     error(ex.message)
   end
 

app/services/merge_requests/ff_merge_service.rb

@@ -13,7 +13,7 @@ module MergeRequests
                           source,
                           merge_request.target_branch,
                           merge_request: merge_request)
-    rescue Gitlab::Git::HooksService::PreReceiveError => e
+    rescue Gitlab::Git::PreReceiveError => e
       raise MergeError, e.message
     rescue StandardError => e
       raise MergeError, "Something went wrong during merge: #{e.message}"

app/services/merge_requests/merge_service.rb

@@ -81,7 +81,7 @@ module MergeRequests
       message = params[:commit_message] || merge_request.merge_commit_message
 
       repository.merge(current_user, source, merge_request, message)
-    rescue Gitlab::Git::HooksService::PreReceiveError => e
+    rescue Gitlab::Git::PreReceiveError => e
       handle_merge_error(log_message: e.message)
       raise MergeError, 'Something went wrong during merge pre-receive hook'
     rescue => e

app/services/tags/create_service.rb

@@ -13,7 +13,7 @@ module Tags
         new_tag = repository.add_tag(current_user, tag_name, target, message)
       rescue Gitlab::Git::Repository::TagExistsError
         return error("Tag #{tag_name} already exists")
-      rescue Gitlab::Git::HooksService::PreReceiveError => ex
+      rescue Gitlab::Git::PreReceiveError => ex
         return error(ex.message)
       end
 

app/services/tags/destroy_service.rb

@@ -21,7 +21,7 @@ module Tags
       else
         error('Failed to remove tag')
       end
-    rescue Gitlab::Git::HooksService::PreReceiveError => ex
+    rescue Gitlab::Git::PreReceiveError => ex
       error(ex.message)
     end
 

app/services/validate_new_branch_service.rb

@@ -13,7 +13,7 @@ class ValidateNewBranchService < BaseService
     end
 
     success
-  rescue Gitlab::Git::HooksService::PreReceiveError => ex
+  rescue Gitlab::Git::PreReceiveError => ex
     error(ex.message)
   end
 end

app/views/admin/application_settings/_abuse.html.haml

@@ -2,11 +2,10 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      = f.label :admin_notification_email, 'Abuse reports notification email', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :admin_notification_email, class: 'form-control'
-        .form-text.text-muted
-          Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area.
+    .form-group
+      = f.label :admin_notification_email, 'Abuse reports notification email', class: 'label-light'
+      = f.text_field :admin_notification_email, class: 'form-control'
+      .form-text.text-muted
+        Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area.
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_account_and_limit.html.haml

@@ -2,51 +2,44 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :gravatar_enabled, class: 'form-check-input'
-          = f.label :gravatar_enabled, class: 'form-check-label' do
-            Gravatar enabled
-    .form-group.row
-      = f.label :default_projects_limit, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :default_projects_limit, class: 'form-control'
-    .form-group.row
-      = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :max_attachment_size, class: 'form-control'
+    .form-group
+      .form-check
+        = f.check_box :gravatar_enabled, class: 'form-check-input'
+        = f.label :gravatar_enabled, class: 'form-check-label' do
+          Gravatar enabled
+    .form-group
+      = f.label :default_projects_limit, class: 'label-light'
+      = f.number_field :default_projects_limit, class: 'form-control'
+    .form-group
+      = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'label-light'
+      = f.number_field :max_attachment_size, class: 'form-control'
 
     = render 'repository_size_limit_setting', form: f
 
-    .form-group.row
-      = f.label :session_expire_delay, 'Session duration (minutes)', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :session_expire_delay, class: 'form-control'
-        %span.form-text.text-muted#session_expire_delay_help_block GitLab restart is required to apply changes
-    .form-group.row
-      = f.label :user_oauth_applications, 'User OAuth applications', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        .form-check
-          = f.check_box :user_oauth_applications, class: 'form-check-input'
-          = f.label :user_oauth_applications, class: 'form-check-label' do
-            Allow users to register any application to use GitLab as an OAuth provider
-    .form-group.row
-      = f.label :user_default_external, 'New users set to external', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        .form-check
-          = f.check_box :user_default_external, class: 'form-check-input'
-          = f.label :user_default_external, class: 'form-check-label' do
-            Newly registered users will by default be external
+    .form-group
+      = f.label :session_expire_delay, 'Session duration (minutes)', class: 'label-light'
+      = f.number_field :session_expire_delay, class: 'form-control'
+      %span.form-text.text-muted#session_expire_delay_help_block GitLab restart is required to apply changes
+    .form-group
+      = f.label :user_oauth_applications, 'User OAuth applications', class: 'label-light'
+      .form-check
+        = f.check_box :user_oauth_applications, class: 'form-check-input'
+        = f.label :user_oauth_applications, class: 'form-check-label' do
+          Allow users to register any application to use GitLab as an OAuth provider
+    .form-group
+      = f.label :user_default_external, 'New users set to external', class: 'label-light'
+      .form-check
+        = f.check_box :user_default_external, class: 'form-check-input'
+        = f.label :user_default_external, class: 'form-check-label' do
+          Newly registered users will by default be external
 
     - if ::Gitlab.dev_env_or_com?
-      .form-group.row
-        = f.label :check_namespace_plan, 'Check feature availability on namespace plan', class: 'col-form-label col-sm-2'
-        .col-sm-10
-          .form-check
-            = f.check_box :check_namespace_plan, class: 'form-check-input'
-            = f.label :check_namespace_plan, class: 'form-check-label' do
-              Enabling this will only make licensed EE features available to projects if the project namespace's plan
-              includes the feature or if the project is public.
+      .form-group
+        = f.label :check_namespace_plan, 'Check feature availability on namespace plan', class: 'label-light'
+        .form-check
+          = f.check_box :check_namespace_plan, class: 'form-check-input'
+          = f.label :check_namespace_plan, class: 'form-check-label' do
+            Enabling this will only make licensed EE features available to projects if the project namespace's plan
+            includes the feature or if the project is public.
 
   = f.submit 'Save changes', class: 'btn btn-success'

app/views/admin/application_settings/_background_jobs.html.haml

@@ -6,25 +6,22 @@
       These settings require a
       = link_to 'restart', help_page_path('administration/restart_gitlab')
       to take effect.
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :sidekiq_throttling_enabled, class: 'form-check-input'
-          = f.label :sidekiq_throttling_enabled, class: 'form-check-label' do
-            Enable Sidekiq Job Throttling
-          .form-text.text-muted
-            Limit the amount of resources slow running jobs are assigned.
-    .form-group.row
-      = f.label :sidekiq_throttling_queues, 'Sidekiq queues to throttle', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.select :sidekiq_throttling_queues, sidekiq_queue_options_for_select, { include_hidden: false }, multiple: true, class: 'select2 select-wide', data: { field: 'sidekiq_throttling_queues' }
+    .form-group
+      .form-check
+        = f.check_box :sidekiq_throttling_enabled, class: 'form-check-input'
+        = f.label :sidekiq_throttling_enabled, class: 'form-check-label' do
+          Enable Sidekiq Job Throttling
         .form-text.text-muted
-          Choose which queues you wish to throttle.
-    .form-group.row
-      = f.label :sidekiq_throttling_factor, 'Throttling Factor', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :sidekiq_throttling_factor, class: 'form-control', min: '0.01', max: '0.99', step: '0.01'
-        .form-text.text-muted
-          The factor by which the queues should be throttled. A value between 0.0 and 1.0, exclusive.
+          Limit the amount of resources slow running jobs are assigned.
+    .form-group
+      = f.label :sidekiq_throttling_queues, 'Sidekiq queues to throttle', class: 'label-light'
+      = f.select :sidekiq_throttling_queues, sidekiq_queue_options_for_select, { include_hidden: false }, multiple: true, class: 'select2 select-wide', data: { field: 'sidekiq_throttling_queues' }
+      .form-text.text-muted
+        Choose which queues you wish to throttle.
+    .form-group
+      = f.label :sidekiq_throttling_factor, 'Throttling Factor', class: 'label-light'
+      = f.number_field :sidekiq_throttling_factor, class: 'form-control', min: '0.01', max: '0.99', step: '0.01'
+      .form-text.text-muted
+        The factor by which the queues should be throttled. A value between 0.0 and 1.0, exclusive.
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_ci_cd.html.haml

@@ -2,49 +2,43 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :auto_devops_enabled, class: 'form-check-input'
-          = f.label :auto_devops_enabled, class: 'form-check-label' do
-            Enabled Auto DevOps for projects by default
-        .form-text.text-muted
-          It will automatically build, test, and deploy applications based on a predefined CI/CD configuration
-          = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md')
-    .form-group.row
-      = f.label :auto_devops_domain, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :auto_devops_domain, class: 'form-control', placeholder: 'domain.com'
-        .form-text.text-muted
-          = s_("AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages.")
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :shared_runners_enabled, class: 'form-check-input'
-          = f.label :shared_runners_enabled, class: 'form-check-label' do
-            Enable shared runners for new projects
+    .form-group
+      .form-check
+        = f.check_box :auto_devops_enabled, class: 'form-check-input'
+        = f.label :auto_devops_enabled, class: 'form-check-label' do
+          Enabled Auto DevOps for projects by default
+      .form-text.text-muted
+        It will automatically build, test, and deploy applications based on a predefined CI/CD configuration
+        = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md')
+    .form-group
+      = f.label :auto_devops_domain, class: 'label-light'
+      = f.text_field :auto_devops_domain, class: 'form-control', placeholder: 'domain.com'
+      .form-text.text-muted
+        = s_("AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages.")
+    .form-group
+      .form-check
+        = f.check_box :shared_runners_enabled, class: 'form-check-input'
+        = f.label :shared_runners_enabled, class: 'form-check-label' do
+          Enable shared runners for new projects
 
     = render 'shared_runners_minutes_setting', form: f
 
-    .form-group.row
-      = f.label :shared_runners_text, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_area :shared_runners_text, class: 'form-control', rows: 4
-        .form-text.text-muted Markdown enabled
-    .form-group.row
-      = f.label :max_artifacts_size, 'Maximum artifacts size (MB)', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :max_artifacts_size, class: 'form-control'
-        .form-text.text-muted
-          Set the maximum file size for each job's artifacts
-          = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'maximum-artifacts-size')
-    .form-group.row
-      = f.label :default_artifacts_expire_in, 'Default artifacts expiration', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :default_artifacts_expire_in, class: 'form-control'
-        .form-text.text-muted
-          Set the default expiration time for each job's artifacts.
-          0 for unlimited.
-          = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'default-artifacts-expiration')
+    .form-group
+      = f.label :shared_runners_text, class: 'label-light'
+      = f.text_area :shared_runners_text, class: 'form-control', rows: 4
+      .form-text.text-muted Markdown enabled
+    .form-group
+      = f.label :max_artifacts_size, 'Maximum artifacts size (MB)', class: 'label-light'
+      = f.number_field :max_artifacts_size, class: 'form-control'
+      .form-text.text-muted
+        Set the maximum file size for each job's artifacts
+        = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'maximum-artifacts-size')
+    .form-group
+      = f.label :default_artifacts_expire_in, 'Default artifacts expiration', class: 'label-light'
+      = f.text_field :default_artifacts_expire_in, class: 'form-control'
+      .form-text.text-muted
+        Set the default expiration time for each job's artifacts.
+        0 for unlimited.
+        = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'default-artifacts-expiration')
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_email.html.haml

@@ -2,34 +2,31 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :email_author_in_body, class: 'form-check-input'
-          = f.label :email_author_in_body, class: 'form-check-label' do
-            Include author name in notification email body
-          .form-text.text-muted
-            Some email servers do not support overriding the email sender name.
-            Enable this option to include the name of the author of the issue,
-            merge request or comment in the email body instead.
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :html_emails_enabled, class: 'form-check-input'
-          = f.label :html_emails_enabled, class: 'form-check-label' do
-            Enable HTML emails
-          .form-text.text-muted
-            By default GitLab sends emails in HTML and plain text formats so mail
-            clients can choose what format to use. Disable this option if you only
-            want to send emails in plain text format.
+    .form-group
+      .form-check
+        = f.check_box :email_author_in_body, class: 'form-check-input'
+        = f.label :email_author_in_body, class: 'form-check-label' do
+          Include author name in notification email body
+        .form-text.text-muted
+          Some email servers do not support overriding the email sender name.
+          Enable this option to include the name of the author of the issue,
+          merge request or comment in the email body instead.
+    .form-group
+      .form-check
+        = f.check_box :html_emails_enabled, class: 'form-check-input'
+        = f.label :html_emails_enabled, class: 'form-check-label' do
+          Enable HTML emails
+        .form-text.text-muted
+          By default GitLab sends emails in HTML and plain text formats so mail
+          clients can choose what format to use. Disable this option if you only
+          want to send emails in plain text format.
     -# EE-specific start
     - if License.feature_available?(:email_additional_text)
-      .form-group.row
-        = f.label :email_additional_text, _('Additional text'), class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.text_area :email_additional_text, class: 'form-control', maxlength: Gitlab::CurrentSettings.email_additional_text_character_limit, rows: 4
-          .form-text.text-muted
-            = _('Add additional text to appear in all email communications. %{character_limit} character limit') % { character_limit: number_with_delimiter(Gitlab::CurrentSettings.email_additional_text_character_limit) }
+      .form-group
+        = f.label :email_additional_text, _('Additional text'), class: 'label-light'
+        = f.text_area :email_additional_text, class: 'form-control', maxlength: Gitlab::CurrentSettings.email_additional_text_character_limit, rows: 4
+        .form-text.text-muted
+          = _('Add additional text to appear in all email communications. %{character_limit} character limit') % { character_limit: number_with_delimiter(Gitlab::CurrentSettings.email_additional_text_character_limit) }
     -# EE-specific end
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_gitaly.html.haml

@@ -2,26 +2,23 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      = f.label :gitaly_timeout_default, 'Default Timeout Period', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :gitaly_timeout_default, class: 'form-control'
-        .form-text.text-muted
-          Timeout for Gitaly calls from the GitLab application (in seconds). This timeout is not enforced
-          for git fetch/push operations or Sidekiq jobs.
-    .form-group.row
-      = f.label :gitaly_timeout_fast, 'Fast Timeout Period', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :gitaly_timeout_fast, class: 'form-control'
-        .form-text.text-muted
-          Fast operation timeout (in seconds). Some Gitaly operations are expected to be fast.
-          If they exceed this threshold, there may be a problem with a storage shard and 'failing fast'
-          can help maintain the stability of the GitLab instance.
-    .form-group.row
-      = f.label :gitaly_timeout_medium, 'Medium Timeout Period', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :gitaly_timeout_medium, class: 'form-control'
-        .form-text.text-muted
-          Medium operation timeout (in seconds). This should be a value between the Fast and the Default timeout.
+    .form-group
+      = f.label :gitaly_timeout_default, 'Default Timeout Period', class: 'label-light'
+      = f.number_field :gitaly_timeout_default, class: 'form-control'
+      .form-text.text-muted
+        Timeout for Gitaly calls from the GitLab application (in seconds). This timeout is not enforced
+        for git fetch/push operations or Sidekiq jobs.
+    .form-group
+      = f.label :gitaly_timeout_fast, 'Fast Timeout Period', class: 'label-light'
+      = f.number_field :gitaly_timeout_fast, class: 'form-control'
+      .form-text.text-muted
+        Fast operation timeout (in seconds). Some Gitaly operations are expected to be fast.
+        If they exceed this threshold, there may be a problem with a storage shard and 'failing fast'
+        can help maintain the stability of the GitLab instance.
+    .form-group
+      = f.label :gitaly_timeout_medium, 'Medium Timeout Period', class: 'label-light'
+      = f.number_field :gitaly_timeout_medium, class: 'form-control'
+      .form-text.text-muted
+        Medium operation timeout (in seconds). This should be a value between the Fast and the Default timeout.
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_help_page.html.haml

@@ -2,26 +2,22 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      = f.label :help_text, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_area :help_text, class: 'form-control', rows: 4
-        .form-text.text-muted Markdown enabled
-    .form-group.row
-      = f.label :help_page_text, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_area :help_page_text, class: 'form-control', rows: 4
-        .form-text.text-muted Markdown enabled
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :help_page_hide_commercial_content, class: 'form-check-input'
-          = f.label :help_page_hide_commercial_content, class: 'form-check-label' do
-            Hide marketing-related entries from help
-    .form-group.row
-      = f.label :help_page_support_url, 'Support page URL', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :help_page_support_url, class: 'form-control', placeholder: 'http://company.example.com/getting-help', :'aria-describedby' => 'support_help_block'
-        %span.form-text.text-muted#support_help_block Alternate support URL for help page
+    .form-group
+      = f.label :help_text, class: 'label-light'
+      = f.text_area :help_text, class: 'form-control', rows: 4
+      .form-text.text-muted Markdown enabled
+    .form-group
+      = f.label :help_page_text, class: 'label-light'
+      = f.text_area :help_page_text, class: 'form-control', rows: 4
+      .form-text.text-muted Markdown enabled
+    .form-group
+      .form-check
+        = f.check_box :help_page_hide_commercial_content, class: 'form-check-input'
+        = f.label :help_page_hide_commercial_content, class: 'form-check-label' do
+          Hide marketing-related entries from help
+    .form-group
+      = f.label :help_page_support_url, 'Support page URL', class: 'label-light'
+      = f.text_field :help_page_support_url, class: 'form-control', placeholder: 'http://company.example.com/getting-help', :'aria-describedby' => 'support_help_block'
+      %span.form-text.text-muted#support_help_block Alternate support URL for help page
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_influx.html.haml

@@ -8,61 +8,53 @@
       = link_to 'restart', help_page_path('administration/restart_gitlab')
       to take effect.
       = link_to icon('question-circle'), help_page_path('administration/monitoring/performance/introduction')
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :metrics_enabled, class: 'form-check-input'
-          = f.label :metrics_enabled, class: 'form-check-label' do
-            Enable InfluxDB Metrics
-    .form-group.row
-      = f.label :metrics_host, 'InfluxDB host', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :metrics_host, class: 'form-control', placeholder: 'influxdb.example.com'
-    .form-group.row
-      = f.label :metrics_port, 'InfluxDB port', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :metrics_port, class: 'form-control', placeholder: '8089'
-        .form-text.text-muted
-          The UDP port to use for connecting to InfluxDB. InfluxDB requires that
-          your server configuration specifies a database to store data in when
-          sending messages to this port, without it metrics data will not be
-          saved.
-    .form-group.row
-      = f.label :metrics_pool_size, 'Connection pool size', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :metrics_pool_size, class: 'form-control'
-        .form-text.text-muted
-          The amount of InfluxDB connections to open. Connections are opened
-          lazily. Users using multi-threaded application servers should ensure
-          enough connections are available (at minimum the amount of application
-          server threads).
-    .form-group.row
-      = f.label :metrics_timeout, 'Connection timeout', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :metrics_timeout, class: 'form-control'
-        .form-text.text-muted
-          The amount of seconds after which an InfluxDB connection will time
-          out.
-    .form-group.row
-      = f.label :metrics_method_call_threshold, 'Method Call Threshold (ms)', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :metrics_method_call_threshold, class: 'form-control'
-        .form-text.text-muted
-          A method call is only tracked when it takes longer to complete than
-          the given amount of milliseconds.
-    .form-group.row
-      = f.label :metrics_sample_interval, 'Sampler Interval (sec)', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :metrics_sample_interval, class: 'form-control'
-        .form-text.text-muted
-          The sampling interval in seconds. Sampled data includes memory usage,
-          retained Ruby objects, file descriptors and so on.
-    .form-group.row
-      = f.label :metrics_packet_size, 'Metrics per packet', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :metrics_packet_size, class: 'form-control'
-        .form-text.text-muted
-          The amount of points to store in a single UDP packet. More points
-          results in fewer but larger UDP packets being sent.
+    .form-group
+      .form-check
+        = f.check_box :metrics_enabled, class: 'form-check-input'
+        = f.label :metrics_enabled, class: 'form-check-label' do
+          Enable InfluxDB Metrics
+    .form-group
+      = f.label :metrics_host, 'InfluxDB host', class: 'label-light'
+      = f.text_field :metrics_host, class: 'form-control', placeholder: 'influxdb.example.com'
+    .form-group
+      = f.label :metrics_port, 'InfluxDB port', class: 'label-light'
+      = f.text_field :metrics_port, class: 'form-control', placeholder: '8089'
+      .form-text.text-muted
+        The UDP port to use for connecting to InfluxDB. InfluxDB requires that
+        your server configuration specifies a database to store data in when
+        sending messages to this port, without it metrics data will not be
+        saved.
+    .form-group
+      = f.label :metrics_pool_size, 'Connection pool size', class: 'label-light'
+      = f.number_field :metrics_pool_size, class: 'form-control'
+      .form-text.text-muted
+        The amount of InfluxDB connections to open. Connections are opened
+        lazily. Users using multi-threaded application servers should ensure
+        enough connections are available (at minimum the amount of application
+        server threads).
+    .form-group
+      = f.label :metrics_timeout, 'Connection timeout', class: 'label-light'
+      = f.number_field :metrics_timeout, class: 'form-control'
+      .form-text.text-muted
+        The amount of seconds after which an InfluxDB connection will time
+        out.
+    .form-group
+      = f.label :metrics_method_call_threshold, 'Method Call Threshold (ms)', class: 'label-light'
+      = f.number_field :metrics_method_call_threshold, class: 'form-control'
+      .form-text.text-muted
+        A method call is only tracked when it takes longer to complete than
+        the given amount of milliseconds.
+    .form-group
+      = f.label :metrics_sample_interval, 'Sampler Interval (sec)', class: 'label-light'
+      = f.number_field :metrics_sample_interval, class: 'form-control'
+      .form-text.text-muted
+        The sampling interval in seconds. Sampled data includes memory usage,
+        retained Ruby objects, file descriptors and so on.
+    .form-group
+      = f.label :metrics_packet_size, 'Metrics per packet', class: 'label-light'
+      = f.number_field :metrics_packet_size, class: 'form-control'
+      .form-text.text-muted
+        The amount of points to store in a single UDP packet. More points
+        results in fewer but larger UDP packets being sent.
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_ip_limits.html.haml

@@ -2,53 +2,44 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :throttle_unauthenticated_enabled, class: 'form-check-input'
-          = f.label :throttle_unauthenticated_enabled, class: 'form-check-label' do
-            Enable unauthenticated request rate limit
-          %span.form-text.text-muted
-            Helps reduce request volume (e.g. from crawlers or abusive bots)
-    .form-group.row
-      = f.label :throttle_unauthenticated_requests_per_period, 'Max requests per period per IP', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :throttle_unauthenticated_requests_per_period, class: 'form-control'
-    .form-group.row
-      = f.label :throttle_unauthenticated_period_in_seconds, 'Rate limit period in seconds', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :throttle_unauthenticated_period_in_seconds, class: 'form-control'
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :throttle_authenticated_api_enabled, class: 'form-check-input'
-          = f.label :throttle_authenticated_api_enabled, class: 'form-check-label' do
-            Enable authenticated API request rate limit
-          %span.form-text.text-muted
-            Helps reduce request volume (e.g. from crawlers or abusive bots)
-    .form-group.row
-      = f.label :throttle_authenticated_api_requests_per_period, 'Max requests per period per user', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :throttle_authenticated_api_requests_per_period, class: 'form-control'
-    .form-group.row
-      = f.label :throttle_authenticated_api_period_in_seconds, 'Rate limit period in seconds', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :throttle_authenticated_api_period_in_seconds, class: 'form-control'
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :throttle_authenticated_web_enabled, class: 'form-check-input'
-          = f.label :throttle_authenticated_web_enabled, class: 'form-check-label' do
-            Enable authenticated web request rate limit
-          %span.form-text.text-muted
-            Helps reduce request volume (e.g. from crawlers or abusive bots)
-    .form-group.row
-      = f.label :throttle_authenticated_web_requests_per_period, 'Max requests per period per user', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :throttle_authenticated_web_requests_per_period, class: 'form-control'
-    .form-group.row
-      = f.label :throttle_authenticated_web_period_in_seconds, 'Rate limit period in seconds', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :throttle_authenticated_web_period_in_seconds, class: 'form-control'
+    .form-group
+      .form-check
+        = f.check_box :throttle_unauthenticated_enabled, class: 'form-check-input'
+        = f.label :throttle_unauthenticated_enabled, class: 'form-check-label' do
+          Enable unauthenticated request rate limit
+        %span.form-text.text-muted
+          Helps reduce request volume (e.g. from crawlers or abusive bots)
+    .form-group
+      = f.label :throttle_unauthenticated_requests_per_period, 'Max requests per period per IP', class: 'label-light'
+      = f.number_field :throttle_unauthenticated_requests_per_period, class: 'form-control'
+    .form-group
+      = f.label :throttle_unauthenticated_period_in_seconds, 'Rate limit period in seconds', class: 'label-light'
+      = f.number_field :throttle_unauthenticated_period_in_seconds, class: 'form-control'
+    .form-group
+      .form-check
+        = f.check_box :throttle_authenticated_api_enabled, class: 'form-check-input'
+        = f.label :throttle_authenticated_api_enabled, class: 'form-check-label' do
+          Enable authenticated API request rate limit
+        %span.form-text.text-muted
+          Helps reduce request volume (e.g. from crawlers or abusive bots)
+    .form-group
+      = f.label :throttle_authenticated_api_requests_per_period, 'Max requests per period per user', class: 'label-light'
+      = f.number_field :throttle_authenticated_api_requests_per_period, class: 'form-control'
+    .form-group
+      = f.label :throttle_authenticated_api_period_in_seconds, 'Rate limit period in seconds', class: 'label-light'
+      = f.number_field :throttle_authenticated_api_period_in_seconds, class: 'form-control'
+    .form-group
+      .form-check
+        = f.check_box :throttle_authenticated_web_enabled, class: 'form-check-input'
+        = f.label :throttle_authenticated_web_enabled, class: 'form-check-label' do
+          Enable authenticated web request rate limit
+        %span.form-text.text-muted
+          Helps reduce request volume (e.g. from crawlers or abusive bots)
+    .form-group
+      = f.label :throttle_authenticated_web_requests_per_period, 'Max requests per period per user', class: 'label-light'
+      = f.number_field :throttle_authenticated_web_requests_per_period, class: 'form-control'
+    .form-group
+      = f.label :throttle_authenticated_web_period_in_seconds, 'Rate limit period in seconds', class: 'label-light'
+      = f.number_field :throttle_authenticated_web_period_in_seconds, class: 'form-control'
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_koding.html.haml

@@ -2,23 +2,21 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :koding_enabled, class: 'form-check-input'
-          = f.label :koding_enabled, class: 'form-check-label' do
-            Enable Koding
-        .form-text.text-muted
-          Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again.
-    .form-group.row
-      = f.label :koding_url, 'Koding URL', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090'
-        .form-text.text-muted
-          Koding has integration enabled out of the box for the
-          %strong gitlab
-          team, and you need to provide that team's URL here. Learn more in the
-          = succeed "." do
-            = link_to "Koding administration documentation", help_page_path("administration/integration/koding")
+    .form-group
+      .form-check
+        = f.check_box :koding_enabled, class: 'form-check-input'
+        = f.label :koding_enabled, class: 'form-check-label' do
+          Enable Koding
+      .form-text.text-muted
+        Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again.
+    .form-group
+      = f.label :koding_url, 'Koding URL', class: 'label-light'
+      = f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090'
+      .form-text.text-muted
+        Koding has integration enabled out of the box for the
+        %strong gitlab
+        team, and you need to provide that team's URL here. Learn more in the
+        = succeed "." do
+          = link_to "Koding administration documentation", help_page_path("administration/integration/koding")
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_logging.html.haml

@@ -2,35 +2,31 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :sentry_enabled, class: 'form-check-input'
-          = f.label :sentry_enabled, class: 'form-check-label' do
-            Enable Sentry
-          .form-text.text-muted
-            %p This setting requires a restart to take effect.
-            Sentry is an error reporting and logging tool which is currently not shipped with GitLab, get it here:
-            %a{ href: 'https://getsentry.com', target: '_blank', rel: 'noopener noreferrer' } https://getsentry.com
+    .form-group
+      .form-check
+        = f.check_box :sentry_enabled, class: 'form-check-input'
+        = f.label :sentry_enabled, class: 'form-check-label' do
+          Enable Sentry
+        .form-text.text-muted
+          %p This setting requires a restart to take effect.
+          Sentry is an error reporting and logging tool which is currently not shipped with GitLab, get it here:
+          %a{ href: 'https://getsentry.com', target: '_blank', rel: 'noopener noreferrer' } https://getsentry.com
 
-    .form-group.row
-      = f.label :sentry_dsn, 'Sentry DSN', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :sentry_dsn, class: 'form-control'
+    .form-group
+      = f.label :sentry_dsn, 'Sentry DSN', class: 'label-light'
+      = f.text_field :sentry_dsn, class: 'form-control'
 
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :clientside_sentry_enabled, class: 'form-check-input'
-          = f.label :clientside_sentry_enabled, class: 'form-check-label' do
-            Enable Clientside Sentry
-          .form-text.text-muted
-            Sentry can also be used for reporting and logging clientside exceptions.
-            %a{ href: 'https://sentry.io/for/javascript/', target: '_blank', rel: 'noopener noreferrer' } https://sentry.io/for/javascript/
+    .form-group
+      .form-check
+        = f.check_box :clientside_sentry_enabled, class: 'form-check-input'
+        = f.label :clientside_sentry_enabled, class: 'form-check-label' do
+          Enable Clientside Sentry
+        .form-text.text-muted
+          Sentry can also be used for reporting and logging clientside exceptions.
+          %a{ href: 'https://sentry.io/for/javascript/', target: '_blank', rel: 'noopener noreferrer' } https://sentry.io/for/javascript/
 
-    .form-group.row
-      = f.label :clientside_sentry_dsn, 'Clientside Sentry DSN', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :clientside_sentry_dsn, class: 'form-control'
+    .form-group
+      = f.label :clientside_sentry_dsn, 'Clientside Sentry DSN', class: 'label-light'
+      = f.text_field :clientside_sentry_dsn, class: 'form-control'
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_outbound.html.haml

@@ -2,11 +2,10 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :allow_local_requests_from_hooks_and_services, class: 'form-check-input'
-          = f.label :allow_local_requests_from_hooks_and_services, class: 'form-check-label' do
-            Allow requests to the local network from hooks and services
+    .form-group
+      .form-check
+        = f.check_box :allow_local_requests_from_hooks_and_services, class: 'form-check-input'
+        = f.label :allow_local_requests_from_hooks_and_services, class: 'form-check-label' do
+          Allow requests to the local network from hooks and services
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_pages.html.haml

@@ -2,21 +2,19 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      = f.label :max_pages_size, 'Maximum size of pages (MB)', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :max_pages_size, class: 'form-control'
-        .form-text.text-muted 0 for unlimited
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :pages_domain_verification_enabled, class: 'form-check-input'
-          = f.label :pages_domain_verification_enabled, class: 'form-check-label' do
-            Require users to prove ownership of custom domains
-        .form-text.text-muted
-          Domain verification is an essential security measure for public GitLab
-          sites. Users are required to demonstrate they control a domain before
-          it is enabled
-          = link_to icon('question-circle'), help_page_path('user/project/pages/getting_started_part_three.md', anchor: 'dns-txt-record')
+    .form-group
+      = f.label :max_pages_size, 'Maximum size of pages (MB)', class: 'label-light'
+      = f.number_field :max_pages_size, class: 'form-control'
+      .form-text.text-muted 0 for unlimited
+    .form-group
+      .form-check
+        = f.check_box :pages_domain_verification_enabled, class: 'form-check-input'
+        = f.label :pages_domain_verification_enabled, class: 'form-check-label' do
+          Require users to prove ownership of custom domains
+      .form-text.text-muted
+        Domain verification is an essential security measure for public GitLab
+        sites. Users are required to demonstrate they control a domain before
+        it is enabled
+        = link_to icon('question-circle'), help_page_path('user/project/pages/getting_started_part_three.md', anchor: 'dns-txt-record')
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_performance.html.haml

@@ -2,18 +2,17 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :authorized_keys_enabled, class: 'form-check-input'
-          = f.label :authorized_keys_enabled, class: 'form-check-label' do
-            Write to "authorized_keys" file
-          .form-text.text-muted
-            By default, we write to the "authorized_keys" file to support Git
-            over SSH without additional configuration. GitLab can be optimized
-            to authenticate SSH keys via the database file. Only uncheck this
-            if you have configured your OpenSSH server to use the
-            AuthorizedKeysCommand. Click on the help icon for more details.
-            = link_to icon('question-circle'), help_page_path('administration/operations/fast_ssh_key_lookup')
+    .form-group
+      .form-check
+        = f.check_box :authorized_keys_enabled, class: 'form-check-input'
+        = f.label :authorized_keys_enabled, class: 'form-check-label' do
+          Write to "authorized_keys" file
+        .form-text.text-muted
+          By default, we write to the "authorized_keys" file to support Git
+          over SSH without additional configuration. GitLab can be optimized
+          to authenticate SSH keys via the database file. Only uncheck this
+          if you have configured your OpenSSH server to use the
+          AuthorizedKeysCommand. Click on the help icon for more details.
+          = link_to icon('question-circle'), help_page_path('administration/operations/fast_ssh_key_lookup')
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_performance_bar.html.haml

@@ -2,15 +2,13 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :performance_bar_enabled, class: 'form-check-input'
-          = f.label :performance_bar_enabled, class: 'form-check-label' do
-            Enable the Performance Bar
-    .form-group.row
-      = f.label :performance_bar_allowed_group_path, 'Allowed group', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :performance_bar_allowed_group_path, class: 'form-control', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path
+    .form-group
+      .form-check
+        = f.check_box :performance_bar_enabled, class: 'form-check-input'
+        = f.label :performance_bar_enabled, class: 'form-check-label' do
+          Enable the Performance Bar
+    .form-group
+      = f.label :performance_bar_allowed_group_path, 'Allowed group', class: 'label-light'
+      = f.text_field :performance_bar_allowed_group_path, class: 'form-control', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_plantuml.html.haml

@@ -2,19 +2,17 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :plantuml_enabled, class: 'form-check-input'
-          = f.label :plantuml_enabled, class: 'form-check-label' do
-            Enable PlantUML
-    .form-group.row
-      = f.label :plantuml_url, 'PlantUML URL', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :plantuml_url, class: 'form-control', placeholder: 'http://gitlab.your-plantuml-instance.com:8080'
-        .form-text.text-muted
-          Allow rendering of
-          = link_to "PlantUML", "http://plantuml.com"
-          diagrams in Asciidoc documents using an external PlantUML service.
+    .form-group
+      .form-check
+        = f.check_box :plantuml_enabled, class: 'form-check-input'
+        = f.label :plantuml_enabled, class: 'form-check-label' do
+          Enable PlantUML
+    .form-group
+      = f.label :plantuml_url, 'PlantUML URL', class: 'label-light'
+      = f.text_field :plantuml_url, class: 'form-control', placeholder: 'http://gitlab.your-plantuml-instance.com:8080'
+      .form-text.text-muted
+        Allow rendering of
+        = link_to "PlantUML", "http://plantuml.com"
+        diagrams in Asciidoc documents using an external PlantUML service.
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_prometheus.html.haml

@@ -11,18 +11,17 @@
       = link_to 'restart', help_page_path('administration/restart_gitlab')
       to take effect.
       = link_to icon('question-circle'), help_page_path('administration/monitoring/prometheus/index')
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :prometheus_metrics_enabled, class: 'form-check-input'
-          = f.label :prometheus_metrics_enabled, class: 'form-check-label' do
-            Enable Prometheus Metrics
-          - unless Gitlab::Metrics.metrics_folder_present?
-            .form-text.text-muted
-              %strong.cred WARNING:
-              Environment variable
-              %code prometheus_multiproc_dir
-              does not exist or is not pointing to a valid directory.
-              = link_to icon('question-circle'), help_page_path('administration/monitoring/prometheus/gitlab_metrics', anchor: 'metrics-shared-directory')
+    .form-group
+      .form-check
+        = f.check_box :prometheus_metrics_enabled, class: 'form-check-input'
+        = f.label :prometheus_metrics_enabled, class: 'form-check-label' do
+          Enable Prometheus Metrics
+        - unless Gitlab::Metrics.metrics_folder_present?
+          .form-text.text-muted
+            %strong.cred WARNING:
+            Environment variable
+            %code prometheus_multiproc_dir
+            does not exist or is not pointing to a valid directory.
+            = link_to icon('question-circle'), help_page_path('administration/monitoring/prometheus/gitlab_metrics', anchor: 'metrics-shared-directory')
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_realtime.html.haml

@@ -2,18 +2,17 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      = f.label :polling_interval_multiplier, 'Polling interval multiplier', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :polling_interval_multiplier, class: 'form-control'
-        .form-text.text-muted
-          Change this value to influence how frequently the GitLab UI polls for updates.
-          If you set the value to 2 all polling intervals are multiplied
-          by 2, which means that polling happens half as frequently.
-          The multiplier can also have a decimal value.
-          The default value (1) is a reasonable choice for the majority of GitLab
-          installations. Set to 0 to completely disable polling.
-          = link_to icon('question-circle'), help_page_path('administration/polling')
+    .form-group
+      = f.label :polling_interval_multiplier, 'Polling interval multiplier', class: 'label-light'
+      = f.text_field :polling_interval_multiplier, class: 'form-control'
+      .form-text.text-muted
+        Change this value to influence how frequently the GitLab UI polls for updates.
+        If you set the value to 2 all polling intervals are multiplied
+        by 2, which means that polling happens half as frequently.
+        The multiplier can also have a decimal value.
+        The default value (1) is a reasonable choice for the majority of GitLab
+        installations. Set to 0 to completely disable polling.
+        = link_to icon('question-circle'), help_page_path('administration/polling')
 
   = f.submit 'Save changes', class: "btn btn-success"
 

app/views/admin/application_settings/_registry.html.haml

@@ -2,9 +2,8 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      = f.label :container_registry_token_expire_delay, 'Authorization token duration (minutes)', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :container_registry_token_expire_delay, class: 'form-control'
+    .form-group
+      = f.label :container_registry_token_expire_delay, 'Authorization token duration (minutes)', class: 'label-light'
+      = f.number_field :container_registry_token_expire_delay, class: 'form-control'
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_repository_check.html.haml

@@ -4,59 +4,53 @@
   %fieldset
     .sub-section
       %h4 Repository checks
-      .form-group.row
-        .offset-sm-2.col-sm-10
-          .form-check
-            = f.check_box :repository_checks_enabled, class: 'form-check-input'
-            = f.label :repository_checks_enabled, class: 'form-check-label' do
-              Enable Repository Checks
-            .form-text.text-muted
-              GitLab will periodically run
-              %a{ href: 'https://git-scm.com/docs/git-fsck', target: 'blank' } 'git fsck'
-              in all project and wiki repositories to look for silent disk corruption issues.
-      .form-group.row
-        .offset-sm-2.col-sm-10
-          = link_to 'Clear all repository checks', clear_repository_check_states_admin_application_settings_path, data: { confirm: 'This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?' }, method: :put, class: "btn btn-sm btn-remove"
+      .form-group
+        .form-check
+          = f.check_box :repository_checks_enabled, class: 'form-check-input'
+          = f.label :repository_checks_enabled, class: 'form-check-label' do
+            Enable Repository Checks
           .form-text.text-muted
-            If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database.
+            GitLab will periodically run
+            %a{ href: 'https://git-scm.com/docs/git-fsck', target: 'blank' } 'git fsck'
+            in all project and wiki repositories to look for silent disk corruption issues.
+      .form-group
+        = link_to 'Clear all repository checks', clear_repository_check_states_admin_application_settings_path, data: { confirm: 'This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?' }, method: :put, class: "btn btn-sm btn-remove"
+        .form-text.text-muted
+          If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database.
 
     .sub-section
       %h4 Housekeeping
-      .form-group.row
-        .offset-sm-2.col-sm-10
-          .form-check
-            = f.check_box :housekeeping_enabled, class: 'form-check-input'
-            = f.label :housekeeping_enabled, class: 'form-check-label' do
-              Enable automatic repository housekeeping (git repack, git gc)
-            .form-text.text-muted
-              If you keep automatic housekeeping disabled for a long time Git
-              repository access on your GitLab server will become slower and your
-              repositories will use more disk space. We recommend to always leave
-              this enabled.
-          .form-check
-            = f.check_box :housekeeping_bitmaps_enabled, class: 'form-check-input'
-            = f.label :housekeeping_bitmaps_enabled, class: 'form-check-label' do
-              Enable Git pack file bitmap creation
-            .form-text.text-muted
-              Creating pack file bitmaps makes housekeeping take a little longer but
-              bitmaps should accelerate 'git clone' performance.
-      .form-group.row
-        = f.label :housekeeping_incremental_repack_period, 'Incremental repack period', class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.number_field :housekeeping_incremental_repack_period, class: 'form-control'
+      .form-group
+        .form-check
+          = f.check_box :housekeeping_enabled, class: 'form-check-input'
+          = f.label :housekeeping_enabled, class: 'form-check-label' do
+            Enable automatic repository housekeeping (git repack, git gc)
           .form-text.text-muted
-            Number of Git pushes after which an incremental 'git repack' is run.
-      .form-group.row
-        = f.label :housekeeping_full_repack_period, 'Full repack period', class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.number_field :housekeeping_full_repack_period, class: 'form-control'
+            If you keep automatic housekeeping disabled for a long time Git
+            repository access on your GitLab server will become slower and your
+            repositories will use more disk space. We recommend to always leave
+            this enabled.
+        .form-check
+          = f.check_box :housekeeping_bitmaps_enabled, class: 'form-check-input'
+          = f.label :housekeeping_bitmaps_enabled, class: 'form-check-label' do
+            Enable Git pack file bitmap creation
           .form-text.text-muted
-            Number of Git pushes after which a full 'git repack' is run.
-      .form-group.row
-        = f.label :housekeeping_gc_period, 'Git GC period', class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.number_field :housekeeping_gc_period, class: 'form-control'
-          .form-text.text-muted
-            Number of Git pushes after which 'git gc' is run.
+            Creating pack file bitmaps makes housekeeping take a little longer but
+            bitmaps should accelerate 'git clone' performance.
+      .form-group
+        = f.label :housekeeping_incremental_repack_period, 'Incremental repack period', class: 'label-light'
+        = f.number_field :housekeeping_incremental_repack_period, class: 'form-control'
+        .form-text.text-muted
+          Number of Git pushes after which an incremental 'git repack' is run.
+      .form-group
+        = f.label :housekeeping_full_repack_period, 'Full repack period', class: 'label-light'
+        = f.number_field :housekeeping_full_repack_period, class: 'form-control'
+        .form-text.text-muted
+          Number of Git pushes after which a full 'git repack' is run.
+      .form-group
+        = f.label :housekeeping_gc_period, 'Git GC period', class: 'label-light'
+        = f.number_field :housekeeping_gc_period, class: 'form-control'
+        .form-text.text-muted
+          Number of Git pushes after which 'git gc' is run.
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_repository_mirrors_form.html.haml

@@ -2,16 +2,15 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      = f.label :mirror_available, 'Enable mirror configuration', class: 'control-label col-sm-4'
-      .col-sm-8
-        .form-check
-          = f.check_box :mirror_available, class: 'form-check-input'
-          = f.label :mirror_available, class: 'form-check-label' do
-            Allow mirrors to be setup for projects
-        %span.form-text.text-muted
-          If disabled, only admins will be able to setup mirrors in projects.
-          = link_to icon('question-circle'), help_page_path('workflow/repository_mirroring')
+    .form-group
+      = f.label :mirror_available, 'Enable mirror configuration', class: 'label-light'
+      .form-check
+        = f.check_box :mirror_available, class: 'form-check-input'
+        = f.label :mirror_available, class: 'form-check-label' do
+          Allow mirrors to be setup for projects
+      %span.form-text.text-muted
+        If disabled, only admins will be able to setup mirrors in projects.
+        = link_to icon('question-circle'), help_page_path('workflow/repository_mirroring')
 
   - if Gitlab.com? && License.feature_available?(:repository_mirrors)
     = render 'mirror_settings', f: f

app/views/admin/application_settings/_repository_storage.html.haml

@@ -3,56 +3,49 @@
 
   %fieldset
     .sub-section
-      .form-group.row
-        .offset-sm-2.col-sm-10
-          .form-check
-            = f.check_box :hashed_storage_enabled, class: 'form-check-input'
-            = f.label :hashed_storage_enabled, class: 'form-check-label' do
-              Create new projects using hashed storage paths
-            .form-text.text-muted
-              Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents
-              repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance.
-              %em (EXPERIMENTAL)
-      .form-group.row
-        = f.label :repository_storages, 'Storage paths for new projects', class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.select :repository_storages, repository_storages_options_for_select(@application_setting.repository_storages),
-            {include_hidden: false}, multiple: true, class: 'form-control'
+      .form-group
+        .form-check
+          = f.check_box :hashed_storage_enabled, class: 'form-check-input'
+          = f.label :hashed_storage_enabled, class: 'form-check-label' do
+            Create new projects using hashed storage paths
           .form-text.text-muted
-            Manage repository storage paths. Learn more in the
-            = succeed "." do
-              = link_to "repository storages documentation", help_page_path("administration/repository_storage_paths")
+            Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents
+            repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance.
+            %em (EXPERIMENTAL)
+      .form-group
+        = f.label :repository_storages, 'Storage paths for new projects', class: 'label-light'
+        = f.select :repository_storages, repository_storages_options_for_select(@application_setting.repository_storages),
+          {include_hidden: false}, multiple: true, class: 'form-control'
+        .form-text.text-muted
+          Manage repository storage paths. Learn more in the
+          = succeed "." do
+            = link_to "repository storages documentation", help_page_path("administration/repository_storage_paths")
     .sub-section
       %h4 Circuit breaker
-      .form-group.row
-        = f.label :circuitbreaker_check_interval, _('Check interval'), class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.number_field :circuitbreaker_check_interval, class: 'form-control'
-          .form-text.text-muted
-            = circuitbreaker_check_interval_help_text
-      .form-group.row
-        = f.label :circuitbreaker_access_retries, _('Number of access attempts'), class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.number_field :circuitbreaker_access_retries, class: 'form-control'
-          .form-text.text-muted
-            = circuitbreaker_access_retries_help_text
-      .form-group.row
-        = f.label :circuitbreaker_storage_timeout, _('Seconds to wait for a storage access attempt'), class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.number_field :circuitbreaker_storage_timeout, class: 'form-control'
-          .form-text.text-muted
-            = circuitbreaker_storage_timeout_help_text
-      .form-group.row
-        = f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.number_field :circuitbreaker_failure_count_threshold, class: 'form-control'
-          .form-text.text-muted
-            = circuitbreaker_failure_count_help_text
-      .form-group.row
-        = f.label :circuitbreaker_failure_reset_time, _('Seconds before reseting failure information'), class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.number_field :circuitbreaker_failure_reset_time, class: 'form-control'
-          .form-text.text-muted
-            = circuitbreaker_failure_reset_time_help_text
+      .form-group
+        = f.label :circuitbreaker_check_interval, _('Check interval'), class: 'label-light'
+        = f.number_field :circuitbreaker_check_interval, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_check_interval_help_text
+      .form-group
+        = f.label :circuitbreaker_access_retries, _('Number of access attempts'), class: 'label-light'
+        = f.number_field :circuitbreaker_access_retries, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_access_retries_help_text
+      .form-group
+        = f.label :circuitbreaker_storage_timeout, _('Seconds to wait for a storage access attempt'), class: 'label-light'
+        = f.number_field :circuitbreaker_storage_timeout, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_storage_timeout_help_text
+      .form-group
+        = f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'label-light'
+        = f.number_field :circuitbreaker_failure_count_threshold, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_failure_count_help_text
+      .form-group
+        = f.label :circuitbreaker_failure_reset_time, _('Seconds before reseting failure information'), class: 'label-light'
+        = f.number_field :circuitbreaker_failure_reset_time, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_failure_reset_time_help_text
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_signin.html.haml

@@ -2,59 +2,51 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :password_authentication_enabled_for_web, class: 'form-check-input'
-          = f.label :password_authentication_enabled_for_web, class: 'form-check-label' do
-            Password authentication enabled for web interface
-            .form-text.text-muted
-              When disabled, an external authentication provider must be used.
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :password_authentication_enabled_for_git, class: 'form-check-input'
-          = f.label :password_authentication_enabled_for_git, class: 'form-check-label' do
-            Password authentication enabled for Git over HTTP(S)
-            .form-text.text-muted
-              When disabled, a Personal Access Token
-              - if Gitlab::Auth::LDAP::Config.enabled?
-                or LDAP password
-              must be used to authenticate.
+    .form-group
+      .form-check
+        = f.check_box :password_authentication_enabled_for_web, class: 'form-check-input'
+        = f.label :password_authentication_enabled_for_web, class: 'form-check-label' do
+          Password authentication enabled for web interface
+          .form-text.text-muted
+            When disabled, an external authentication provider must be used.
+    .form-group
+      .form-check
+        = f.check_box :password_authentication_enabled_for_git, class: 'form-check-input'
+        = f.label :password_authentication_enabled_for_git, class: 'form-check-label' do
+          Password authentication enabled for Git over HTTP(S)
+          .form-text.text-muted
+            When disabled, a Personal Access Token
+            - if Gitlab::Auth::LDAP::Config.enabled?
+              or LDAP password
+            must be used to authenticate.
     - if omniauth_enabled? && button_based_providers.any?
-      .form-group.row
-        = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'col-form-label col-sm-2'
+      .form-group
+        = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'label-light'
         = hidden_field_tag 'application_setting[enabled_oauth_sign_in_sources][]'
-        .col-sm-10
-          .btn-group{ data: { toggle: 'buttons' } }
-            - oauth_providers_checkboxes.each do |source|
-              = source
-    .form-group.row
-      = f.label :two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        .form-check
-          = f.check_box :require_two_factor_authentication, class: 'form-check-input'
-          = f.label :require_two_factor_authentication, class: 'form-check-label' do
-            Require all users to setup Two-factor authentication
-    .form-group.row
-      = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :two_factor_grace_period, min: 0, class: 'form-control', placeholder: '0'
-        .form-text.text-muted Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication
-    .form-group.row
-      = f.label :home_page_url, 'Home page URL', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block'
-        %span.form-text.text-muted#home_help_block We will redirect non-logged in users to this page
-    .form-group.row
-      = f.label :after_sign_out_path, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :after_sign_out_path, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'after_sign_out_path_help_block'
-        %span.form-text.text-muted#after_sign_out_path_help_block We will redirect users to this page after they sign out
-    .form-group.row
-      = f.label :sign_in_text, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_area :sign_in_text, class: 'form-control', rows: 4
-        .form-text.text-muted Markdown enabled
+        .btn-group{ data: { toggle: 'buttons' } }
+          - oauth_providers_checkboxes.each do |source|
+            = source
+    .form-group
+      = f.label :two_factor_authentication, 'Two-factor authentication', class: 'label-light'
+      .form-check
+        = f.check_box :require_two_factor_authentication, class: 'form-check-input'
+        = f.label :require_two_factor_authentication, class: 'form-check-label' do
+          Require all users to setup Two-factor authentication
+    .form-group
+      = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'label-light'
+      = f.number_field :two_factor_grace_period, min: 0, class: 'form-control', placeholder: '0'
+      .form-text.text-muted Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication
+    .form-group
+      = f.label :home_page_url, 'Home page URL', class: 'label-light'
+      = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block'
+      %span.form-text.text-muted#home_help_block We will redirect non-logged in users to this page
+    .form-group
+      = f.label :after_sign_out_path, class: 'label-light'
+      = f.text_field :after_sign_out_path, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'after_sign_out_path_help_block'
+      %span.form-text.text-muted#after_sign_out_path_help_block We will redirect users to this page after they sign out
+    .form-group
+      = f.label :sign_in_text, class: 'label-light'
+      = f.text_area :sign_in_text, class: 'form-control', rows: 4
+      .form-text.text-muted Markdown enabled
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_signup.html.haml

@@ -2,57 +2,49 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :signup_enabled, class: 'form-check-input'
-          = f.label :signup_enabled, class: 'form-check-label' do
-            Sign-up enabled
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :send_user_confirmation_email, class: 'form-check-input'
-          = f.label :send_user_confirmation_email, class: 'form-check-label' do
-            Send confirmation email on sign-up
-    .form-group.row
-      = f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_area :domain_whitelist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8
-        .form-text.text-muted ONLY users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com
-    .form-group.row
-      = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        .form-check
-          = f.check_box :domain_blacklist_enabled, class: 'form-check-input'
-          = f.label :domain_blacklist_enabled, class: 'form-check-label' do
-            Enable domain blacklist for sign ups
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = radio_button_tag :blacklist_type, :file, false, class: "form-check-input"
-          = label_tag :blacklist_type_file, class: 'form-check-label' do
-            .option-title
-              Upload blacklist file
-        .form-check
-          = radio_button_tag :blacklist_type, :raw, @application_setting.domain_blacklist.present? || @application_setting.domain_blacklist.blank?, class: 'form-check-input'
-          = label_tag :blacklist_type_raw, class: 'form-check-label' do
-            .option-title
-              Enter blacklist manually
-    .form-group.row.blacklist-file
-      = f.label :domain_blacklist_file, 'Blacklist file', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.file_field :domain_blacklist_file, class: 'form-control', accept: '.txt,.conf'
-        .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines or commas for multiple entries.
-    .form-group.row.blacklist-raw
-      = f.label :domain_blacklist, 'Blacklisted domains for sign-ups', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_area :domain_blacklist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8
-        .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com
+    .form-group
+      .form-check
+        = f.check_box :signup_enabled, class: 'form-check-input'
+        = f.label :signup_enabled, class: 'form-check-label' do
+          Sign-up enabled
+    .form-group
+      .form-check
+        = f.check_box :send_user_confirmation_email, class: 'form-check-input'
+        = f.label :send_user_confirmation_email, class: 'form-check-label' do
+          Send confirmation email on sign-up
+    .form-group
+      = f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'label-light'
+      = f.text_area :domain_whitelist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8
+      .form-text.text-muted ONLY users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com
+    .form-group
+      = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'label-light'
+      .form-check
+        = f.check_box :domain_blacklist_enabled, class: 'form-check-input'
+        = f.label :domain_blacklist_enabled, class: 'form-check-label' do
+          Enable domain blacklist for sign ups
+    .form-group
+      .form-check
+        = radio_button_tag :blacklist_type, :file, false, class: "form-check-input"
+        = label_tag :blacklist_type_file, class: 'form-check-label' do
+          .option-title
+            Upload blacklist file
+      .form-check
+        = radio_button_tag :blacklist_type, :raw, @application_setting.domain_blacklist.present? || @application_setting.domain_blacklist.blank?, class: 'form-check-input'
+        = label_tag :blacklist_type_raw, class: 'form-check-label' do
+          .option-title
+            Enter blacklist manually
+    .form-group.blacklist-file
+      = f.label :domain_blacklist_file, 'Blacklist file', class: 'label-light'
+      = f.file_field :domain_blacklist_file, class: 'form-control', accept: '.txt,.conf'
+      .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines or commas for multiple entries.
+    .form-group.blacklist-raw
+      = f.label :domain_blacklist, 'Blacklisted domains for sign-ups', class: 'label-light'
+      = f.text_area :domain_blacklist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8
+      .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com
 
-    .form-group.row
-      = f.label :after_sign_up_text, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_area :after_sign_up_text, class: 'form-control', rows: 4
-        .form-text.text-muted Markdown enabled
+    .form-group
+      = f.label :after_sign_up_text, class: 'label-light'
+      = f.text_area :after_sign_up_text, class: 'form-control', rows: 4
+      .form-text.text-muted Markdown enabled
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_spam.html.haml

@@ -2,64 +2,56 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :recaptcha_enabled, class: 'form-check-input'
-          = f.label :recaptcha_enabled, class: 'form-check-label' do
-            Enable reCAPTCHA
-          %span.form-text.text-muted#recaptcha_help_block Helps prevent bots from creating accounts
-
-    .form-group.row
-      = f.label :recaptcha_site_key, 'reCAPTCHA Site Key', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :recaptcha_site_key, class: 'form-control'
-        .form-text.text-muted
-          Generate site and private keys at
-          %a{ href: 'http://www.google.com/recaptcha', target: 'blank' } http://www.google.com/recaptcha
-
-    .form-group.row
-      = f.label :recaptcha_private_key, 'reCAPTCHA Private Key', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :recaptcha_private_key, class: 'form-control'
-
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :akismet_enabled, class: 'form-check-input'
-          = f.label :akismet_enabled, class: 'form-check-label' do
-            Enable Akismet
-          %span.form-text.text-muted#akismet_help_block Helps prevent bots from creating issues
-
-    .form-group.row
-      = f.label :akismet_api_key, 'Akismet API Key', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :akismet_api_key, class: 'form-control'
-        .form-text.text-muted
-          Generate API key at
-          %a{ href: 'http://www.akismet.com', target: 'blank' } http://www.akismet.com
-
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :unique_ips_limit_enabled, class: 'form-check-input'
-          = f.label :unique_ips_limit_enabled, class: 'form-check-label' do
-            Limit sign in from multiple ips
-          %span.form-text.text-muted#unique_ip_help_block
-            Helps prevent malicious users hide their activity
-
-    .form-group.row
-      = f.label :unique_ips_limit_per_user, 'IPs per user', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :unique_ips_limit_per_user, class: 'form-control'
-        .form-text.text-muted
-          Maximum number of unique IPs per user
-
-    .form-group.row
-      = f.label :unique_ips_limit_time_window, 'IP expiration time', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :unique_ips_limit_time_window, class: 'form-control'
-        .form-text.text-muted
-          How many seconds an IP will be counted towards the limit
+    .form-group
+      .form-check
+        = f.check_box :recaptcha_enabled, class: 'form-check-input'
+        = f.label :recaptcha_enabled, class: 'form-check-label' do
+          Enable reCAPTCHA
+        %span.form-text.text-muted#recaptcha_help_block Helps prevent bots from creating accounts
+
+    .form-group
+      = f.label :recaptcha_site_key, 'reCAPTCHA Site Key', class: 'label-light'
+      = f.text_field :recaptcha_site_key, class: 'form-control'
+      .form-text.text-muted
+        Generate site and private keys at
+        %a{ href: 'http://www.google.com/recaptcha', target: 'blank' } http://www.google.com/recaptcha
+
+    .form-group
+      = f.label :recaptcha_private_key, 'reCAPTCHA Private Key', class: 'label-light'
+      = f.text_field :recaptcha_private_key, class: 'form-control'
+
+    .form-group
+      .form-check
+        = f.check_box :akismet_enabled, class: 'form-check-input'
+        = f.label :akismet_enabled, class: 'form-check-label' do
+          Enable Akismet
+        %span.form-text.text-muted#akismet_help_block Helps prevent bots from creating issues
+
+    .form-group
+      = f.label :akismet_api_key, 'Akismet API Key', class: 'label-light'
+      = f.text_field :akismet_api_key, class: 'form-control'
+      .form-text.text-muted
+        Generate API key at
+        %a{ href: 'http://www.akismet.com', target: 'blank' } http://www.akismet.com
+
+    .form-group
+      .form-check
+        = f.check_box :unique_ips_limit_enabled, class: 'form-check-input'
+        = f.label :unique_ips_limit_enabled, class: 'form-check-label' do
+          Limit sign in from multiple ips
+        %span.form-text.text-muted#unique_ip_help_block
+          Helps prevent malicious users hide their activity
+
+    .form-group
+      = f.label :unique_ips_limit_per_user, 'IPs per user', class: 'label-light'
+      = f.number_field :unique_ips_limit_per_user, class: 'form-control'
+      .form-text.text-muted
+        Maximum number of unique IPs per user
+
+    .form-group
+      = f.label :unique_ips_limit_time_window, 'IP expiration time', class: 'label-light'
+      = f.number_field :unique_ips_limit_time_window, class: 'form-control'
+      .form-text.text-muted
+        How many seconds an IP will be counted towards the limit
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_terminal.html.haml

@@ -2,12 +2,11 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      = f.label :terminal_max_session_time, 'Max session time', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.number_field :terminal_max_session_time, class: 'form-control'
-        .form-text.text-muted
-          Maximum time for web terminal websocket connection (in seconds).
-          0 for unlimited.
+    .form-group
+      = f.label :terminal_max_session_time, 'Max session time', class: 'label-light'
+      = f.number_field :terminal_max_session_time, class: 'form-control'
+      .form-text.text-muted
+        Maximum time for web terminal websocket connection (in seconds).
+        0 for unlimited.
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_terms.html.haml

@@ -2,21 +2,18 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .col-sm-12
-        .form-check
-          = f.check_box :enforce_terms, class: 'form-check-input'
-          = f.label :enforce_terms, class: 'form-check-label' do
-            = _("Require all users to accept Terms of Service and Privacy Policy when they access GitLab.")
-          .form-text.text-muted
-            = _("When enabled, users cannot use GitLab until the terms have been accepted.")
-    .form-group.row
-      .col-sm-12
-        = f.label :terms do
-          = _("Terms of Service Agreement and Privacy Policy")
-      .col-sm-12
-        = f.text_area :terms, class: 'form-control', rows: 8
+    .form-group
+      .form-check
+        = f.check_box :enforce_terms, class: 'form-check-input'
+        = f.label :enforce_terms, class: 'form-check-label' do
+          = _("Require all users to accept Terms of Service and Privacy Policy when they access GitLab.")
         .form-text.text-muted
-          = _("Markdown enabled")
+          = _("When enabled, users cannot use GitLab until the terms have been accepted.")
+    .form-group
+      = f.label :terms do
+        = _("Terms of Service Agreement and Privacy Policy")
+      = f.text_area :terms, class: 'form-control', rows: 8
+      .form-text.text-muted
+        = _("Markdown enabled")
 
   = f.submit _("Save changes"), class: "btn btn-success"

app/views/admin/application_settings/_usage.html.haml

@@ -2,36 +2,34 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :version_check_enabled, class: 'form-check-input'
-          = f.label :version_check_enabled, class: 'form-check-label' do
-            Enable version check
-          .form-text.text-muted
-            GitLab will inform you if a new version is available.
-            = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "version-check")
-            about what information is shared with GitLab Inc.
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        - can_be_configured = @application_setting.usage_ping_can_be_configured?
-        .form-check
-          = f.check_box :usage_ping_enabled, disabled: !can_be_configured, class: 'form-check-input'
-          = f.label :usage_ping_enabled, class: 'form-check-label' do
-            Enable usage ping
-          .form-text.text-muted
-            - if can_be_configured
-              To help improve GitLab and its user experience, GitLab will
-              periodically collect usage information.
-              = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "usage-ping")
-              about what information is shared with GitLab Inc. Visit
-              = link_to 'Cohorts', admin_cohorts_path(anchor: 'usage-ping')
-              to see the JSON payload sent.
-            - else
-              The usage ping is disabled, and cannot be configured through this
-              form. For more information, see the documentation on
-              = succeed '.' do
-                = link_to 'deactivating the usage ping', help_page_path('user/admin_area/settings/usage_statistics', anchor: 'deactivate-the-usage-ping')
+    .form-group
+      .form-check
+        = f.check_box :version_check_enabled, class: 'form-check-input'
+        = f.label :version_check_enabled, class: 'form-check-label' do
+          Enable version check
+        .form-text.text-muted
+          GitLab will inform you if a new version is available.
+          = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "version-check")
+          about what information is shared with GitLab Inc.
+    .form-group
+      - can_be_configured = @application_setting.usage_ping_can_be_configured?
+      .form-check
+        = f.check_box :usage_ping_enabled, disabled: !can_be_configured, class: 'form-check-input'
+        = f.label :usage_ping_enabled, class: 'form-check-label' do
+          Enable usage ping
+        .form-text.text-muted
+          - if can_be_configured
+            To help improve GitLab and its user experience, GitLab will
+            periodically collect usage information.
+            = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "usage-ping")
+            about what information is shared with GitLab Inc. Visit
+            = link_to 'Cohorts', admin_cohorts_path(anchor: 'usage-ping')
+            to see the JSON payload sent.
+          - else
+            The usage ping is disabled, and cannot be configured through this
+            form. For more information, see the documentation on
+            = succeed '.' do
+              = link_to 'deactivating the usage ping', help_page_path('user/admin_area/settings/usage_statistics', anchor: 'deactivate-the-usage-ping')
 
   = f.submit 'Save changes', class: "btn btn-success"
 

app/views/admin/application_settings/_visibility_and_access.html.haml

@@ -2,80 +2,70 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      = f.label :default_branch_protection, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.select :default_branch_protection, options_for_select(Gitlab::Access.protection_options, @application_setting.default_branch_protection), {}, class: 'form-control'
+    .form-group
+      = f.label :default_branch_protection, class: 'label-light'
+      = f.select :default_branch_protection, options_for_select(Gitlab::Access.protection_options, @application_setting.default_branch_protection), {}, class: 'form-control'
     = render partial: 'admin/application_settings/ee/project_creation_level', locals: { form: f, application_setting: @application_setting }
-    .form-group.row.visibility-level-setting
-      = f.label :default_project_visibility, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new)
-    .form-group.row.visibility-level-setting
-      = f.label :default_snippet_visibility, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: ProjectSnippet.new)
-    .form-group.row.visibility-level-setting
-      = f.label :default_group_visibility, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = render('shared/visibility_radios', model_method: :default_group_visibility, form: f, selected_level: @application_setting.default_group_visibility, form_model: Group.new)
-    .form-group.row
-      = f.label :restricted_visibility_levels, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        - checkbox_name = 'application_setting[restricted_visibility_levels][]'
-        = hidden_field_tag(checkbox_name)
-        - restricted_level_checkboxes('restricted-visibility-help', checkbox_name, class: 'form-check-input').each do |level|
-          .form-check
-            = level
-        %span.form-text.text-muted#restricted-visibility-help
-          Selected levels cannot be used by non-admin users for groups, projects or snippets.
-          If the public level is restricted, user profiles are only visible to logged in users.
-    .form-group.row
-      = f.label :import_sources, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = hidden_field_tag 'application_setting[import_sources][]'
-        - import_sources_checkboxes('import-sources-help', class: 'form-check-input').each do |source|
-          .form-check= source
-        %span.form-text.text-muted#import-sources-help
-          Enabled sources for code import during project creation. OmniAuth must be configured for GitHub
-          = link_to "(?)", help_page_path("integration/github")
-          , Bitbucket
-          = link_to "(?)", help_page_path("integration/bitbucket")
-          and GitLab.com
-          = link_to "(?)", help_page_path("integration/gitlab")
+    .form-group.visibility-level-setting
+      = f.label :default_project_visibility, class: 'label-light'
+      = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new)
+    .form-group.visibility-level-setting
+      = f.label :default_snippet_visibility, class: 'label-light'
+      = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: ProjectSnippet.new)
+    .form-group.visibility-level-setting
+      = f.label :default_group_visibility, class: 'label-light'
+      = render('shared/visibility_radios', model_method: :default_group_visibility, form: f, selected_level: @application_setting.default_group_visibility, form_model: Group.new)
+    .form-group
+      = f.label :restricted_visibility_levels, class: 'label-light'
+      - checkbox_name = 'application_setting[restricted_visibility_levels][]'
+      = hidden_field_tag(checkbox_name)
+      - restricted_level_checkboxes('restricted-visibility-help', checkbox_name, class: 'form-check-input').each do |level|
+        .form-check
+          = level
+      %span.form-text.text-muted#restricted-visibility-help
+        Selected levels cannot be used by non-admin users for groups, projects or snippets.
+        If the public level is restricted, user profiles are only visible to logged in users.
+    .form-group
+      = f.label :import_sources, class: 'label-light'
+      = hidden_field_tag 'application_setting[import_sources][]'
+      - import_sources_checkboxes('import-sources-help', class: 'form-check-input').each do |source|
+        .form-check= source
+      %span.form-text.text-muted#import-sources-help
+        Enabled sources for code import during project creation. OmniAuth must be configured for GitHub
+        = link_to "(?)", help_page_path("integration/github")
+        , Bitbucket
+        = link_to "(?)", help_page_path("integration/bitbucket")
+        and GitLab.com
+        = link_to "(?)", help_page_path("integration/gitlab")
 
     -# EE-only
     - if ldap_enabled?
-      .form-group.row
-        = f.label :allow_group_owners_to_manage_ldap, 'LDAP settings', class: 'col-form-label col-sm-2'
-        .col-sm-10
-          .form-check
-            = f.check_box :allow_group_owners_to_manage_ldap, class: 'form-check-input'
-            = f.label :allow_group_owners_to_manage_ldap, class: 'form-check-label' do
-              Allow group owners to manage LDAP-related settings
-          %span.form-text.text-muted
-            If checked, group owners can manage LDAP group links and LDAP member overrides
-            = link_to icon('question-circle'), help_page_path('administration/auth/ldap-ee')
-
-    .form-group.row
-      .offset-sm-2.col-sm-10
+      .form-group
+        = f.label :allow_group_owners_to_manage_ldap, 'LDAP settings', class: 'label-light'
         .form-check
-          = f.check_box :project_export_enabled, class: 'form-check-input'
-          = f.label :project_export_enabled, class: 'form-check-label' do
-            Project export enabled
+          = f.check_box :allow_group_owners_to_manage_ldap, class: 'form-check-input'
+          = f.label :allow_group_owners_to_manage_ldap, class: 'form-check-label' do
+            Allow group owners to manage LDAP-related settings
+        %span.form-text.text-muted
+          If checked, group owners can manage LDAP group links and LDAP member overrides
+          = link_to icon('question-circle'), help_page_path('administration/auth/ldap-ee')
+
+    .form-group
+      .form-check
+        = f.check_box :project_export_enabled, class: 'form-check-input'
+        = f.label :project_export_enabled, class: 'form-check-label' do
+          Project export enabled
 
-    .form-group.row
-      %label.col-form-label.col-sm-2 Enabled Git access protocols
-      .col-sm-10
-        = select(:application_setting, :enabled_git_access_protocol, [['Both SSH and HTTP(S)', nil], ['Only SSH', 'ssh'], ['Only HTTP(S)', 'http']], {}, class: 'form-control')
-        %span.form-text.text-muted#clone-protocol-help
-          Allow only the selected protocols to be used for Git access.
+    .form-group
+      %label.label-light Enabled Git access protocols
+      = select(:application_setting, :enabled_git_access_protocol, [['Both SSH and HTTP(S)', nil], ['Only SSH', 'ssh'], ['Only HTTP(S)', 'http']], {}, class: 'form-control')
+      %span.form-text.text-muted#clone-protocol-help
+        Allow only the selected protocols to be used for Git access.
 
     - ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type|
       - field_name = :"#{type}_key_restriction"
-      .form-group.row
-        = f.label field_name, "#{type.upcase} SSH keys", class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.select field_name, key_restriction_options_for_select(type), {}, class: 'form-control'
+      .form-group
+        = f.label field_name, "#{type.upcase} SSH keys", class: 'label-light'
+        = f.select field_name, key_restriction_options_for_select(type), {}, class: 'form-control'
 
   = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/gitaly_servers/index.html.haml

@@ -6,10 +6,10 @@
   - if @gitaly_servers.any?
     .table-holder
       %table.table.responsive-table
-        %thead.d-none.d-sm-none.d-md-block
+        %thead
           %tr
             %th= _("Storage")
-            %th= n_("Gitaly|Address")
+            %th= s_("Gitaly|Address")
             %th= _("Server version")
             %th= _("Git version")
             %th= _("Up to date")

app/views/admin/services/_form.html.haml

 %h3.page-title
   = @service.title
 
-%p #{@service.description} template
+%p #{@service.description} template.
 
 = form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'fieldset-form' } do |form|
   = render 'shared/service_settings', form: form, subject: @service

app/views/ci/variables/_variable_row.html.haml

@@ -43,8 +43,6 @@
           %span.toggle-icon
             = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
             = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
-      -# EE-specific start
-      = render 'ci/variables/environment_scope', form_field: form_field, variable: variable
-      -# EE-specific end
+      = render_if_exists 'ci/variables/environment_scope', form_field: form_field, variable: variable
   %button.js-row-remove-button.ci-variable-row-remove-button{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') }
     = icon('minus-circle')

app/views/groups/group_members/index.html.haml

@@ -27,9 +27,10 @@
       %span.badge= @members.total_count
       = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form flex-project-members-form'  do
         .form-group
-          = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
-          %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
-            = icon("search")
+          .position-relative.append-right-8
+            = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
+            %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
+              = icon("search")
           - if can_manage_members
             = render 'shared/members/filter_2fa_dropdown'
           = render 'shared/members/sort_dropdown'

app/views/import/gitlab_projects/new.html.haml

@@ -37,6 +37,6 @@
       .form-group
         = file_field_tag :file, class: ''
   .row
-    .form-actions
+    .form-actions.col-sm-12
       = submit_tag 'Import project', class: 'btn btn-create'
       = link_to 'Cancel', new_project_path, class: 'btn btn-cancel'

app/views/layouts/header/_default.html.haml

@@ -61,7 +61,7 @@
           - if header_link?(:sign_in)
             %li.nav-item
               %div
-                = link_to "Sign in / Register", new_session_path(:user, redirect_to_referer: 'yes'), class: 'nav-link btn btn-sign-in'
+                = link_to "Sign in / Register", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in'
 
       %button.navbar-toggler.d-block.d-sm-none{ type: 'button' }
         %span.sr-only Toggle navigation

app/views/projects/commit/_change.html.haml

@@ -20,18 +20,18 @@
           %span{ "aria-hidden": true } ×
       .modal-body
         - if description
-          %p.append-bottom-20= description
+          %p= description
         = form_tag [type.underscore, @project.namespace.becomes(Namespace), @project, commit], method: :post, remote: false, class: "js-#{type}-form js-requires-input" do
-          .form-group.row.branch
-            = label_tag 'start_branch', branch_label, class: 'col-form-label col-sm-2'
-            .col-sm-10
-              = hidden_field_tag :start_branch, @project.default_branch, id: 'start_branch'
-              = dropdown_tag(@project.default_branch, options: { title: s_("BranchSwitcherTitle|Switch branch"), filter: true, placeholder: s_("BranchSwitcherPlaceholder|Search branches"), toggle_class: 'js-project-refs-dropdown dynamic', dropdown_class: 'dropdown-menu-selectable', data: { field_name: "start_branch", selected: @project.default_branch, start_branch: @project.default_branch, refs_url: project_branches_path(@project), submit_form_on_click: false } })
+          .form-group.branch
+            = label_tag 'start_branch', branch_label, class: 'label-light'
 
-              - if can?(current_user, :push_code, @project)
-                = render 'shared/new_merge_request_checkbox'
-              - else
-                = hidden_field_tag 'create_merge_request', 1, id: nil
+            = hidden_field_tag :start_branch, @project.default_branch, id: 'start_branch'
+            = dropdown_tag(@project.default_branch, options: { title: s_("BranchSwitcherTitle|Switch branch"), filter: true, placeholder: s_("BranchSwitcherPlaceholder|Search branches"), toggle_class: 'js-project-refs-dropdown dynamic', dropdown_class: 'dropdown-menu-selectable', data: { field_name: "start_branch", selected: @project.default_branch, start_branch: @project.default_branch, refs_url: project_branches_path(@project), submit_form_on_click: false } })
+
+            - if can?(current_user, :push_code, @project)
+              = render 'shared/new_merge_request_checkbox'
+            - else
+              = hidden_field_tag 'create_merge_request', 1, id: nil
           .form-actions
             = submit_tag label, class: 'btn btn-create'
             = link_to _("Cancel"), '#', class: "btn btn-cancel", "data-dismiss" => "modal"

app/views/projects/commit/branches.html.haml

@@ -6,7 +6,7 @@
 
 - if @branches.any? || @tags.any? || @tags_limit_exceeded
   %span
-    = link_to "#", class: "js-details-expand label label-gray ref-name" do
+    = link_to "#", class: "js-details-expand badge badge-gray ref-name" do
       = sprite_icon('ellipsis_h', size: 12, css_class: 'vertical-align-middle')
     %span.js-details-content.hide
       = commit_branches_links(@project, @branches)

app/views/projects/pipelines/_info.html.haml

 #js-pipeline-header-vue.pipeline-header-container
 - sast_artifact = @pipeline.sast_artifact
 - dependency_artifact = @pipeline.dependency_scanning_artifact
+- dast_artifact = @pipeline.dast_artifact
+- sast_container_artifact = @pipeline.sast_container_artifact
 
 - if @commit.present?
   .commit-box
@@ -36,5 +38,5 @@
         = link_to @pipeline.sha, project_commit_path(@project, @pipeline.sha), class: "commit-sha commit-hash-full"
       = clipboard_button(text: @pipeline.sha, title: "Copy commit SHA to clipboard")
 
-    - if sast_artifact || dependency_artifact
+    - if sast_artifact || dependency_artifact || dast_artifact || sast_container_artifact
       .js-sast-summary

app/views/projects/pipelines/_with_tabs.html.haml

 - expose_sast_data = @pipeline.expose_sast_data?
 - expose_dependency_data = @pipeline.expose_dependency_scanning_data?
+- expose_dast_data = @pipeline.expose_dast_data?
+- expose_sast_container_data = @pipeline.expose_sast_container_data?
+- expose_container_scanning_data = @pipeline.expose_container_scanning_data?
 - blob_path = project_blob_path(@project, @pipeline.sha)
 
 .tabs-holder
@@ -84,13 +87,17 @@
                 %pre.build-trace.build-trace-rounded
                   %code.bash.js-build-output
                     = build_summary(build)
-  - if expose_sast_data || expose_dependency_data
+  - if expose_sast_data || expose_dependency_data || expose_dast_data || expose_sast_container_data || expose_container_scanning_data
     #js-tab-security.build-security.tab-pane
       #js-security-report-app{ data: { endpoint: expose_sast_data ? sast_artifact_url(@pipeline) : nil,
       blob_path: blob_path,
       dependency_scanning_endpoint: expose_dependency_data ? dependency_scanning_artifact_url(@pipeline) : nil,
+      dast_endpoint: expose_dast_data ? dast_artifact_url(@pipeline) : nil,
+      sast_container_endpoint: expose_sast_container_data ? sast_container_artifact_url(@pipeline) : (expose_container_scanning_data ? container_scanning_artifact_url(@pipeline) : nil),
       pipeline_id: @pipeline.id,
       vulnerability_feedback_path: project_vulnerability_feedback_index_path(@project),
       vulnerability_feedback_help_path: help_page_path("user/project/merge_requests/index", anchor: "interacting-with-security-reports-ultimate"),
       sast_help_path: help_page_path('user/project/merge_requests/sast'),
-      dependency_scanning_help_path: help_page_path('user/project/merge_requests/dependency_scanning')} }
+      dependency_scanning_help_path: help_page_path('user/project/merge_requests/dependency_scanning'),
+      dast_help_path: help_page_path('user/project/merge_requests/dast'),
+      sast_container_help_path: help_page_path('user/project/merge_requests/sast_container')} }

app/views/projects/project_members/_team.html.haml

@@ -9,9 +9,10 @@
     %span.badge.badge-pill= members.total_count
     = form_tag project_project_members_path(project), method: :get, class: 'form-inline member-search-form flex-project-members-form'  do
       .form-group
-        = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
-        %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
-          = icon("search")
+        .position-relative
+          = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
+          %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
+            = icon("search")
         = render 'shared/members/sort_dropdown'
   %ul.content-list.members-list
     = render partial: 'shared/members/member', collection: members, as: :member

app/views/projects/releases/edit.html.haml

@@ -13,7 +13,7 @@
 
   = form_for(@release, method: :put, url: project_tag_release_path(@project, @tag.name), html: { class: 'common-note-form release-form js-quick-submit' }) do |f|
     = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project), referenced_users: true } do
-      = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: "Write your release notes or drag files here..."
+      = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: "Write your release notes or drag files here…"
       = render 'shared/notes/hints'
     .error-alert
     .prepend-top-default

app/views/projects/services/_form.html.haml

@@ -4,7 +4,7 @@
       = @service.title
       = boolean_to_icon @service.activated?
 
-    %p= @service.description
+    %p= #{@service.description}.
 
     - if @service.respond_to?(:detailed_description)
       %p= @service.detailed_description

app/views/projects/tags/new.html.haml

@@ -36,7 +36,7 @@
     = label_tag :release_description, s_('TagsPage|Release notes'), class: 'col-form-label col-sm-2'
     .col-sm-10
       = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project), referenced_users: true } do
-        = render 'projects/zen', attr: :release_description, classes: 'note-textarea', placeholder: s_('TagsPage|Write your release notes or drag files here...'), current_text: @release_description
+        = render 'projects/zen', attr: :release_description, classes: 'note-textarea', placeholder: s_('TagsPage|Write your release notes or drag files here…'), current_text: @release_description
         = render 'shared/notes/hints'
       .form-text.text-muted
         = s_('TagsPage|Optionally, add release notes to the tag. They will be stored in the GitLab database and displayed on the tags page.')

app/views/projects/wikis/_form.html.haml

@@ -25,7 +25,7 @@
     .col-sm-12= f.label :content, class: 'control-label-full-width'
     .col-sm-12
       = render layout: 'projects/md_preview', locals: { url: project_wiki_preview_markdown_path(@project, @page.slug) } do
-        = render 'projects/zen', f: f, attr: :content, classes: 'note-textarea', placeholder: s_("WikiPage|Write your content or drag files here...")
+        = render 'projects/zen', f: f, attr: :content, classes: 'note-textarea', placeholder: s_("WikiPage|Write your content or drag files here…")
         = render 'shared/notes/hints'
 
       .clearfix

app/views/shared/_import_form.html.haml

@@ -18,8 +18,6 @@
           = import_will_timeout_message(ci_cd_only)
         %li
           = import_svn_message(ci_cd_only)
-        %li
-          The Git LFS objects will be ignored.
         - unless ci_cd_only
           %li
             - ssh_link = link_to _('here'), help_page_path('/workflow/repository_mirroring.md', anchor: 'ssh-authentication')

app/views/shared/_new_merge_request_checkbox.html.haml

-.form-check
+.form-check.prepend-top-8
   - nonce = SecureRandom.hex
   = check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request form-check-input', id: "create_merge_request-#{nonce}"
   = label_tag "create_merge_request-#{nonce}", class: 'form-check-label' do

app/views/shared/form_elements/_description.html.haml

@@ -16,7 +16,7 @@
     = render layout: 'projects/md_preview', locals: { url: preview_url, referenced_users: true } do
       = render 'projects/zen', f: form, attr: :description,
                                classes: 'note-textarea qa-issuable-form-description',
-                               placeholder: "Write a comment or drag your files here...",
+                               placeholder: "Write a comment or drag your files here…",
                                supports_quick_actions: supports_quick_actions
       = render 'shared/notes/hints', supports_quick_actions: supports_quick_actions
       .clearfix

app/views/shared/issuable/_sidebar.html.haml

@@ -43,7 +43,7 @@
 
         .selectbox.hide-collapsed
           = f.hidden_field 'milestone_id', value: issuable.milestone_id, id: nil
-          = dropdown_tag('Milestone', options: { title: _('Assign milestone'), toggle_class: 'js-milestone-select js-extra-options', filter: true, dropdown_class: 'dropdown-menu-selectable', placeholder: _('Search milestones'), data: { show_no: true, field_name: "#{issuable.to_ability_name}[milestone_id]", project_id: @project.id, issuable_id: issuable.id, milestones: project_milestones_path(@project, :json), ability_name: issuable.to_ability_name, issue_update: issuable_json_path(issuable), use_id: true, default_no: true, selected: (issuable.milestone.name if issuable.milestone), null_default: true }})
+          = dropdown_tag('Milestone', options: { title: _('Assign milestone'), toggle_class: 'js-milestone-select js-extra-options', filter: true, dropdown_class: 'dropdown-menu-selectable', placeholder: _('Search milestones'), data: { show_no: true, field_name: "#{issuable.to_ability_name}[milestone_id]", project_id: @project.id, issuable_id: issuable.id, milestones: project_milestones_path(@project, :json), ability_name: issuable.to_ability_name, issue_update: issuable_json_path(issuable), use_id: true, default_no: true, selected: (issuable.milestone.name if issuable.milestone), null_default: true, display: 'static' }})
       - if issuable.has_attribute?(:time_estimate)
         #issuable-time-tracker.block
           // Fallback while content is loading
@@ -77,7 +77,7 @@
             .selectbox.hide-collapsed
               = f.hidden_field :due_date, value: issuable.due_date.try(:strftime, 'yy-mm-dd')
               .dropdown
-                %button.dropdown-menu-toggle.js-due-date-select{ type: 'button', data: { toggle: 'dropdown', field_name: "#{issuable.to_ability_name}[due_date]", ability_name: issuable.to_ability_name, issue_update: issuable_json_path(issuable) } }
+                %button.dropdown-menu-toggle.js-due-date-select{ type: 'button', data: { toggle: 'dropdown', field_name: "#{issuable.to_ability_name}[due_date]", ability_name: issuable.to_ability_name, issue_update: issuable_json_path(issuable), display: 'static' } }
                   %span.dropdown-toggle-text
                     = _('Due date')
                   = icon('chevron-down', 'aria-hidden': 'true')
@@ -109,7 +109,7 @@
             - selected_labels.each do |label|
               = hidden_field_tag "#{issuable.to_ability_name}[label_names][]", label.id, id: nil
             .dropdown
-              %button.dropdown-menu-toggle.js-label-select.js-multiselect.js-label-sidebar-dropdown{ type: "button", data: {toggle: "dropdown", default_label: "Labels", field_name: "#{issuable.to_ability_name}[label_names][]", ability_name: issuable.to_ability_name, show_no: "true", show_any: "true", namespace_path: @project.try(:namespace).try(:full_path), project_path: @project.try(:path), issue_update: issuable_json_path(issuable), labels: (labels_filter_path(false) if @project) } }
+              %button.dropdown-menu-toggle.js-label-select.js-multiselect.js-label-sidebar-dropdown{ type: "button", data: {toggle: "dropdown", default_label: "Labels", field_name: "#{issuable.to_ability_name}[label_names][]", ability_name: issuable.to_ability_name, show_no: "true", show_any: "true", namespace_path: @project.try(:namespace).try(:full_path), project_path: @project.try(:path), issue_update: issuable_json_path(issuable), labels: (labels_filter_path(false) if @project), display: 'static' } }
                 %span.dropdown-toggle-text{ class: ("is-default" if selected_labels.empty?) }
                   = multi_label_name(selected_labels, "Labels")
                 = icon('chevron-down', 'aria-hidden': 'true')

app/views/shared/issuable/_sidebar_assignees.html.haml

@@ -37,7 +37,7 @@
   - issuable.assignees.each do |assignee|
     = hidden_field_tag "#{issuable.to_ability_name}[assignee_ids][]", assignee.id, id: nil, data: { avatar_url: assignee.avatar_url, name: assignee.name, username: assignee.username }
 
-  - options = { toggle_class: 'js-user-search js-author-search', title: _('Assign to'), filter: true, dropdown_class: 'dropdown-menu-user dropdown-menu-selectable dropdown-menu-author', placeholder: _('Search users'), data: { first_user: current_user&.username, current_user: true, project_id: @project&.id, author_id: issuable.author_id, field_name: "#{issuable.to_ability_name}[assignee_ids][]", issue_update: issuable_json_path(issuable), ability_name: issuable.to_ability_name, null_user: true } }
+  - options = { toggle_class: 'js-user-search js-author-search', title: _('Assign to'), filter: true, dropdown_class: 'dropdown-menu-user dropdown-menu-selectable dropdown-menu-author', placeholder: _('Search users'), data: { first_user: current_user&.username, current_user: true, project_id: @project&.id, author_id: issuable.author_id, field_name: "#{issuable.to_ability_name}[assignee_ids][]", issue_update: issuable_json_path(issuable), ability_name: issuable.to_ability_name, null_user: true, display: 'static' } }
   - title = _('Select assignee')
 
   - if issuable.is_a?(Issue)

app/views/shared/issuable/form/_contribution.html.haml

@@ -7,11 +7,11 @@
 
 %hr
 
-.form-group
-  .col-form-label
+.form-group.row
+  %label.col-form-label.col-sm-2
     = _('Contribution')
   .col-sm-10
-    .form-check
+    .form-check.prepend-top-5
       = form.check_box :allow_collaboration, disabled: !issuable.can_allow_collaboration?(current_user), class: 'form-check-input'
       = form.label :allow_collaboration, class: 'form-check-label' do
         = _('Allow commits from members who can merge to the target branch.')

app/views/shared/notes/_edit_form.html.haml

@@ -3,7 +3,7 @@
     = hidden_field_tag :target_id, '', class: 'js-form-target-id'
     = hidden_field_tag :target_type, '', class: 'js-form-target-type'
     = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(project), referenced_users: true } do
-      = render 'projects/zen', attr: 'note[note]', classes: 'note-textarea js-note-text js-task-list-field', placeholder: "Write a comment or drag your files here..."
+      = render 'projects/zen', attr: 'note[note]', classes: 'note-textarea js-note-text js-task-list-field', placeholder: "Write a comment or drag your files here…"
       = render 'shared/notes/hints'
 
     .note-form-actions.clearfix

app/views/shared/notes/_form.html.haml

@@ -29,7 +29,7 @@
       = render 'projects/zen', f: f,
         attr: :note,
         classes: 'note-textarea js-note-text',
-        placeholder: "Write a comment or drag your files here...",
+        placeholder: "Write a comment or drag your files here…",
         supports_quick_actions: supports_quick_actions,
         supports_autocomplete: supports_autocomplete
       = render 'shared/notes/hints', supports_quick_actions: supports_quick_actions

app/workers/repository_fork_worker.rb

@@ -23,10 +23,11 @@ class RepositoryForkWorker
 
       source_repository_storage_path, source_disk_path = *args
 
-      source_repository_storage_name = Gitlab.config.repositories.storages.find do |_, info|
-        info.legacy_disk_path == source_repository_storage_path
-      end&.first || raise("no shard found for path '#{source_repository_storage_path}'")
-
+      source_repository_storage_name = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
+        Gitlab.config.repositories.storages.find do |_, info|
+          info.legacy_disk_path == source_repository_storage_path
+        end&.first || raise("no shard found for path '#{source_repository_storage_path}'")
+      end
       fork_repository(target_project, source_repository_storage_name, source_disk_path)
     end
   end

changelogs/unreleased/47604-avatars-and-system-icons-for-mobile.yml

+---
+title: Make avatars/icons hidden on mobile
+merge_request: 19585
+author: Takuya Noguchi
+type: fixed

changelogs/unreleased/47679-fix-failed-jobs-tab-ie11.yml

+---
+title: Fix overflowing Failed Jobs table in sm viewports on IE11
+merge_request:
+author:
+type: fixed

changelogs/unreleased/blackst0ne-add-gemfile-rails5-lock-check.yml

+---
+title: Add CI job to check Gemfile.rails5.lock
+merge_request: 19605
+author: "@blackst0ne"
+type: other

changelogs/unreleased/bvl-fix-maintainer-push-rejected.yml

+---
+title: Fix bug where maintainer would not be allowed to push to forks with merge requests
+  that have `Allow maintainer edits` enabled.
+merge_request: 18968
+author:
+type: fixed

changelogs/unreleased/da-port-cte-to-ce.yml

+---
+title: Add Gitlab::SQL:CTE for easily building CTE statements
+merge_request:
+author:
+type: added

changelogs/unreleased/expose-ci-url.yml

+---
+title: Add CI_PIPELINE_URL and CI_JOB_URL
+merge_request: 19618
+author:
+type: added

changelogs/unreleased/fix-br-decode.yml

+---
+title: mergeError message has been binded using v-html directive
+merge_request: 19058
+author: Murat Dogan
+type: fixed