From e55ef824f5da702b2e1e3edac0115ce5538927e9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 10 Oct 2022 12:10:24 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab-ci.yml | 1 + .../ci/package-and-test/main.gitlab-ci.yml | 2 + .../package-and-test/variables.gitlab-ci.yml | 1 + .gitlab/ci/rules.gitlab-ci.yml | 7 +++ GITALY_SERVER_VERSION | 2 +- Gemfile | 2 +- Gemfile.checksum | 2 +- Gemfile.lock | 4 +- .../notes/components/discussion_notes.vue | 2 +- app/assets/stylesheets/pages/notes.scss | 22 +++++++++ app/services/members/destroy_service.rb | 25 +++++++--- ...0220914130800_add_jitsu_key_to_projects.rb | 20 ++++++++ ...49_add_text_limit_to_projects_jitsu_key.rb | 13 ++++++ db/schema_migrations/20220914130800 | 1 + db/schema_migrations/20220914131449 | 1 + db/structure.sql | 2 + ...ights_example_stacked_bar_chart_v13_11.png | Bin 29784 -> 0 bytes ...sights_example_stacked_bar_chart_v15_4.png | Bin 0 -> 75321 bytes doc/user/group/insights/index.md | 44 ++++++++++++++---- doc/user/project/insights/index.md | 6 +-- doc/user/project/repository/push_rules.md | 9 ++++ lib/gitlab/github_import/client.rb | 2 +- locale/gitlab.pot | 6 +++ package.json | 2 +- spec/lib/gitlab/github_import/client_spec.rb | 4 +- spec/lib/gitlab/import_export/all_models.yml | 1 + spec/requests/api/project_attributes.yml | 1 + spec/services/members/destroy_service_spec.rb | 31 ++++++++++++ yarn.lock | 8 ++-- 29 files changed, 190 insertions(+), 31 deletions(-) create mode 100644 db/migrate/20220914130800_add_jitsu_key_to_projects.rb create mode 100644 db/migrate/20220914131449_add_text_limit_to_projects_jitsu_key.rb create mode 100644 db/schema_migrations/20220914130800 create mode 100644 db/schema_migrations/20220914131449 delete mode 100644 doc/user/group/insights/img/insights_example_stacked_bar_chart_v13_11.png create mode 100644 doc/user/group/insights/img/insights_example_stacked_bar_chart_v15_4.png diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1ed0298f23..b32df78d9df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,6 +54,7 @@ workflow: variables: RUBY_VERSION: "3.0" NOTIFY_PIPELINE_FAILURE_CHANNEL: "f_ruby3" + OMNIBUS_GITLAB_RUBY3_BUILD: "true" # For `$CI_DEFAULT_BRANCH` branch, create a pipeline (this includes on schedules, pushes, merges, etc.). - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' # For tags, create a pipeline. diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml index 50179a0fe48..82cb00b8d52 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -47,6 +47,7 @@ stages: echo "SECURITY_SOURCES=${SECURITY_SOURCES:-false}" > $BUILD_ENV echo "OMNIBUS_GITLAB_CACHE_UPDATE=${OMNIBUS_GITLAB_CACHE_UPDATE:-false}" >> $BUILD_ENV for version_file in *_VERSION; do echo "$version_file=$(cat $version_file)" >> $BUILD_ENV; done + echo "OMNIBUS_GITLAB_RUBY3_BUILD=${OMNIBUS_GITLAB_RUBY3_BUILD:-false}" >> $BUILD_ENV echo "Built environment file for omnibus build:" cat $BUILD_ENV artifacts: @@ -116,6 +117,7 @@ trigger-omnibus: TOP_UPSTREAM_SOURCE_PROJECT: $CI_PROJECT_PATH SECURITY_SOURCES: $SECURITY_SOURCES CACHE_UPDATE: $OMNIBUS_GITLAB_CACHE_UPDATE + RUBY3_BUILD: $OMNIBUS_GITLAB_RUBY3_BUILD SKIP_QA_DOCKER: "true" SKIP_QA_TEST: "true" ee: "true" diff --git a/.gitlab/ci/package-and-test/variables.gitlab-ci.yml b/.gitlab/ci/package-and-test/variables.gitlab-ci.yml index 324092c80f4..2694e830efd 100644 --- a/.gitlab/ci/package-and-test/variables.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/variables.gitlab-ci.yml @@ -4,6 +4,7 @@ variables: RELEASE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/build/omnibus-gitlab-mirror/gitlab-ee:${CI_COMMIT_SHA}" SKIP_REPORT_IN_ISSUES: "true" OMNIBUS_GITLAB_CACHE_UPDATE: "false" + OMNIBUS_GITLAB_RUBY3_BUILD: "false" QA_LOG_LEVEL: "info" QA_TESTS: "" QA_FEATURE_FLAGS: "" diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 51a862d5ed8..35909ca8637 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -130,6 +130,9 @@ .if-dot-com-gitlab-org-and-security-tag: &if-dot-com-gitlab-org-and-security-tag if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/security$)/ && $CI_COMMIT_TAG' +.if-ruby3-branch: &if-ruby3-branch + if: '$CI_COMMIT_BRANCH == "ruby3"' + # For Security merge requests, the gitlab-release-tools-bot triggers a new # pipeline for the "Pipelines for merged results" feature. If the pipeline # fails, we notify release managers. @@ -652,6 +655,7 @@ - <<: *if-default-branch-or-tag - <<: *if-dot-com-gitlab-org-schedule - <<: *if-force-ci + - <<: *if-ruby3-branch .build-images:rules:build-assets-image: rules: @@ -660,6 +664,7 @@ - <<: *if-merge-request-targeting-stable-branch - <<: *if-merge-request-labels-run-review-app - <<: *if-auto-deploy-branches + - <<: *if-ruby3-branch - changes: *ci-build-images-patterns - changes: *code-qa-patterns @@ -964,6 +969,7 @@ allow_failure: true - <<: *if-force-ci allow_failure: true + - <<: *if-ruby3-branch .qa:rules:package-and-test: rules: @@ -975,6 +981,7 @@ when: never - <<: *if-merge-request-targeting-stable-branch allow_failure: true + - <<: *if-ruby3-branch - <<: *if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-e2e changes: *feature-flag-development-config-patterns when: manual diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 2a791a2d96b..58a22384e63 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -1d200302f736b50b48bf7e9ec7eb28f0e01dc559 +e49ea29543b2d8e71bfe4bdc3b295f785bd24fb1 diff --git a/Gemfile b/Gemfile index 9fc1b73153c..b28b2f21f05 100644 --- a/Gemfile +++ b/Gemfile @@ -364,7 +364,7 @@ gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.1.1', require: false + gem 'lefthook', '~> 1.1.2', require: false gem 'rubocop' gem 'solargraph', '~> 0.47.2', require: false diff --git a/Gemfile.checksum b/Gemfile.checksum index c292b46bc81..e637d099405 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -299,7 +299,7 @@ {"name":"kramdown-parser-gfm","version":"1.1.0","platform":"ruby","checksum":"fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729"}, {"name":"kubeclient","version":"4.9.3","platform":"ruby","checksum":"d5d38e719fbac44f396851aa57cd1b9f4f7dab4410ab680ccd21c9b741230046"}, {"name":"launchy","version":"2.5.0","platform":"ruby","checksum":"954243c4255920982ce682f89a42e76372dba94770bf09c23a523e204bdebef5"}, -{"name":"lefthook","version":"1.1.1","platform":"ruby","checksum":"fa7dcd2c55dc14f6f164f96cf1404e712be84a2ac256e75947213093e080d05b"}, +{"name":"lefthook","version":"1.1.2","platform":"ruby","checksum":"fdbe2a62faf6ae2a9f9be64e105ca8f06c527c5ba9a3edb2cdcf024025227897"}, {"name":"letter_opener","version":"1.7.0","platform":"ruby","checksum":"095bc0d58e006e5b43ea7d219e64ecf2de8d1f7d9dafc432040a845cf59b4725"}, {"name":"letter_opener_web","version":"2.0.0","platform":"ruby","checksum":"33860ad41e1785d75456500e8ca8bba8ed71ee6eaf08a98d06bbab67c5577b6f"}, {"name":"libyajl2","version":"1.2.0","platform":"ruby","checksum":"1117cd1e48db013b626e36269bbf1cef210538ca6d2e62d3fa3db9ded005b258"}, diff --git a/Gemfile.lock b/Gemfile.lock index 395e3f4b1b8..8fe6f11c087 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -802,7 +802,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.1.1) + lefthook (1.1.2) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -1673,7 +1673,7 @@ DEPENDENCIES knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.9.3) - lefthook (~> 1.1.1) + lefthook (~> 1.1.2) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) diff --git a/app/assets/javascripts/notes/components/discussion_notes.vue b/app/assets/javascripts/notes/components/discussion_notes.vue index 00ed7f0291b..2dbc9b10836 100644 --- a/app/assets/javascripts/notes/components/discussion_notes.vue +++ b/app/assets/javascripts/notes/components/discussion_notes.vue @@ -142,7 +142,7 @@ export default { :edited-at="discussion.resolved_at" :edited-by="discussion.resolved_by" :action-text="resolvedText" - class-name="discussion-headline-light js-discussion-headline discussion-resolved-text gl-mb-2" + class-name="discussion-headline-light js-discussion-headline discussion-resolved-text gl-mb-2 gl-ml-3" />