Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js

@@ -59,7 +59,7 @@ export default {
     },
     requestRefreshPipelineGraph() {
       // When an action is clicked
-      // (wether in the dropdown or in the main nodes, we refresh the big graph)
+      // (whether in the dropdown or in the main nodes, we refresh the big graph)
       this.mediator
         .refreshPipeline()
         .catch(() => flash(__('An error occurred while making the request.')));

app/finders/concerns/finder_with_cross_project_access.rb

 # frozen_string_literal: true
-# Module to prepend into finders to specify wether or not the finder requires
+# Module to prepend into finders to specify whether or not the finder requires
 # cross project access
 #
 # This module depends on the finder implementing the following methods:

changelogs/unreleased/revert_rename_services_template_to_instance_migration.yml

+---
+title: Revert rename services template to instance migration
+merge_request: 24885
+author:
+type: fixed

db/post_migrate/20200211152410_remove_instance_from_services.rb

+# frozen_string_literal: true
+
+class RemoveInstanceFromServices < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    return unless column_exists?(:services, :instance)
+
+    undo_rename_column_concurrently :services, :template, :instance
+  end
+
+  def down
+    # This migration should not be rolled back because it
+    # removes a column that got added in migrations that
+    # have been reverted in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24857
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2020_02_07_151640) do
+ActiveRecord::Schema.define(version: 2020_02_11_152410) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"

doc/administration/geo/replication/configuration.md

@@ -171,7 +171,7 @@ keys must be manually replicated to the **secondary** node.
    sudo -i
    ```
-1. Edit `/etc/gitlab/gitlab.rb` and add a **unique** name for your node.  You will need this in the next steps:
+1. Edit `/etc/gitlab/gitlab.rb` and add a **unique** name for your node. You will need this in the next steps:
    ```ruby
    # The unique identifier for the Geo node.

doc/administration/geo/replication/faq.md

@@ -45,7 +45,7 @@ query.
 ## Can I `git push` to a **secondary** node?
