From e44a58a0906c568cc144b847318efc4ef822b8b4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 20 Oct 2020 21:09:41 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo.yml | 3 --- GITALY_SERVER_VERSION | 2 +- GITLAB_SHELL_VERSION | 2 +- .../update-gitlab-shell-13-11-0.yml | 5 ++++ .../development/invite_email_experiment.yml | 7 ------ doc/development/background_migrations.md | 24 ++++++++++++++++++- package.json | 2 +- scripts/review_apps/review-apps.sh | 2 +- spec/factories/resource_label_events.rb | 2 +- spec/factories/resource_milestone_event.rb | 4 ++-- spec/factories/resource_state_event.rb | 4 ++-- yarn.lock | 8 +++---- 12 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 changelogs/unreleased/update-gitlab-shell-13-11-0.yml delete mode 100644 config/feature_flags/development/invite_email_experiment.yml diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 0e1a24b9204..ab5047096f3 100644 --- a/.rubocop_todo.yml +++ b/.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' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 6ebe641f7d7..12d13315ca4 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -60aaf7cdd17b4efdf4dab23eb83aa86fe596a55b +dac25a9c19af0a168a7927784295dd12fb5c8075 diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index c554e7e8652..fbda4b8d751 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -13.10.0 +13.11.0 diff --git a/changelogs/unreleased/update-gitlab-shell-13-11-0.yml b/changelogs/unreleased/update-gitlab-shell-13-11-0.yml new file mode 100644 index 00000000000..53dbd63b8cb --- /dev/null +++ b/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 diff --git a/config/feature_flags/development/invite_email_experiment.yml b/config/feature_flags/development/invite_email_experiment.yml deleted file mode 100644 index 496f096f7c7..00000000000 --- a/config/feature_flags/development/invite_email_experiment.yml +++ /dev/null @@ -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 diff --git a/doc/development/background_migrations.md b/doc/development/background_migrations.md index e5cc2ae4d1d..86a2aed5ea1 100644 --- a/doc/development/background_migrations.md +++ b/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 + ``` diff --git a/package.json b/package.json index c10d9d7a0d1..4c53af14609 100644 --- a/package.json +++ b/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", diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index b8cbe625e5b..59e7d183ae7 100755 --- a/scripts/review_apps/review-apps.sh +++ b/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 } diff --git a/spec/factories/resource_label_events.rb b/spec/factories/resource_label_events.rb index b59da465fc3..35c732fed0f 100644 --- a/spec/factories/resource_label_events.rb +++ b/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 diff --git a/spec/factories/resource_milestone_event.rb b/spec/factories/resource_milestone_event.rb index 86c54f2be68..a3944e013da 100644 --- a/spec/factories/resource_milestone_event.rb +++ b/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 diff --git a/spec/factories/resource_state_event.rb b/spec/factories/resource_state_event.rb index e3de462b797..926c6dd8cbc 100644 --- a/spec/factories/resource_state_event.rb +++ b/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 diff --git a/yarn.lock b/yarn.lock index f8f8709a506..000d22f6bc6 100644 --- a/yarn.lock +++ b/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"