Add latest changes from gitlab-org/gitlab@master

.rubocop_todo.yml

@@ -1323,9 +1323,6 @@ FactoryBot/InlineAssociation:
     - 'spec/factories/notes.rb'
     - 'spec/factories/packages.rb'
     - 'spec/factories/packages/package_file.rb'
-    - 'spec/factories/resource_label_events.rb'
-    - 'spec/factories/resource_milestone_event.rb'
-    - 'spec/factories/resource_state_event.rb'
     - 'spec/factories/sent_notifications.rb'
     - 'spec/factories/serverless/domain.rb'
     - 'spec/factories/serverless/domain_cluster.rb'

GITALY_SERVER_VERSION

@@ -1 +1 @@
-60aaf7cdd17b4efdf4dab23eb83aa86fe596a55b
+dac25a9c19af0a168a7927784295dd12fb5c8075

GITLAB_SHELL_VERSION

@@ -1 +1 @@
-13.10.0
+13.11.0

changelogs/unreleased/update-gitlab-shell-13-11-0.yml

@@ -0,0 +1,5 @@
+---
+title: Update GitLab Shell to v13.11.0
+merge_request: 45660
+author:
+type: other

config/feature_flags/development/invite_email_experiment.yml

@@ -1,7 +0,0 @@
----
-name: invite_email_experiment
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39628
-rollout_issue_url:
-group: group::acquisition
-type: development
-default_enabled: false

doc/development/background_migrations.md

@@ -343,10 +343,32 @@ for more details.
 1. Make sure that tests you write are not false positives.
 1. Make sure that if the data being migrated is critical and cannot be lost, the
    clean-up migration also checks the final state of the data before completing.
-1. Make sure to know how much time it'll take to run all scheduled migrations.
 1. When migrating many columns, make sure it won't generate too many
    dead tuples in the process (you may need to directly query the number of dead tuples
    and adjust the scheduling according to this piece of data).
 1. Make sure to discuss the numbers with a database specialist, the migration may add
    more pressure on DB than you expect (measure on staging,
    or ask someone to measure on production).
+1. Make sure to know how much time it'll take to run all scheduled migrations.
+1. Provide an estimation section in the description, explaining timings from the
+   linked query plans and batches as described in the migration.
+
+   For example, assuming a migration that deletes data, include information similar to
+   the following section:
+
+   ```ruby
+   Background Migration Details:
+
+   47600 items to delete
+   batch size = 1000
+   47600 / 1000 = 48 loops
+
+   Estimated times per batch:
+   - 900ms for select statement with 1000 items
+   - 2100ms for delete statement with 1000 items
+   Total: ~3sec per batch
+
+   2 mins delay per loop (safe for the given total time per batch)
+
+   48 * ( 120 + 3)  = ~98.4 mins to run all the scheduled jobs
+   ```

package.json

@@ -43,7 +43,7 @@
     "@babel/preset-env": "^7.10.1",
     "@gitlab/at.js": "1.5.5",
     "@gitlab/svgs": "1.171.0",
-    "@gitlab/ui": "21.34.1",
+    "@gitlab/ui": "21.34.2",
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "^6.0.3-3",
     "@rails/ujs": "^6.0.3-2",

scripts/review_apps/review-apps.sh

@@ -75,7 +75,7 @@ function kubectl_cleanup_release() {
   kubectl --namespace "${namespace}" get ingress,svc,pdb,hpa,deploy,statefulset,job,pod,secret,configmap,pvc,clusterrole,clusterrolebinding,role,rolebinding,sa,crd 2>&1 \
     | grep "${release}" \
     | awk '{print $1}' \
-    | xargs kubectl --namespace "${namespace}" delete \
+    | xargs kubectl --namespace "${namespace}" delete --ignore-not-found \
     || true
 }
 

spec/factories/resource_label_events.rb

@@ -4,7 +4,7 @@ FactoryBot.define do
   factory :resource_label_event do
     action { :add }
     label
-    user { issuable&.author || create(:user) }
+    user { issuable&.author || association(:user) }
 
     after(:build) do |event, evaluator|
       event.issue = create(:issue) unless event.issuable

spec/factories/resource_milestone_event.rb

@@ -2,11 +2,11 @@
 
 FactoryBot.define do
   factory :resource_milestone_event do
-    issue { merge_request.nil? ? create(:issue) : nil }
+    issue { merge_request.nil? ? association(:issue) : nil }
     merge_request { nil }
     milestone
     action { :add }
     state { :opened }
-    user { issue&.author || merge_request&.author || create(:user) }
+    user { issue&.author || merge_request&.author || association(:user) }
   end
 end

spec/factories/resource_state_event.rb

@@ -2,9 +2,9 @@
 
 FactoryBot.define do
   factory :resource_state_event do
-    issue { merge_request.nil? ? create(:issue) : nil }
+    issue { merge_request.nil? ? association(:issue) : nil }
     merge_request { nil }
     state { :opened }
-    user { issue&.author || merge_request&.author || create(:user) }
+    user { issue&.author || merge_request&.author || association(:user) }
   end
 end

yarn.lock

@@ -866,10 +866,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.171.0.tgz#abc3092bf804f0898301626130e0f3231834924a"
   integrity sha512-TPfdqIxQDda+0CQHhb9XdF50lmqDmADu6yT8R4oZi6BoUtWLdiHbyFt+RnVU6t7EmjIKicNAii7Ga+f2ljCfUA==
 
-"@gitlab/ui@21.34.1":
-  version "21.34.1"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.34.1.tgz#50c21bb751e88c12a5c7491d3c980a239a0dbbc3"
-  integrity sha512-S60A7vZcc9ZcXJrT6lCOUbzbPo+Yzx3HOaSIq335iee9DED5WMVCCYvbjm7f7Rn3CoTmDAVC4akNVTzhiuyQYQ==
+"@gitlab/ui@21.34.2":
+  version "21.34.2"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.34.2.tgz#900d4cc4bc09ce948f81b2792a02410298773069"
+  integrity sha512-SBHMgcZGsNLMuE6wVvdEZ6EofqT9e1eqxcn9sVuHX5P6/TlFH+76PMpQ7ar/QIsmiWgl77VivyVQLZGSCi0nKQ==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.3.0"