From 0bc8084ef319ca1df4bfb885e66facd04b0540db Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 30 Jun 2020 06:08:49 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../jobs/components/commit_block.vue          |  2 +-
 .../jobs/components/trigger_block.vue         |  2 +-
 .../components/accessibility_issue_body.vue   |  2 +-
 .../reports/components/test_issue_body.vue    |  2 +-
 app/assets/stylesheets/framework/common.scss  |  1 -
 app/views/groups/_home_panel.html.haml        |  2 +-
 app/views/projects/_home_panel.html.haml      |  2 +-
 app/views/shared/_milestone_expired.html.haml |  6 ++---
 .../shared/milestones/_milestone.html.haml    |  6 ++---
 .../vale/styles/gitlab/FutureTense.yml        | 24 +++++++++++++++++++
 doc/.vale/gitlab/SubstitutionWarning.yml      |  3 +++
 .../squash_merge_request_spec.rb              |  6 +----
 12 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 doc/.linting/vale/styles/gitlab/FutureTense.yml

diff --git a/app/assets/javascripts/jobs/components/commit_block.vue b/app/assets/javascripts/jobs/components/commit_block.vue
index 72a5ff01672..c4f180f200c 100644
--- a/app/assets/javascripts/jobs/components/commit_block.vue
+++ b/app/assets/javascripts/jobs/components/commit_block.vue
@@ -32,7 +32,7 @@ export default {
       block: !isLastBlock,
     }"
   >
-    <p class="append-bottom-5">
+    <p class="gl-mb-2">
       <span class="font-weight-bold">{{ __('Commit') }}</span>
 
       <gl-link :href="commit.commit_path" class="js-commit-sha commit-sha link-commit">
diff --git a/app/assets/javascripts/jobs/components/trigger_block.vue b/app/assets/javascripts/jobs/components/trigger_block.vue
index 1a076249fe7..f55429ecdae 100644
--- a/app/assets/javascripts/jobs/components/trigger_block.vue
+++ b/app/assets/javascripts/jobs/components/trigger_block.vue
@@ -46,7 +46,7 @@ export default {
     <p
       v-if="trigger.short_token"
       class="js-short-token"
-      :class="{ 'append-bottom-5': hasVariables, 'gl-mb-0': !hasVariables }"
+      :class="{ 'gl-mb-2': hasVariables, 'gl-mb-0': !hasVariables }"
     >
       <span class="font-weight-bold">{{ __('Trigger token:') }}</span> {{ trigger.short_token }}
     </p>
diff --git a/app/assets/javascripts/reports/accessibility_report/components/accessibility_issue_body.vue b/app/assets/javascripts/reports/accessibility_report/components/accessibility_issue_body.vue
index 653dcced98b..6e494872791 100644
--- a/app/assets/javascripts/reports/accessibility_report/components/accessibility_issue_body.vue
+++ b/app/assets/javascripts/reports/accessibility_report/components/accessibility_issue_body.vue
@@ -36,7 +36,7 @@ export default {
 };
 </script>
 <template>
-  <div class="report-block-list-issue-description prepend-top-5 append-bottom-5">
+  <div class="report-block-list-issue-description prepend-top-5 gl-mb-2">
     <div ref="accessibility-issue-description" class="report-block-list-issue-description-text">
       <div
         v-if="isNew"
diff --git a/app/assets/javascripts/reports/components/test_issue_body.vue b/app/assets/javascripts/reports/components/test_issue_body.vue
index c41238070b1..de476fda8ed 100644
--- a/app/assets/javascripts/reports/components/test_issue_body.vue
+++ b/app/assets/javascripts/reports/components/test_issue_body.vue
@@ -25,7 +25,7 @@ export default {
 };
 </script>
 <template>
-  <div class="report-block-list-issue-description prepend-top-5 append-bottom-5">
+  <div class="report-block-list-issue-description prepend-top-5 gl-mb-2">
     <div class="report-block-list-issue-description-text" data-testid="test-issue-body-description">
       <button
         type="button"
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 068612c4c92..c98b7eb8937 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -411,7 +411,6 @@ img.emoji {
 .append-right-15 { margin-right: 15px; }
 .append-right-default { margin-right: $gl-padding; }
 .append-right-20 { margin-right: 20px; }
-.append-bottom-5 { margin-bottom: 5px; }
 .append-bottom-10 { margin-bottom: 10px; }
 .append-bottom-15 { margin-bottom: 15px; }
 .append-bottom-20 { margin-bottom: 20px; }
diff --git a/app/views/groups/_home_panel.html.haml b/app/views/groups/_home_panel.html.haml
index 75712c0efb2..2fbd98d9aa5 100644
--- a/app/views/groups/_home_panel.html.haml
+++ b/app/views/groups/_home_panel.html.haml
@@ -9,7 +9,7 @@
         = group_icon(@group, class: 'avatar avatar-tile s64', width: 64, height: 64)
       .d-flex.flex-column.flex-wrap.align-items-baseline
         .d-inline-flex.align-items-baseline
-          %h1.home-panel-title.gl-mt-3.append-bottom-5
+          %h1.home-panel-title.gl-mt-3.gl-mb-2
             = @group.name
             %span.visibility-icon.text-secondary.gl-ml-2.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
               = visibility_level_icon(@group.visibility_level, fw: false, options: {class: 'icon'})
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 0efe870b3e0..9e29316bf99 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -10,7 +10,7 @@
         = project_icon(@project, alt: @project.name, class: 'avatar avatar-tile s64', width: 64, height: 64)
       .d-flex.flex-column.flex-wrap.align-items-baseline
         .d-inline-flex.align-items-baseline
-          %h1.home-panel-title.gl-mt-3.append-bottom-5{ data: { qa_selector: 'project_name_content' } }
+          %h1.home-panel-title.gl-mt-3.gl-mb-2{ data: { qa_selector: 'project_name_content' } }
             = @project.name
             %span.visibility-icon.text-secondary.gl-ml-2.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@project) }
               = visibility_level_icon(@project.visibility_level, fw: false, options: {class: 'icon'})
