Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/blob/notebook/index.js

@@ -75,10 +75,10 @@ export default () => {
           class="text-center"
           v-if="error">
           <span v-if="loadError">
-            An error occurred whilst loading the file. Please try again later.
+            An error occurred while loading the file. Please try again later.
           </span>
           <span v-else>
-            An error occurred whilst parsing the file.
+            An error occurred while parsing the file.
           </span>
         </p>
       </div>

app/assets/javascripts/blob/pdf/index.js

@@ -47,10 +47,10 @@ export default () => {
           class="text-center"
           v-if="error">
           <span v-if="loadError">
-            An error occurred whilst loading the file. Please try again later.
+            An error occurred while loading the file. Please try again later.
           </span>
           <span v-else>
-            An error occurred whilst decoding the file.
+            An error occurred while decoding the file.
           </span>
         </p>
       </div>

app/assets/javascripts/ide/stores/actions/file.js

@@ -89,7 +89,7 @@ export const getFileData = (
     .catch(() => {
       commit(types.TOGGLE_LOADING, { entry: file });
       dispatch('setErrorMessage', {
-        text: __('An error occurred whilst loading the file.'),
+        text: __('An error occurred while loading the file.'),
         action: payload =>
           dispatch('getFileData', payload).then(() => dispatch('setErrorMessage', null)),
         actionText: __('Please try again'),
@@ -136,7 +136,7 @@ export const getRawFileData = ({ state, commit, dispatch, getters }, { path }) =
       })
       .catch(() => {
         dispatch('setErrorMessage', {
-          text: __('An error occurred whilst loading the file content.'),
+          text: __('An error occurred while loading the file content.'),
           action: payload =>
             dispatch('getRawFileData', payload).then(() => dispatch('setErrorMessage', null)),
           actionText: __('Please try again'),

app/assets/javascripts/ide/stores/actions/merge_request.js

@@ -58,7 +58,7 @@ export const getMergeRequestData = (
         })
         .catch(() => {
           dispatch('setErrorMessage', {
-            text: __('An error occurred whilst loading the merge request.'),
+            text: __('An error occurred while loading the merge request.'),
             action: payload =>
               dispatch('getMergeRequestData', payload).then(() =>
                 dispatch('setErrorMessage', null),
@@ -91,7 +91,7 @@ export const getMergeRequestChanges = (
         })
         .catch(() => {
           dispatch('setErrorMessage', {
-            text: __('An error occurred whilst loading the merge request changes.'),
+            text: __('An error occurred while loading the merge request changes.'),
             action: payload =>
               dispatch('getMergeRequestChanges', payload).then(() =>
                 dispatch('setErrorMessage', null),
@@ -125,7 +125,7 @@ export const getMergeRequestVersions = (
         })
         .catch(() => {
           dispatch('setErrorMessage', {
-            text: __('An error occurred whilst loading the merge request version data.'),
+            text: __('An error occurred while loading the merge request version data.'),
             action: payload =>
               dispatch('getMergeRequestVersions', payload).then(() =>
                 dispatch('setErrorMessage', null),

app/assets/javascripts/ide/stores/actions/project.js

@@ -152,7 +152,7 @@ export const openBranch = ({ dispatch, state, getters }, { projectId, branchId,
         () =>
           new Error(
             sprintf(
-              __('An error occurred whilst getting files for - %{branchId}'),
+              __('An error occurred while getting files for - %{branchId}'),
               {
                 branchId: `<strong>${_.escape(projectId)}/${_.escape(branchId)}</strong>`,
               },

app/assets/javascripts/ide/stores/actions/tree.js

@@ -77,7 +77,7 @@ export const getFiles = ({ state, commit, dispatch }, payload = {}) =>
         })
         .catch(e => {
           dispatch('setErrorMessage', {
-            text: __('An error occurred whilst loading all the files.'),
+            text: __('An error occurred while loading all the files.'),
             action: actionPayload =>
               dispatch('getFiles', actionPayload).then(() => dispatch('setErrorMessage', null)),
             actionText: __('Please try again'),

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

@@ -218,7 +218,7 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState, roo
         dispatch(
           'setErrorMessage',
           {
-            text: __('An error occurred whilst committing your changes.'),
+            text: __('An error occurred while committing your changes.'),
             action: () =>
               dispatch('commitChanges').then(() =>
                 dispatch('setErrorMessage', null, { root: true }),

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

@@ -28,7 +28,7 @@ export const receiveLatestPipelineError = ({ commit, dispatch }, err) => {
     dispatch(
       'setErrorMessage',
       {
-        text: __('An error occurred whilst fetching the latest pipeline.'),
+        text: __('An error occurred while fetching the latest pipeline.'),
         action: () =>
           dispatch('forcePipelineRequest').then(() =>
             dispatch('setErrorMessage', null, { root: true }),
@@ -84,7 +84,7 @@ export const receiveJobsError = ({ commit, dispatch }, stage) => {
   dispatch(
     'setErrorMessage',
     {
-      text: __('An error occurred whilst loading the pipelines jobs.'),
+      text: __('An error occurred while loading the pipelines jobs.'),
       action: payload =>
         dispatch('fetchJobs', payload).then(() =>
           dispatch('setErrorMessage', null, { root: true }),
@@ -123,7 +123,7 @@ export const receiveJobTraceError = ({ commit, dispatch }) => {
   dispatch(
     'setErrorMessage',
     {
-      text: __('An error occurred whilst fetching the job trace.'),
+      text: __('An error occurred while fetching the job trace.'),
       action: () =>
         dispatch('fetchJobTrace').then(() => dispatch('setErrorMessage', null, { root: true })),
       actionText: __('Please try again'),

app/assets/javascripts/monitoring/components/dashboard.vue

@@ -370,7 +370,9 @@ export default {
           >
             <gl-dropdown
               id="monitor-environments-dropdown"
-              class="mb-0 d-flex js-environments-dropdown"
+              ref="monitorEnvironmentsDropdown"
+              data-qa-selector="environments_dropdown"
+              class="mb-0 d-flex"
               toggle-class="dropdown-menu-toggle"
               :text="currentEnvironmentName"
               :disabled="environments.length === 0"

app/graphql/types/commit_type.rb

@@ -12,7 +12,7 @@ module Types
           description: 'ID (global ID) of the commit'
     field :sha, type: GraphQL::STRING_TYPE, null: false,
           description: 'SHA1 ID of the commit'
-    field :title, type: GraphQL::STRING_TYPE, null: true,
+    field :title, type: GraphQL::STRING_TYPE, null: true, calls_gitaly: true,
           description: 'Title of the commit message'
     field :description, type: GraphQL::STRING_TYPE, null: true,
           description: 'Description of the commit message'

db/fixtures/development/26_container_images.rb

+# frozen_string_literal: true
+
+class Gitlab::Seeder::ContainerImages
+  attr_reader :tmp_dir, :project, :images_count
+
+  DOCKER_FILE_CONTENTS = <<~EOS
+    FROM scratch
+    ARG tag
+    ENV tag=$tag
+  EOS
+
+  def initialize(project, images_count)
+    @project = project
+    @images_count = images_count
+    initialize_tmp_dir
+  end
+
+  def seed!
+    images_count.times do |i|
+      image_path = "#{project.container_registry_url}:tag_#{i}"
+      build_image(image_path)
+      push_image(image_path)
+      puts '.'
+    end
+  ensure
+    FileUtils.remove_entry tmp_dir
+  end
+
+  private
+
+  def build_image(image_path)
+    system(*%W[docker build -t #{image_path} --build-arg tag=gitlab_container_image_seed .], chdir: @tmp_dir)
+  end
+
+  def push_image(image_path)
+    system(*%W[docker push #{image_path}], chdir: @tmp_dir)
+  end
+
+  def initialize_tmp_dir
+    @tmp_dir = Dir.mktmpdir('gitlab_seeder_container_images')
+
+    File.write(File.join(@tmp_dir, 'Dockerfile'), DOCKER_FILE_CONTENTS)
+  end
+end
+
+Gitlab::Seeder.quiet do
+  flag = 'SEED_CONTAINER_IMAGES'
+
+  if ENV[flag]
+    admin_user = User.admins.first
+    images_count = Integer(ENV[flag])
+
+    Project.not_mass_generated.visible_to_user(admin_user).sample(1).each do |project|
+      puts "\nSeeding #{images_count} container images to the '#{project.full_path}' project."
+
+      seeder = Gitlab::Seeder::ContainerImages.new(project, images_count)
+      seeder.seed!
+    rescue => e
+      puts "\nSeeding container images failed with #{e.message}."
+      puts "Make sure that the registry is running (https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/howto/registry.md) and that Docker CLI (https://www.docker.com/products/docker-desktop) is installed."
+    end
+  else
+    puts "Skipped. Use the `#{flag}` environment variable to seed container images to the registry."
+  end
+end

doc/administration/auth/how_to_configure_ldap_gitlab_ee/index.md

@@ -108,7 +108,7 @@ gitlab_rails['ldap_servers'] = {
 ## Conclusion
 Integration of GitLab with Active Directory (LDAP) reduces the complexity of user management.
-It has the advantage of improving user permission controls, whilst easing the deployment of GitLab into an existing [IT environment](https://www.techopedia.com/definition/29199/it-infrastructure). GitLab EE offers advanced group management and multiple LDAP servers.
+It has the advantage of improving user permission controls, while easing the deployment of GitLab into an existing [IT environment](https://www.techopedia.com/definition/29199/it-infrastructure). GitLab EE offers advanced group management and multiple LDAP servers.
 With the assistance of the [GitLab Support](https://about.gitlab.com/support/) team, setting up GitLab with an existing AD/LDAP solution will be a smooth and painless process.

doc/development/ee_features.md

@@ -835,7 +835,7 @@ information on managing page-specific JavaScript within EE.
 To separate Vue template differences we should [async import the components](https://vuejs.org/v2/guide/components-dynamic-async.html#Async-Components).
-Doing this allows for us to load the correct component in EE whilst in CE
+Doing this allows for us to load the correct component in EE while in CE
 we can load a empty component that renders nothing. This code **should**
 exist in the CE repository as well as the EE repository.

doc/development/fe_guide/droplab/plugins/ajax.md

@@ -33,6 +33,6 @@ droplab.addHook(trigger, list, [Ajax], {
 ```
 Optionally you can set `loadingTemplate` to a HTML string. This HTML string will
-replace the dropdown list whilst the request is pending.
+replace the dropdown list while the request is pending.
 Additionally, you can set `onError` to a function to catch any XHR errors.

doc/install/azure/index.md

@@ -105,7 +105,7 @@ ahead and select this one, but please choose the size which best meets your own
 ![Azure - Create Virtual Machine - Size](img/azure-create-virtual-machine-size.png)
-> **Note:** be aware that whilst your VM is active (known as "allocated"), it will incur
+> **Note:** be aware that while your VM is active (known as "allocated"), it will incur
 "compute charges" which, ultimately, you will be billed for. So, even if you're using the
 free trial credits, you'll likely want to learn
 [how to properly shutdown an Azure VM to save money](https://buildazure.com/properly-shutdown-azure-vm-to-save-money/).

lib/banzai/filter/issuable_state_filter.rb

@@ -3,7 +3,7 @@
 module Banzai
   module Filter
     # HTML filter that appends state information to issuable links.
-    # Runs as a post-process filter as issuable state might change whilst
+    # Runs as a post-process filter as issuable state might change while
     # Markdown is in the cache.
     #
     # This filter supports cross-project references.

locale/ar_SA/gitlab.po

@@ -1722,37 +1722,37 @@ msgstr ""
 msgid "An error occurred while validating username"
 msgstr ""
-msgid "An error occurred whilst committing your changes."
+msgid "An error occurred while committing your changes."
 msgstr ""
-msgid "An error occurred whilst fetching the job trace."
+msgid "An error occurred while fetching the job trace."
 msgstr ""
-msgid "An error occurred whilst fetching the latest pipeline."
+msgid "An error occurred while fetching the latest pipeline."
 msgstr ""
-msgid "An error occurred whilst getting files for - %{branchId}"
+msgid "An error occurred while getting files for - %{branchId}"
 msgstr ""
-msgid "An error occurred whilst loading all the files."
+msgid "An error occurred while loading all the files."
 msgstr ""
-msgid "An error occurred whilst loading the file content."
+msgid "An error occurred while loading the file content."
 msgstr ""
-msgid "An error occurred whilst loading the file."
+msgid "An error occurred while loading the file."
 msgstr ""
-msgid "An error occurred whilst loading the merge request changes."
+msgid "An error occurred while loading the merge request changes."
 msgstr ""
-msgid "An error occurred whilst loading the merge request version data."
+msgid "An error occurred while loading the merge request version data."
 msgstr ""
-msgid "An error occurred whilst loading the merge request."
+msgid "An error occurred while loading the merge request."
 msgstr ""
-msgid "An error occurred whilst loading the pipelines jobs."
+msgid "An error occurred while loading the pipelines jobs."
 msgstr ""
 msgid "An error occurred. Please try again."
@@ -19949,4 +19949,3 @@ msgstr[5] ""
 msgid "yaml invalid"
 msgstr ""
-

locale/bg/gitlab.po

@@ -1542,37 +1542,37 @@ msgstr ""
 msgid "An error occurred while validating username"
 msgstr ""
-msgid "An error occurred whilst committing your changes."
+msgid "An error occurred while committing your changes."
 msgstr ""
-msgid "An error occurred whilst fetching the job trace."
+msgid "An error occurred while fetching the job trace."
 msgstr ""
-msgid "An error occurred whilst fetching the latest pipeline."
+msgid "An error occurred while fetching the latest pipeline."
 msgstr ""
-msgid "An error occurred whilst getting files for - %{branchId}"
+msgid "An error occurred while getting files for - %{branchId}"
 msgstr ""
-msgid "An error occurred whilst loading all the files."
+msgid "An error occurred while loading all the files."
 msgstr ""
-msgid "An error occurred whilst loading the file content."
+msgid "An error occurred while loading the file content."
 msgstr ""
-msgid "An error occurred whilst loading the file."
+msgid "An error occurred while loading the file."
 msgstr ""
-msgid "An error occurred whilst loading the merge request changes."
+msgid "An error occurred while loading the merge request changes."
 msgstr ""
-msgid "An error occurred whilst loading the merge request version data."
+msgid "An error occurred while loading the merge request version data."
 msgstr ""
-msgid "An error occurred whilst loading the merge request."
+msgid "An error occurred while loading the merge request."
 msgstr ""
-msgid "An error occurred whilst loading the pipelines jobs."
+msgid "An error occurred while loading the pipelines jobs."
 msgstr ""
 msgid "An error occurred. Please try again."
@@ -19521,4 +19521,3 @@ msgstr[1] ""
 msgid "yaml invalid"
 msgstr ""
-

locale/bn_BD/gitlab.po

@@ -1542,37 +1542,37 @@ msgstr ""
 msgid "An error occurred while validating username"
 msgstr ""
-msgid "An error occurred whilst committing your changes."
+msgid "An error occurred while committing your changes."
 msgstr ""
-msgid "An error occurred whilst fetching the job trace."
+msgid "An error occurred while fetching the job trace."
 msgstr ""
-msgid "An error occurred whilst fetching the latest pipeline."
+msgid "An error occurred while fetching the latest pipeline."
 msgstr ""
-msgid "An error occurred whilst getting files for - %{branchId}"
+msgid "An error occurred while getting files for - %{branchId}"
 msgstr ""
-msgid "An error occurred whilst loading all the files."
+msgid "An error occurred while loading all the files."
 msgstr ""
-msgid "An error occurred whilst loading the file content."
+msgid "An error occurred while loading the file content."
 msgstr ""
-msgid "An error occurred whilst loading the file."
+msgid "An error occurred while loading the file."
 msgstr ""
-msgid "An error occurred whilst loading the merge request changes."
+msgid "An error occurred while loading the merge request changes."
 msgstr ""
-msgid "An error occurred whilst loading the merge request version data."
+msgid "An error occurred while loading the merge request version data."
 msgstr ""
-msgid "An error occurred whilst loading the merge request."
+msgid "An error occurred while loading the merge request."
 msgstr ""
-msgid "An error occurred whilst loading the pipelines jobs."
+msgid "An error occurred while loading the pipelines jobs."
 msgstr ""
 msgid "An error occurred. Please try again."
@@ -19521,4 +19521,3 @@ msgstr[1] ""
 msgid "yaml invalid"
 msgstr ""
-

locale/bn_IN/gitlab.po

@@ -1542,37 +1542,37 @@ msgstr ""
 msgid "An error occurred while validating username"
 msgstr ""
-msgid "An error occurred whilst committing your changes."
+msgid "An error occurred while committing your changes."
 msgstr ""
-msgid "An error occurred whilst fetching the job trace."
+msgid "An error occurred while fetching the job trace."
 msgstr ""
-msgid "An error occurred whilst fetching the latest pipeline."
+msgid "An error occurred while fetching the latest pipeline."
 msgstr ""
-msgid "An error occurred whilst getting files for - %{branchId}"
+msgid "An error occurred while getting files for - %{branchId}"
 msgstr ""
-msgid "An error occurred whilst loading all the files."
+msgid "An error occurred while loading all the files."
 msgstr ""
-msgid "An error occurred whilst loading the file content."
+msgid "An error occurred while loading the file content."
 msgstr ""
-msgid "An error occurred whilst loading the file."
+msgid "An error occurred while loading the file."
 msgstr ""
-msgid "An error occurred whilst loading the merge request changes."
+msgid "An error occurred while loading the merge request changes."
 msgstr ""
-msgid "An error occurred whilst loading the merge request version data."
+msgid "An error occurred while loading the merge request version data."
 msgstr ""
-msgid "An error occurred whilst loading the merge request."
+msgid "An error occurred while loading the merge request."
 msgstr ""
-msgid "An error occurred whilst loading the pipelines jobs."
+msgid "An error occurred while loading the pipelines jobs."
 msgstr ""
 msgid "An error occurred. Please try again."
@@ -19521,4 +19521,3 @@ msgstr[1] ""
 msgid "yaml invalid"
 msgstr ""
-