Add latest changes from gitlab-org/gitlab@master

.eslintrc.yml

@@ -51,10 +51,8 @@ rules:
   no-jquery/no-serialize: error
   promise/always-return: off
   promise/no-callback-in-promise: off
-  # Make update to eslint@6 smoother:
-  prefer-object-spread: off
 overrides:
-  - files:
-      - '**/spec/**/*'
-    rules:
-      "@gitlab/i18n/no-non-i18n-strings": off
+  files:
+    - '**/spec/**/*'
+  rules:
+    "@gitlab/i18n/no-non-i18n-strings": off

.gitlab/ci/docs.gitlab-ci.yml

@@ -50,6 +50,7 @@
     - <<: *if-canonical-dot-com-gitlab-org-groups-merge-request
       changes: *code-docs-patterns
       when: manual
+  allow_failure: true
   image: ruby:2.6-alpine
   stage: review
   dependencies: []

app/assets/javascripts/due_date_select.js

@@ -1,4 +1,3 @@
-/* eslint-disable max-classes-per-file */
 import $ from 'jquery';
 import Pikaday from 'pikaday';
 import dateFormat from 'dateformat';

app/assets/javascripts/gl_dropdown.js

@@ -1,4 +1,4 @@
-/* eslint-disable max-classes-per-file, one-var, consistent-return */
+/* eslint-disable  one-var, consistent-return */
 
 import $ from 'jquery';
 import _ from 'underscore';

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