diff --git a/app/views/shared/_milestone_expired.html.haml b/app/views/shared/_milestone_expired.html.haml
index 48a97a18ca9..2261e9e3121 100644
--- a/app/views/shared/_milestone_expired.html.haml
+++ b/app/views/shared/_milestone_expired.html.haml
@@ -1,6 +1,6 @@
 - if milestone.expired? and not milestone.closed?
-  .status-box.status-box-expired.append-bottom-5= _('Expired')
+  .status-box.status-box-expired.gl-mb-2= _('Expired')
 - if milestone.upcoming?
-  .status-box.status-box-mr-merged.append-bottom-5= _('Upcoming')
+  .status-box.status-box-mr-merged.gl-mb-2= _('Upcoming')
 - if milestone.closed?
-  .status-box.status-box-closed.append-bottom-5= _('Closed')
+  .status-box.status-box-closed.gl-mb-2= _('Closed')
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml
index 31505d2d9fb..6460d1a46e8 100644
--- a/app/views/shared/milestones/_milestone.html.haml
+++ b/app/views/shared/milestones/_milestone.html.haml
@@ -5,17 +5,17 @@
 %li{ class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: custom_dom_id }
   .row
     .col-sm-6
-      .append-bottom-5
+      .gl-mb-2
         %strong= link_to truncate(milestone.title, length: 100), milestone_path(milestone)
         - if @group
           = " - #{milestone_type}"
 
       - if milestone.due_date || milestone.start_date
-        .text-tertiary.append-bottom-5
+        .text-tertiary.gl-mb-2
           = milestone_date_range(milestone)
       - recent_releases, total_count, more_count = recent_releases_with_counts(milestone)
       - unless total_count.zero?
-        .text-tertiary.append-bottom-5.milestone-release-links
+        .text-tertiary.gl-mb-2.milestone-release-links
           = sprite_icon("rocket", size: 12)
           = n_('Release', 'Releases', total_count)
           - recent_releases.each do |release|
diff --git a/doc/.linting/vale/styles/gitlab/FutureTense.yml b/doc/.linting/vale/styles/gitlab/FutureTense.yml
new file mode 100644
index 00000000000..9efe3f25551
--- /dev/null
+++ b/doc/.linting/vale/styles/gitlab/FutureTense.yml
@@ -0,0 +1,24 @@
+---
+# Warning: gitlab.FutureTense
+#
+# Checks for use of future tense in sentences. Present tense is preferred as
+# much as possible.
+#
+# For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
+extends: existence
+message: 'Avoid using future tense: "%s"'
+ignorecase: true
+level: suggestion
+link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#language-to-avoid
+tokens:
+  - going to be
+  - going to
+  - he'll
+  - she'll
+  - they'll
+  - we'll
+  - will be
+  - will have
+  - will # Leave this word after the two-word 'will' variants as a catchall
+  - won't
+  - you'll
diff --git a/doc/.vale/gitlab/SubstitutionWarning.yml b/doc/.vale/gitlab/SubstitutionWarning.yml
index 31fbb314801..5324a48e38c 100644
--- a/doc/.vale/gitlab/SubstitutionWarning.yml
+++ b/doc/.vale/gitlab/SubstitutionWarning.yml
@@ -13,8 +13,11 @@ ignorecase: true
 swap:
   admin: administrator
   blacklist(ed|ing)?: denylist
+  code base: codebase
   config: configuration
   distro: distribution
+  file name: filename
+  filesystem: file system
   info: information
   repo: repository
   whitelist(ed|ing)?: allowlist
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
index 9236609934e..585a2a7f345 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
@@ -34,13 +34,9 @@ module QA
           merge_request_page.mark_to_squash
           merge_request_page.merge!
 
-          merge_request.project.visit!
-
           Git::Repository.perform do |repository|
-            repository.uri = merge_request.project.repository_http_location.uri
-
+            repository.uri = project.repository_http_location.uri
             repository.use_default_credentials
-
             repository.clone
 
             expect(repository.commits.size).to eq 3