-Yes!  Pushing directly to a **secondary** node (for both HTTP and SSH, including Git LFS) was [introduced](https://about.gitlab.com/releases/2018/09/22/gitlab-11-3-released/) in [GitLab Premium](https://about.gitlab.com/pricing/#self-managed) 11.3.
+Yes! Pushing directly to a **secondary** node (for both HTTP and SSH, including Git LFS) was [introduced](https://about.gitlab.com/releases/2018/09/22/gitlab-11-3-released/) in [GitLab Premium](https://about.gitlab.com/pricing/#self-managed) 11.3.
 ## How long does it take to have a commit replicated to a **secondary** node?

doc/administration/gitaly/praefect.md

@@ -227,7 +227,7 @@ remember to run `sudo gitlab-ctl reconfigure` again before trying the
 #### Gitaly
-Next we will configure each Gitaly server assigned to Praefect.  Configuration for these
+Next we will configure each Gitaly server assigned to Praefect. Configuration for these
 is the same as a normal standalone Gitaly server, except that we use storage names and
 auth tokens from Praefect instead of GitLab.

doc/administration/operations/moving_repositories.md

@@ -16,9 +16,9 @@ source and the target.**
 ## Target directory is empty: use a tar pipe
 If the target directory `/mnt/gitlab/repositories` is empty the
-simplest thing to do is to use a tar pipe.  This method has low
+simplest thing to do is to use a tar pipe. This method has low
 overhead and tar is almost always already installed on your system.
-However, it is not possible to resume an interrupted tar pipe:  if
+However, it is not possible to resume an interrupted tar pipe: if
 that happens then all data must be copied again.
 ```shell
@@ -82,7 +82,7 @@ repository at a time.
 In addition to rsync we will use [GNU
 Parallel](http://www.gnu.org/software/parallel/). This utility is
 not included in GitLab so you need to install it yourself with apt
-or yum.  Also note that the GitLab scripts we used below were added
+or yum. Also note that the GitLab scripts we used below were added
 in GitLab 8.1.
 ** This process does not clean up repositories at the target location that no

doc/administration/operations/unicorn.md

@@ -75,7 +75,7 @@ Otherwise, you can set the `GITLAB_UNICORN_MEMORY_MIN` and `GITLAB_UNICORN_MEMOR
 This is what a Unicorn worker memory restart looks like in unicorn_stderr.log.
 You see that worker 4 (PID 125918) is inspecting itself and decides to exit.
 The threshold memory value was 254802235 bytes, about 250MB. With GitLab this
-threshold is a random value between 200 and 250 MB.  The master process (PID
+threshold is a random value between 200 and 250 MB. The master process (PID
 117565) then reaps the worker process and spawns a new 'worker 4' with PID
 127549.

doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md

@@ -166,7 +166,7 @@ GIT_CURL_VERBOSE=1 GIT_TRACE=1 git clone <repository>
 # A single project
 project = Project.find_by_full_path('PROJECT_PATH')
-# All projects in a particular namespace.  Can be a username, a group
+# All projects in a particular namespace. Can be a username, a group
 # ('gitlab-org'), or even include subgroups ('gitlab-org/distribution')
 namespace = Namespace.find_by_full_path('NAMESPACE_PATH')
 projects = namespace.all_projects
@@ -997,7 +997,7 @@ gitlab_rails['env'] = {
 }
 ```
-Then `gitlab-ctl reconfigure; gitlab-ctl restart sidekiq`.  The Sidekiq logs will now include additional data for troubleshooting.
+Then `gitlab-ctl reconfigure; gitlab-ctl restart sidekiq`. The Sidekiq logs will now include additional data for troubleshooting.
 ### Sidekiq kill signals

doc/administration/troubleshooting/linux_cheat_sheet.md

@@ -133,7 +133,7 @@ sudo !!
 ### Memory, Disk, & CPU usage
 ```shell
-# disk space info.  The '-h' gives the data in human-readable values
+# disk space info. The '-h' gives the data in human-readable values
 df -h
 # size of each file/dir and its contents in the current dir
@@ -186,7 +186,7 @@ Be aware that strace can have major impacts to system performance when it is run
 ### The Strace Parser tool
 Our [strace-parser tool](https://gitlab.com/wchandler/strace-parser) can be used to
-provide a high level summary of the `strace` output.  It is similar to `strace -C`,
+provide a high level summary of the `strace` output. It is similar to `strace -C`,
 but provides much more detailed statistics.
 MacOS and Linux binaries [are available](https://gitlab.com/gitlab-com/support/toolbox/strace-parser/-/tags),
@@ -198,7 +198,7 @@ First run the tool with no arguments other than the strace output file name to g
 a summary of the top processes sorted by time spent actively performing tasks. You
 can also sort based on total time, # of syscalls made, PID #, and # of child processes
 using the `-S` or `--sort` flag. The number of results defaults to 25 processes, but
-can be changed using the `-c`/`--count` option.  See `--help` for full details.
+can be changed using the `-c`/`--count` option. See `--help` for full details.
 ```shell
 $ ./strace-parser strace.txt

doc/development/adding_database_indexes.md

@@ -105,7 +105,7 @@ ORDER BY pg_relation_size(indexrelname::regclass) desc;
 ```
 This query outputs a list containing all indexes that are never used and sorts
-them by indexes sizes in descending order.  This query can be useful to
+them by indexes sizes in descending order. This query can be useful to
 determine if any previously indexes are useful after all. More information on
 the meaning of the various columns can be found at
 <https://www.postgresql.org/docs/current/monitoring-stats.html>.

doc/development/code_review.md

@@ -107,7 +107,7 @@ confidence in their solution will not have been reached.
 Before the review, the author is requested to submit comments on the merge
 request diff alerting the reviewer to anything important as well as for anything
-that demands further explanation or attention.  Examples of content that may
+that demands further explanation or attention. Examples of content that may
 warrant a comment could be:
 - The addition of a linting rule (Rubocop, JS etc)
@@ -181,8 +181,8 @@ vulnerabilities must be either empty or containing:
 Maintainers should **never** dismiss vulnerabilities to "empty" the list,
 without duly verifying them.
-Note that certain Merge Requests may target a stable branch.  These are rare
-events.  These types of Merge Requests cannot be merged by the Maintainer.
+Note that certain Merge Requests may target a stable branch. These are rare
+events. These types of Merge Requests cannot be merged by the Maintainer.
 Instead these should be sent to the [Release Manager](https://about.gitlab.com/community/release-managers/).
 ## Best practices

doc/development/contributing/index.md

@@ -82,9 +82,9 @@ When you submit code to GitLab, we really want it to get merged, but there will
 When maintainers are reading through a merge request they may request guidance from other maintainers. If merge request maintainers conclude that the code should not be merged, our reasons will be fully disclosed. If it has been decided that the code quality is not up to GitLab’s standards, the merge request maintainer will refer the author to our docs and code style guides, and provide some guidance.
-Sometimes style guides will be followed but the code will lack structural integrity, or the maintainer will have reservations about the code’s overall quality. When there is a reservation the maintainer will inform the author and provide some guidance.  The author may then choose to update the merge request. Once the merge request has been updated and reassigned to the maintainer, they will review the code again. Once the code has been resubmitted any number of times, the maintainer may choose to close the merge request with a summary of why it will not be merged, as well as some guidance. If the merge request is closed the maintainer will be open to discussion as to how to improve the code so it can be approved in the future.
-GitLab will do its best to review community contributions as quickly as possible. Specially appointed developers review community contributions daily. You may take a look at the [team page](https://about.gitlab.com/company/team/) for the merge request coach who specializes in the type of code you have written and mention them in the merge request.  For example, if you have written some JavaScript in your code then you should mention the frontend merge request coach. If your code has multiple disciplines you may mention multiple merge request coaches.
+Sometimes style guides will be followed but the code will lack structural integrity, or the maintainer will have reservations about the code’s overall quality. When there is a reservation the maintainer will inform the author and provide some guidance. The author may then choose to update the merge request. Once the merge request has been updated and reassigned to the maintainer, they will review the code again. Once the code has been resubmitted any number of times, the maintainer may choose to close the merge request with a summary of why it will not be merged, as well as some guidance. If the merge request is closed the maintainer will be open to discussion as to how to improve the code so it can be approved in the future.
+GitLab will do its best to review community contributions as quickly as possible. Specially appointed developers review community contributions daily. You may take a look at the [team page](https://about.gitlab.com/company/team/) for the merge request coach who specializes in the type of code you have written and mention them in the merge request. For example, if you have written some JavaScript in your code then you should mention the frontend merge request coach. If your code has multiple disciplines you may mention multiple merge request coaches.
 GitLab receives a lot of community contributions, so if your code has not been reviewed within two days (excluding weekend and public holidays) of its initial submission feel free to re-mention the appropriate merge request coach.

doc/development/elasticsearch.md

@@ -193,7 +193,7 @@ You might get an error such as
 This is because you've exceeded the disk space threshold - it thinks you don't have enough disk space left, based on the default 95% threshold.
-In addition, the `read_only_allow_delete` setting will be set to `true`.  It will block indexing, `forcemerge`, etc
+In addition, the `read_only_allow_delete` setting will be set to `true`. It will block indexing, `forcemerge`, etc
 ```
 curl "http://localhost:9200/gitlab-development/_settings?pretty"

doc/development/fe_guide/performance.md

@@ -85,15 +85,15 @@ browser's developer console while on any page within GitLab.
 #### Important Considerations
 - **Keep Entry Points Lite:**
-  Page-specific JavaScript entry points should be as lite as possible.  These
+  Page-specific JavaScript entry points should be as lite as possible. These
   files are exempt from unit tests, and should be used primarily for
   instantiation and dependency injection of classes and methods that live in
-  modules outside of the entry point script.  Just import, read the DOM,
+  modules outside of the entry point script. Just import, read the DOM,
   instantiate, and nothing else.
 - **Entry Points May Be Asynchronous:**
   _DO NOT ASSUME_ that the DOM has been fully loaded and available when an
-  entry point script is run.  If you require that some code be run after the
+  entry point script is run. If you require that some code be run after the
   DOM has loaded, you should attach an event handler to the `DOMContentLoaded`
   event with:
@@ -113,7 +113,7 @@ browser's developer console while on any page within GitLab.
     with a relative path (e.g. `import initMyWidget from './my_widget';`).
   - If a class or module is _used by multiple routes_, place it within a
     shared directory at the closest common parent directory for the entry
-    points that import it.  For example, if `my_widget.js` is imported within
+    points that import it. For example, if `my_widget.js` is imported within
     both `pages/widget/show/index.js` and `pages/widget/run/index.js`, then
     place the module at `pages/widget/shared/my_widget.js` and import it with
     a relative path if possible (e.g. `../shared/my_widget`).
@@ -122,7 +122,7 @@ browser's developer console while on any page within GitLab.
   For GitLab Enterprise Edition, page-specific entry points will override their
   Community Edition counterparts with the same name, so if
   `ee/app/assets/javascripts/pages/foo/bar/index.js` exists, it will take
-  precedence over `app/assets/javascripts/pages/foo/bar/index.js`.  If you want
+  precedence over `app/assets/javascripts/pages/foo/bar/index.js`. If you want
   to minimize duplicate code, you can import one entry point from the other.
   This is not done automatically to allow for flexibility in overriding
   functionality.
@@ -131,7 +131,7 @@ browser's developer console while on any page within GitLab.
 For any code that does not need to be run immediately upon page load, (e.g.
 modals, dropdowns, and other behaviors that can be lazy-loaded), you can split
-your module into asynchronous chunks with dynamic import statements.  These
+your module into asynchronous chunks with dynamic import statements. These
 imports return a Promise which will be resolved once the script has loaded:
 ```javascript

doc/development/github_importer.md

@@ -140,7 +140,7 @@ long we're still performing work.
 GitHub has a rate limit of 5 000 API calls per hour. The number of requests
 necessary to import a project is largely dominated by the number of unique users
 involved in a project (e.g. issue authors). Other data such as issue pages
-and comments typically only requires a few dozen requests to import.  This is
+and comments typically only requires a few dozen requests to import. This is
 because we need the Email address of users in order to map them to GitLab users.
 We handle this by doing the following:

doc/development/go_guide/index.md

@@ -188,9 +188,9 @@ code readability and test output.
 ### Better output in tests
 When comparing expected and actual values in tests, use
-[testify/require.Equal](https://godoc.org/github.com/stretchr/testify/require#Equal),
-[testify/require.EqualError](https://godoc.org/github.com/stretchr/testify/require#EqualError),
-[testify/require.EqualValues](https://godoc.org/github.com/stretchr/testify/require#EqualValues),
+[`testify/require.Equal`](https://godoc.org/github.com/stretchr/testify/require#Equal),
+[`testify/require.EqualError`](https://godoc.org/github.com/stretchr/testify/require#EqualError),
+[`testify/require.EqualValues`](https://godoc.org/github.com/stretchr/testify/require#EqualValues),
 and others to improve readability when comparing structs, errors,
 large portions of text, or JSON documents:

doc/development/logging.md

@@ -129,7 +129,7 @@ importer progresses. Here's what to do:
 ## Multi-destination Logging
-GitLab is transitioning from unstructured/plaintext logs to structured/JSON logs.  During this transition period some logs will be recorded in multiple formats through multi-destination logging.
+GitLab is transitioning from unstructured/plaintext logs to structured/JSON logs. During this transition period some logs will be recorded in multiple formats through multi-destination logging.
 ### How to use multi-destination logging