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/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/testing_guide/best_practices.md

@@ -536,7 +536,7 @@ reset before each example, add the `:prometheus` tag to the Rspec test.
 ### Matchers
 
 Custom matchers should be created to clarify the intent and/or hide the
-complexity of RSpec expectations.They should be placed under
+complexity of RSpec expectations. They should be placed under
 `spec/support/matchers/`. Matchers can be placed in subfolder if they apply to
 a certain type of specs only (e.g. features, requests etc.) but shouldn't be if
 they apply to multiple type of specs.

lib/gitlab/git/blob.rb

@@ -128,7 +128,7 @@ module Gitlab
       def load_all_data!(repository)
         return if @data == '' # don't mess with submodule blobs
 
-        # Even if we return early, recalculate wether this blob is binary in
+        # Even if we return early, recalculate whether this blob is binary in
         # case a blob was initialized as text but the full data isn't
         @binary = nil
 

lib/support/init.d/gitlab

@@ -340,7 +340,7 @@ start_gitlab() {
 
   # Wait for the pids to be planted
   wait_for_pids
-  # Finally check the status to tell wether or not GitLab is running
+  # Finally check the status to tell whether or not GitLab is running
   print_status
 }
 

spec/helpers/projects_helper_spec.rb

@@ -194,7 +194,7 @@ describe ProjectsHelper do
       expect(helper.project_list_cache_key(project).last).to start_with('v')
     end
 
-    it 'includes wether or not the user can read cross project' do
+    it 'includes whether or not the user can read cross project' do
       expect(helper.project_list_cache_key(project)).to include('cross-project:true')
     end