@@ -61,7 +61,7 @@ export default {
       eventHub.$emit('EnablePolling');
     },
     updateTimer() {
-      this.timer -= 1;
+      this.timer = this.timer - 1;
 
       if (this.timer === 0) {
         this.refresh();

app/models/repository.rb

@@ -1069,24 +1069,6 @@ class Repository
     raw_repository.fetch_ref(source_repository.raw_repository, source_ref: source_ref, target_ref: target_ref)
   end
 
-  # DEPRECATED: https://gitlab.com/gitlab-org/gitaly/issues/1628
-  def rebase_deprecated(user, merge_request)
-    rebase_sha = raw.rebase_deprecated(
-      user,
-      merge_request.id,
-      branch: merge_request.source_branch,
-      branch_sha: merge_request.source_branch_sha,
-      remote_repository: merge_request.target_project.repository.raw,
-      remote_branch: merge_request.target_branch
-    )
-
-    # To support the full deprecated behaviour, set the
-    # `rebase_commit_sha` for the merge_request here and return the value
-    merge_request.update(rebase_commit_sha: rebase_sha, merge_error: nil)
-
-    rebase_sha
-  end
-
   def rebase(user, merge_request, skip_ci: false)
     push_options = []
     push_options << Gitlab::PushOptions::CI_SKIP if skip_ci

doc/development/architecture.md

@@ -6,9 +6,9 @@ There are two software distributions of GitLab: the open source [Community Editi
 
 New versions of GitLab are released in stable branches and the master branch is for bleeding edge development.
 
-For information, see the [GitLab Release Process](https://gitlab.com/gitlab-org/release/docs/tree/master#gitlab-release-process).
+For information, see the [GitLab Release Process](https://gitlab.com/gitlab-org/release/docs/-/tree/master#gitlab-release-process).
 
-Both EE and CE require some add-on components called GitLab Shell and Gitaly. These components are available from the [GitLab Shell](https://gitlab.com/gitlab-org/gitlab-shell/tree/master) and [Gitaly](https://gitlab.com/gitlab-org/gitaly/tree/master) repositories respectively. New versions are usually tags but staying on the master branch will give you the latest stable version. New releases are generally around the same time as GitLab CE releases with exception for informal security updates deemed critical.
+Both EE and CE require some add-on components called GitLab Shell and Gitaly. These components are available from the [GitLab Shell](https://gitlab.com/gitlab-org/gitlab-shell/-/tree/master) and [Gitaly](https://gitlab.com/gitlab-org/gitaly/-/tree/master) repositories respectively. New versions are usually tags but staying on the master branch will give you the latest stable version. New releases are generally around the same time as GitLab CE releases with exception for informal security updates deemed critical.
 
 ## Components
 
@@ -24,7 +24,7 @@ The add-on component GitLab Shell serves repositories over SSH. It manages the S
 
 Gitaly executes Git operations from GitLab Shell and the GitLab web app, and provides an API to the GitLab web app to get attributes from Git (e.g. title, branches, tags, other meta data), and to get blobs (e.g. diffs, commits, files).
 
-You may also be interested in the [production architecture of GitLab.com](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/).
+You may also be interested in the [production architecture of GitLab.com](https://about.gitlab.com/handbook/engineering/infrastructure/production/architecture/).
 
 ### Simplified Component Overview
 

doc/development/migration_style_guide.md

@@ -116,6 +116,124 @@ In case you need to insert, update, or delete a significant amount of data, you:
 - Must disable the single transaction with `disable_ddl_transaction!`.
 - Should consider doing it in a [Background Migration](background_migrations.md).
 
+## Retry mechanism when acquiring database locks
+
+When changing the database schema, we use helper methods to invoke DDL (Data Definition
+Language) statements. In some cases, these DDL statements require a specific database lock.
+
+Example:
+
+```ruby
+def change
+  remove_column :users, :full_name, :string
+end
+```
+
+Executing this migration requires an exclusive lock on the `users` table. When the table
+is concurrently accessed and modified by other processes, acquiring the lock may take
+a while. The lock request is waiting in a queue and it may also block other queries
+on the `users` table once it has been enqueued.
+
+More information about PostgresSQL locks: [Explicit Locking](https://www.postgresql.org/docs/current/explicit-locking.html)
+
+For stability reasons, GitLab.com has a specific [`statement_timeout`](../user/gitlab_com/index.md#postgresql)
+set. When the migration is invoked, any database query will have
+a fixed time to execute. In a worst-case scenario, the request will sit in the
+lock queue, blocking other queries for the duration of the configured statement timeout,
+then failing with `canceling statement due to statement timeout` error.
+
+This problem could cause failed application upgrade processes and even application
+stability issues, since the table may be inaccessible for a short period of time.
+
+To increase the reliability and stability of database migrations, the GitLab codebase
+offers a helper method to retry the operations with different `lock_timeout` settings
+and wait time between the attempts. Multiple smaller attempts to acquire the necessary
+lock allow the database to process other statements.
+
+### Examples
+
+Removing a column:
+
+```ruby
+include Gitlab::Database::MigrationHelpers
+
+def change
+  with_lock_retries do
+    remove_column :users, :full_name, :string
+  end
+end
+```
+
+Removing a foreign key:
+
+```ruby
+include Gitlab::Database::MigrationHelpers
+
+def change
+  with_lock_retries do
+    remove_foreign_key :issues, :projects
+  end
+end
+```
+
+Changing default value for a column:
+
+```ruby
+include Gitlab::Database::MigrationHelpers
+
+def change
+  with_lock_retries do
+    change_column_default :merge_requests, :lock_version, from: nil, to: 0
+  end
+end
+```
+
+### When to use the helper method
+
+The `with_lock_retries` helper method can be used when you normally use
+standard Rails migration helper methods. Calling more than one migration
+helper is not a problem if they're executed on the same table.
+
+Using the `with_lock_retries` helper method is advised when a database
+migration involves one of the high-traffic tables:
+
+- `users`
+- `projects`
+- `namespaces`
+- `ci_pipelines`
+- `ci_builds`
+- `notes`
+
+Example changes:
+
+- `add_foreign_key` / `remove_foreign_key`
+- `add_column` / `remove_column`
+- `change_column_default`
+
+**Note:** `with_lock_retries` method **cannot** be used with `disable_ddl_transaction!`.
+
+### How the helper method works
+
+1. Iterate 50 times.
+1. For each iteration, set a pre-configured `lock_timeout`.
+1. Try to execute the given block. (`remove_column`).
+1. If `LockWaitTimeout` error is raised, sleep for the pre-configured `sleep_time`
+and retry the block.
+1. If no error is raised, the current iteration has successfully executed the block.
+
+For more information check the [`Gitlab::Database::WithLockRetries`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/database/with_lock_retries.rb) class. The `with_lock_retries` helper method is implemented in the [`Gitlab::Database::MigrationHelpers`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/database/migration_helpers.rb) module.
+
+In a worst-case scenario, the method:
+
+- Executes the block for a maximum of 50 times over 40 minutes.
+  - Most of the time is spent in a pre-configured sleep period after each iteration.
+- After the 50th retry, the block will be executed without `lock_timeout`, just
+like a standard migration invocation.
+- If a lock cannot be acquired, the migration will fail with `statement timeout` error.
+
+The migration might fail if there is a very long running transaction (40+ minutes)
+accessing the `users` table.
+
 ## Multi-Threading
 
 Sometimes a migration might need to use multiple Ruby threads to speed up a
@@ -364,6 +482,86 @@ to run on a large table, as long as it is only updating a small subset of the
 rows in the table, but do not ignore that without validating on the GitLab.com
 staging environment - or asking someone else to do so for you - beforehand.
 
+## Dropping a database table
+
+Dropping a database table is uncommon, and the `drop_table` method
+provided by Rails is generally considered safe. Before dropping the table,
+please consider the following:
+
+If your table has foreign keys on a high-traffic table (like `projects`), then
+the `DROP TABLE` statement might fail with **statement timeout** error. Determining
+what tables are high traffic can be difficult. Self-managed instances might
+use different features of GitLab with different usage patterns, thus making
+assumptions based on GitLab.com is not enough.
+
+Table **has no records** (feature was never in use) and **no foreign
+keys**:
+
+- Simply use the `drop_table` method in your migration.
+
+```ruby
+def change
+  drop_table :my_table
+end
+```
+
+Table **has records** but **no foreign keys**:
+
+- First release: Remove the application code related to the table, such as models,
+controllers and services.
+- Second release: Use the `drop_table` method in your migration.
+
+```ruby
+def up
+  drop_table :my_table
+end
+
+def down
+  # create_table ...
+end
+```
+
+Table **has foreign keys**:
+
+- First release: Remove the application code related to the table, such as models,
+controllers, and services.
+- Second release: Remove the foreign keys using the `with_lock_retries`
+helper method. Use `drop_table` in another migration file.
+
+**Migrations for the second release:**
+
+Removing the foreign key on the `projects` table:
+
+```ruby
+# first migration file
+
+def up
+  with_lock_retries do
+    remove_foreign_key :my_table, :projects
+  end
+end
+
+def down
+  with_lock_retries do
+    add_foreign_key :my_table, :projects
+  end
+end
+```
+
+Dropping the table:
+
+```ruby
+# second migration file
+
+def up
+  drop_table :my_table
+end
+
+def down
+  # create_table ...
+end
+```
+
 ## Integer column type
 
 By default, an integer column can hold up to a 4-byte (32-bit) number. That is

doc/user/markdown.md

@@ -97,6 +97,7 @@ not found in standard Markdown:
 - [Math equations and symbols written in LaTeX](#math)
 - [Special GitLab references](#special-gitlab-references)
 - [Task Lists](#task-lists)
+- [Table of Contents](#table-of-contents)
 - [Wiki specific Markdown](#wiki-specific-markdown)
 
 It also has [extended Markdown features](#standard-markdown-and-extensions-in-gitlab), without
@@ -456,6 +457,17 @@ unordered or ordered lists:
    1. [ ] Sub-task 1
    1. [x] Sub-task 2
 
+### Table of Contents
+
+A table of contents can be added to a Markdown file, issue or merge request
+description, or a wiki page, by adding the tag `[[_TOC_]]` on its own line.
+It will be replaced with an unordered list that links to the various
+headers.
+
+```markdown
+[[_TOC_]]
+```
+
 ### Wiki-specific Markdown
 
 The following examples show how links inside wikis behave.

lib/gitlab/git/repository.rb

@@ -822,17 +822,6 @@ module Gitlab
         gitaly_repository_client.create_from_snapshot(url, auth)
       end
 
-      # DEPRECATED: https://gitlab.com/gitlab-org/gitaly/issues/1628
-      def rebase_deprecated(user, rebase_id, branch:, branch_sha:, remote_repository:, remote_branch:)
-        wrapped_gitaly_errors do
-          gitaly_operation_client.user_rebase(user, rebase_id,
-                                            branch: branch,
-                                            branch_sha: branch_sha,
-                                            remote_repository: remote_repository,
-                                            remote_branch: remote_branch)
-        end
-      end
-
       def rebase(user, rebase_id, branch:, branch_sha:, remote_repository:, remote_branch:, push_options: [], &block)
         wrapped_gitaly_errors do
           gitaly_operation_client.rebase(

package.json

@@ -146,9 +146,9 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.5.0",
-    "@gitlab/eslint-config": "^3.0.0",
+    "@gitlab/eslint-config": "^2.1.2",
     "@gitlab/eslint-plugin-i18n": "^1.1.0",
-    "@gitlab/eslint-plugin-vue-i18n": "^2.0.0",
+    "@gitlab/eslint-plugin-vue-i18n": "^1.2.0",
     "@vue/test-utils": "^1.0.0-beta.30",
     "axios-mock-adapter": "^1.15.0",
     "babel-jest": "^24.1.0",
@@ -159,10 +159,10 @@
     "commander": "^2.18.0",
     "custom-jquery-matchers": "^2.1.0",
     "docdash": "^1.0.2",
-    "eslint": "~6.8.0",
-    "eslint-import-resolver-jest": "^3.0.0",
-    "eslint-import-resolver-webpack": "^0.12.1",
-    "eslint-plugin-jasmine": "^4.1.0",
+    "eslint": "~5.9.0",
+    "eslint-import-resolver-jest": "^2.1.1",
+    "eslint-import-resolver-webpack": "^0.10.1",
+    "eslint-plugin-jasmine": "^2.10.1",
     "eslint-plugin-jest": "^22.3.0",
     "eslint-plugin-no-jquery": "^2.3.0",
     "gettext-extractor": "^3.4.3",

spec/frontend/.eslintrc.yml

@@ -6,12 +6,6 @@ plugins:
 extends:
   - 'plugin:jest/recommended'
 settings:
-  # We have to teach eslint-plugin-import what node modules we use
-  # otherwise there is an error when it tries to resolve them
-  import/core-modules:
-    - events
-    - fs
-    - path  
   import/resolver:
     jest:
       jestConfigFile: 'jest.config.js'

spec/frontend/gl_field_errors_spec.js

@@ -1,3 +1,5 @@
+/* eslint-disable arrow-body-style */
+
 import $ from 'jquery';
 import GlFieldErrors from '~/gl_field_errors';
 

spec/frontend/vue_shared/components/issue/issue_assignees_spec.js

@@ -18,7 +18,7 @@ describe('IssueAssigneesComponent', () => {
         ...props,
       },
     });
-    vm = wrapper.vm;
+    vm = wrapper.vm; // eslint-disable-line
   };
 
   const findTooltipText = () => wrapper.find('.js-assignee-tooltip').text();