.eslintrc.yml

@@ -122,6 +122,8 @@ overrides:
     rules:
       '@gitlab/require-i18n-strings': off
       '@gitlab/no-runtime-template-compiler': off
+      'import/no-dynamic-require': off
+      'no-import-assign': off
       'no-restricted-syntax':
         - error
         - selector: CallExpression[callee.object.name=/(wrapper|vm)/][callee.property.name="setData"]

.gitlab/ci/rules.gitlab-ci.yml

@@ -1495,6 +1495,18 @@
       changes: ["vendor/gems/mail-smtp_pool/**/*"]
     - <<: *if-merge-request-labels-run-all-rspec
 
+.vendor:rules:ipynbdiff:
+  rules:
+    - <<: *if-merge-request
+      changes: ["vendor/gems/ipynbdiff/**/*"]
+    - <<: *if-merge-request-labels-run-all-rspec
+
+.vendor:rules:omniauth-gitlab:
+  rules:
+    - <<: *if-merge-request
+      changes: ["vendor/gems/omniauth-gitlab/**/*"]
+    - <<: *if-merge-request-labels-run-all-rspec
+
 ##################
 # Releases rules #
 ##################

.gitlab/ci/vendored-gems.gitlab-ci.yml

@@ -5,3 +5,19 @@ vendor mail-smtp_pool:
   trigger:
     include: vendor/gems/mail-smtp_pool/.gitlab-ci.yml
     strategy: depend
+
+vendor ipynbdiff:
+  extends:
+    - .vendor:rules:ipynbdiff
+  needs: []
+  trigger:
+    include: vendor/gems/ipynbdiff/.gitlab-ci.yml
+    strategy: depend
+
+vendor omniauth-gitlab:
+  extends:
+    - .vendor:rules:omniauth-gitlab
+  needs: []
+  trigger:
+    include: vendor/gems/omniauth-gitlab/.gitlab-ci.yml
+    strategy: depend

.gitlab/merge_request_templates/New End To End Test.md

@@ -10,7 +10,10 @@ Please link to the respective test case in the testcases project
 - [ ] Note if the test is intended to run in specific scenarios. If a scenario is new, add a link to the MR that adds the new scenario.
 - [ ] Follow the end-to-end tests [style guide](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/style_guide.html) and [best practices](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/best_practices.html).
 - [ ] Use the appropriate [RSpec metadata tag(s)](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/rspec_metadata_tests.html#rspec-metadata-for-end-to-end-tests).
-- [ ] Ensure that a created resource is removed after test execution. A `Group` resource can be shared between multiple tests. Do not remove it unless it has a unique path. Note that we have a cleanup job that periodically removes groups under `gitlab-qa-sandbox-group`.
+- Most resources will be cleaned up via the general [cleanup task](https://gitlab.com/gitlab-org/gitlab/-/blob/44345381e89d6bbd440f7b4c680d03e8b75b86de/qa/qa/tools/test_resources_handler.rb#L44). Check that is successful, or ensure resources are cleaned up in the test:
+  - [ ] New resources have `api_get_path` and `api_delete_path` implemented if possible.
+  - [ ] If any resource cannot be deleted in the general delete task, make sure it is [ignored](https://gitlab.com/gitlab-org/gitlab/-/blob/44345381e89d6bbd440f7b4c680d03e8b75b86de/qa/qa/tools/test_resources_handler.rb#L29).
+  - [ ] If any resource cannot be deleted in the general delete task, remove it in the test (e.g., in an `after` block).
 - [ ] Ensure that no [transient bugs](https://about.gitlab.com/handbook/engineering/quality/issue-triage/#transient-bugs) are hidden accidentally due to the usage of `waits` and `reloads`.
 - [ ] Verify the tags to ensure it runs on the desired test environments.
 - [ ] If this MR has a dependency on another MR, such as a GitLab QA MR, specify the order in which the MRs should be merged.

.rubocop_todo/gitlab/delegate_predicate_methods.yml

@@ -2,5 +2,4 @@
 Gitlab/DelegatePredicateMethods:
   Exclude:
   - app/models/clusters/cluster.rb
-  - app/models/project.rb
   - ee/app/models/concerns/ee/ci/metadatable.rb

.rubocop_todo/gitlab/namespaced_class.yml

@@ -1105,11 +1105,6 @@ Gitlab/NamespacedClass:
     - 'lib/carrier_wave_string_file.rb'
     - 'lib/csv_builder.rb'
     - 'lib/event_filter.rb'
-    - 'lib/feature.rb'
-    - 'lib/feature/definition.rb'
-    - 'lib/feature/gitaly.rb'
-    - 'lib/feature/logger.rb'
-    - 'lib/feature/shared.rb'
     - 'lib/file_size_validator.rb'
     - 'lib/forever.rb'
     - 'lib/generators/gitlab/snowplow_event_definition_generator.rb'

.rubocop_todo/layout/line_length.yml

@@ -88,7 +88,6 @@ Layout/LineLength:
     - 'app/controllers/projects/issues_controller.rb'
     - 'app/controllers/projects/jobs_controller.rb'
     - 'app/controllers/projects/labels_controller.rb'
-    - 'app/controllers/projects/logs_controller.rb'
     - 'app/controllers/projects/merge_requests/conflicts_controller.rb'
     - 'app/controllers/projects/merge_requests/creations_controller.rb'
     - 'app/controllers/projects/merge_requests/diffs_controller.rb'
@@ -696,8 +695,6 @@ Layout/LineLength:
     - 'app/services/pages/migrate_legacy_storage_to_deployment_service.rb'
     - 'app/services/personal_access_tokens/create_service.rb'
     - 'app/services/personal_access_tokens/revoke_service.rb'
-    - 'app/services/pod_logs/elasticsearch_service.rb'
-    - 'app/services/pod_logs/kubernetes_service.rb'
     - 'app/services/projects/branches_by_mode_service.rb'
     - 'app/services/projects/container_repository/cleanup_tags_service.rb'
     - 'app/services/projects/container_repository/gitlab/delete_tags_service.rb'
@@ -1960,7 +1957,6 @@ Layout/LineLength:
     - 'ee/spec/features/groups/iterations/user_edits_iteration_spec.rb'
     - 'ee/spec/features/groups/iterations/user_views_iteration_cadence_spec.rb'
     - 'ee/spec/features/groups/iterations/user_views_iteration_spec.rb'
-    - 'ee/spec/features/groups/members/manage_groups_spec.rb'
     - 'ee/spec/features/groups/members/manage_members_spec.rb'
     - 'ee/spec/features/groups/members/override_ldap_memberships_spec.rb'
     - 'ee/spec/features/groups/saml_providers_spec.rb'
@@ -3485,7 +3481,6 @@ Layout/LineLength:
     - 'lib/gitlab/diff/highlight_cache.rb'
     - 'lib/gitlab/diff/parser.rb'
     - 'lib/gitlab/diff/rendered/notebook/diff_file.rb'
-    - 'lib/gitlab/elasticsearch/logs/lines.rb'
     - 'lib/gitlab/email/failure_handler.rb'
     - 'lib/gitlab/email/handler/create_issue_handler.rb'
     - 'lib/gitlab/email/handler/create_merge_request_handler.rb'
@@ -5007,7 +5002,6 @@ Layout/LineLength:
     - 'spec/lib/gitlab/diff/position_tracer/image_strategy_spec.rb'
     - 'spec/lib/gitlab/diff/position_tracer/line_strategy_spec.rb'
     - 'spec/lib/gitlab/diff/suggestion_spec.rb'
-    - 'spec/lib/gitlab/elasticsearch/logs/lines_spec.rb'
     - 'spec/lib/gitlab/email/failure_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/create_issue_handler_spec.rb'
     - 'spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb'
@@ -6090,8 +6084,6 @@ Layout/LineLength:
     - 'spec/services/pages/migrate_legacy_storage_to_deployment_service_spec.rb'
     - 'spec/services/personal_access_tokens/create_service_spec.rb'
     - 'spec/services/personal_access_tokens/revoke_service_spec.rb'
-    - 'spec/services/pod_logs/elasticsearch_service_spec.rb'
-    - 'spec/services/pod_logs/kubernetes_service_spec.rb'
     - 'spec/services/post_receive_service_spec.rb'
     - 'spec/services/projects/apple_target_platform_detector_service_spec.rb'
     - 'spec/services/projects/autocomplete_service_spec.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -1471,7 +1471,6 @@ RSpec/ContextWording:
     - 'spec/features/ics/project_issues_spec.rb'
     - 'spec/features/ide/clientside_preview_csp_spec.rb'
     - 'spec/features/ide/static_object_external_storage_csp_spec.rb'
-    - 'spec/features/incidents/incident_details_spec.rb'
     - 'spec/features/incidents/user_creates_new_incident_spec.rb'
     - 'spec/features/invites_spec.rb'
     - 'spec/features/issuables/markdown_references/internal_references_spec.rb'

.rubocop_todo/rspec/repeated_example_group_body.yml

@@ -23,7 +23,6 @@ RSpec/RepeatedExampleGroupBody:
     - 'spec/controllers/projects/blob_controller_spec.rb'
     - 'spec/controllers/projects/graphs_controller_spec.rb'
     - 'spec/controllers/projects/registry/repositories_controller_spec.rb'
-    - 'spec/features/incidents/incident_details_spec.rb'
     - 'spec/features/issues/spam_akismet_issue_creation_spec.rb'
     - 'spec/features/merge_request/user_sees_closing_issues_message_spec.rb'
     - 'spec/features/projects/commit/cherry_pick_spec.rb'

.stylelintrc

@@ -7,12 +7,5 @@
      "app/assets/stylesheets/lazy_bundles/select2.scss",
      "app/assets/stylesheets/highlight/themes/*.scss",
      "app/assets/stylesheets/lazy_bundles/cropper.css"
-   ],
-   "plugins":[
-      "./scripts/frontend/stylelint/stylelint_duplicate_selectors.js",
-      "./scripts/frontend/stylelint/stylelint_utility_classes.js",
-   ],
-   "rules":{
-      "stylelint-gitlab/utility-classes":[true,{ "severity": "warning" }],
-   }
+   ]
 }

CHANGELOG.md

@@ -2,6 +2,27 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
+## 15.1.1 (2022-06-30)
+
+### Security (16 changes)
+
+- [Fix group IP restrictions not enforced for container registry requests](gitlab-org/security/gitlab@0c9628791bf383734ec8f32e1d0040ca2fd62178) ([merge request](gitlab-org/security/gitlab!2550))
+- [Gitlab Runner version upgrade](gitlab-org/security/gitlab@b7e06c1e812fdf0a2fab4aca07cdea33ff22b41c) ([merge request](gitlab-org/security/gitlab!2564))
+- [Update ProjectAttributesTransformer to use fixed number of attributes](gitlab-org/security/gitlab@fae2720ffd7ec5ce3eb88e3b68b2879f4f664cf4) ([merge request](gitlab-org/security/gitlab!2547))
+- [Escape deploy key title to prevent XSS](gitlab-org/security/gitlab@071c3fa4ae63d03117a3c02752711d29f6f620b1) ([merge request](gitlab-org/security/gitlab!2492))
+- [Sanitize ZenTao breadcrumb links](gitlab-org/security/gitlab@5b16b65cfe57a946f25842b7818dafe6c8a934ea) ([merge request](gitlab-org/security/gitlab!2555))
+- [Fix permissions in the project labels API](gitlab-org/security/gitlab@b3ff7ee5a64382ff9ee34bc3fc44acd0117f86d9) ([merge request](gitlab-org/security/gitlab!2532))
+- [Security fix sentry issue leaks and access level check](gitlab-org/security/gitlab@a0ad79588f170e1c58206e42d8b550d75e874a4d) ([merge request](gitlab-org/security/gitlab!2531))
+- [Check permissions before exposing user two factor enabled](gitlab-org/security/gitlab@3b7c699ffcca64721c0876da12435c148f8e83a7) ([merge request](gitlab-org/security/gitlab!2530))
+- [Filter milestone release by user access](gitlab-org/security/gitlab@dc79edc16c7422279235d2ad8a4807644840fc4c) ([merge request](gitlab-org/security/gitlab!2535))
+- [Fix the required access level in the Conan packages finder](gitlab-org/security/gitlab@5221ca59f09361f90798348851fa12c91e5d9e35) ([merge request](gitlab-org/security/gitlab!2513))
+- [Allow inviting only groups with subset of allowed domains to groups](gitlab-org/security/gitlab@03dfb153355d0465ea25a6d73db895c975fc32df) ([merge request](gitlab-org/security/gitlab!2538))
+- [Fix open redirect vulnerability](gitlab-org/security/gitlab@eb52b11c7b29319d16e21feec97bafbdf0f3c3e5) ([merge request](gitlab-org/security/gitlab!2542))
+- [Adds a filter based on user access to Runner jobs endpoint](gitlab-org/security/gitlab@a35c6aa42c35da96bf1df263b4a3aa1fe38af75d) ([merge request](gitlab-org/security/gitlab!2508))
+- [Prevent runners from picking IP restricted jobs](gitlab-org/security/gitlab@9d6f0da89f6d2e8f3c7fbccea0d22fc6b17e0305) ([merge request](gitlab-org/security/gitlab!2505))
+- [Restrict CI lint access to pipeline creators](gitlab-org/security/gitlab@bf15e9ceddf4b30105103defa50dd4a9094ac246) ([merge request](gitlab-org/security/gitlab!2516))
+- [Catch endless headers when reading HTTP responses](gitlab-org/security/gitlab@d9a6ca9aa36cfd6dd916be2d4f1e8e25329ecc73) ([merge request](gitlab-org/security/gitlab!2527))
+
 ## 15.1.0 (2022-06-21)
 ### Added (147 changes)
@@ -963,6 +984,28 @@ entry.
 - [Fix JH skipped subscription portal spec](gitlab-org/gitlab@0e7e7cb4a62d004989c47fafe6fe1f9ffd90da44) by @chaomao ([merge request](gitlab-org/gitlab!87213))
 - [Add not null constraint to requirements.issue_id validate:false](gitlab-org/gitlab@5ccac890b13c53c5761ccb8e5cb7ca202e0656c3) ([merge request](gitlab-org/gitlab!86590))
+## 15.0.4 (2022-06-30)
+
+### Security (17 changes)
+
+- [Fix group IP restrictions not enforced for container registry requests](gitlab-org/security/gitlab@7dea5867ea5e115a3a91576fec91de8e7f2a9915) ([merge request](gitlab-org/security/gitlab!2551))
+- [Update rack gem to version 2.2.3.1](gitlab-org/security/gitlab@c0df8beef0297e9b99b954fcdcbf07cee3f0e9d6) ([merge request](gitlab-org/security/gitlab!2553))
+- [Gitlab Runner version upgrade](gitlab-org/security/gitlab@012ff20c80754ff9ac38b82894346a51aa0a9b4c) ([merge request](gitlab-org/security/gitlab!2566))
+- [Update ProjectAttributesTransformer to use fixed number of attributes](gitlab-org/security/gitlab@619d77865f3e61f3cfb6ca92011ded44f6baf0ad) ([merge request](gitlab-org/security/gitlab!2548))
+- [Escape deploy key title to prevent XSS](gitlab-org/security/gitlab@7b1a458df5c553d6fa99b4fec0d677c9e924ad86) ([merge request](gitlab-org/security/gitlab!2493))
+- [Sanitize ZenTao breadcrumb links](gitlab-org/security/gitlab@adb8b2829e3d6b69ea32a7524c6f772be1debf82) ([merge request](gitlab-org/security/gitlab!2556))
+- [Fix permissions in the project labels API](gitlab-org/security/gitlab@4fd766e90ea6e8899897d7b7d9551b2edb5dce9a) ([merge request](gitlab-org/security/gitlab!2533))
+- [Security fix sentry issue leaks and access level check](gitlab-org/security/gitlab@d43b2c600a5fc31592eb8f07a4fcfdf3141911f7) ([merge request](gitlab-org/security/gitlab!2500))
+- [Check permissions before exposing user two factor enabled](gitlab-org/security/gitlab@aac30c9f3228efd643d3fc204ee49f740f1ebc81) ([merge request](gitlab-org/security/gitlab!2524))
+- [Filter milestone release by user access](gitlab-org/security/gitlab@aa1b76b8eb2966463c8a10869e00f3320bf4ea1a) ([merge request](gitlab-org/security/gitlab!2536))
+- [Fix the required access level in the Conan packages finder](gitlab-org/security/gitlab@fa090cd9d2adab46c6c3f2a70b351a61847b5c6c) ([merge request](gitlab-org/security/gitlab!2482))
+- [Allow inviting only groups with subset of allowed domains to groups](gitlab-org/security/gitlab@981be1afc7c6bf8f699ced1ae930b201699e29e3) ([merge request](gitlab-org/security/gitlab!2511))
+- [Fix open redirect vulnerability](gitlab-org/security/gitlab@fa9cf0a41f338e285701db231316897d362ce306) ([merge request](gitlab-org/security/gitlab!2541))
+- [Adds a filter based on user access to Runner jobs endpoint](gitlab-org/security/gitlab@8be3da271d2a6ff3285846c50a5ce4dd584419ff) ([merge request](gitlab-org/security/gitlab!2496))
+- [Prevent runners from picking IP restricted jobs](gitlab-org/security/gitlab@dcc830d14cc0ee616dc3ad263d66bd42f92b56a2) ([merge request](gitlab-org/security/gitlab!2504))
+- [Restrict CI lint access to pipeline creators](gitlab-org/security/gitlab@42425cd68755c53ed33952111be9803ce3b37515) ([merge request](gitlab-org/security/gitlab!2514))
+- [Catch endless headers when reading HTTP responses](gitlab-org/security/gitlab@d2ce0a236204b97a853bc35332d49d7427f38fbc) ([merge request](gitlab-org/security/gitlab!2528))
+
 ## 15.0.3 (2022-06-16)
 ### Fixed (2 changes)
@@ -1737,6 +1780,28 @@ entry.
 - [Move methods to build email unsubscribe link to helper](gitlab-org/gitlab@ae4391a84d14d51ca5b5f2ffaada96e3b37a1d51) ([merge request](gitlab-org/gitlab!84696)) **GitLab Enterprise Edition**
 - [Deprecate `push_rules_supersede_code_owners` feature flag](gitlab-org/gitlab@9ee99872b66a69c5a2d1c1c9863d960832a1d91f) ([merge request](gitlab-org/gitlab!85390))
+## 14.10.5 (2022-06-30)
+
+### Security (17 changes)
+
+- [Fix group IP restrictions not enforced for container registry requests](gitlab-org/security/gitlab@b146ad7b8c6fba9d3c5bea365ff8afd49949dcb0) ([merge request](gitlab-org/security/gitlab!2552))
+- [Update rack gem to version 2.2.3.1](gitlab-org/security/gitlab@09ebb50ceee5a2226c1f70fa1d6c25391d51dda6) ([merge request](gitlab-org/security/gitlab!2554))
+- [Gitlab Runner version upgrade](gitlab-org/security/gitlab@c91bfdb4f96e70e377a84b99c4edaa2fdecb8e16) ([merge request](gitlab-org/security/gitlab!2567))
+- [Update ProjectAttributesTransformer to use fixed number of attributes](gitlab-org/security/gitlab@6f892fb2a4b84473c3796533551f915c16cf77d9) ([merge request](gitlab-org/security/gitlab!2549))
+- [Escape deploy key title to prevent XSS](gitlab-org/security/gitlab@153a7c447e03a509b7f06ac7381f4f9db414c9ea) ([merge request](gitlab-org/security/gitlab!2494))
+- [Sanitize ZenTao breadcrumb links](gitlab-org/security/gitlab@530c7be82ae90138898ff99008d994b1c85d8cf1) ([merge request](gitlab-org/security/gitlab!2557))
+- [Fix permissions in the project labels API](gitlab-org/security/gitlab@f2c71f64c258bef9f56f4892d11a4dbf20d668e6) ([merge request](gitlab-org/security/gitlab!2534))
+- [Security fix sentry issue leaks and access level check](gitlab-org/security/gitlab@c644d94f58e30e1a9d87521b039a347412f0fead) ([merge request](gitlab-org/security/gitlab!2501))
+- [Check permissions before exposing user two factor enabled](gitlab-org/security/gitlab@8a623e8a4fdbd3421ac3ae0e37e156b7d3b04970) ([merge request](gitlab-org/security/gitlab!2525))
+- [Filter milestone release by user access](gitlab-org/security/gitlab@d7d6431a52808107a71f15d29e856eef2cb313e5) ([merge request](gitlab-org/security/gitlab!2537))
+- [Fix the required access level in the Conan packages finder](gitlab-org/security/gitlab@756fb242c4d6acf6cfd95fa39f37410eaf009747) ([merge request](gitlab-org/security/gitlab!2485))
+- [Allow inviting only groups with subset of allowed domains to groups](gitlab-org/security/gitlab@ca50492a32a2e367b0bc75dae0f91dc52d23b2ed) ([merge request](gitlab-org/security/gitlab!2512))
+- [Fix open redirect vulnerability](gitlab-org/security/gitlab@1450068a44d67af3cbe09fedcc4b1e9b4ea2e586) ([merge request](gitlab-org/security/gitlab!2540))
+- [Adds a filter based on user access to Runner jobs endpoint](gitlab-org/security/gitlab@dafaf3e50e8b1a18ff362cbb60e9482c9d60fc33) ([merge request](gitlab-org/security/gitlab!2497))
+- [Prevent runners from picking IP restricted jobs](gitlab-org/security/gitlab@0fad0cdde00b68c2a0f19ffa2681b438fcad4097) ([merge request](gitlab-org/security/gitlab!2503))
+- [Restrict CI lint access to pipeline creators](gitlab-org/security/gitlab@c5b79e969f10e3604eff16a9edef716e700cd201) ([merge request](gitlab-org/security/gitlab!2515))
+- [Catch endless headers when reading HTTP responses](gitlab-org/security/gitlab@65379002bd7a0259c425455c937b110bd96096dc) ([merge request](gitlab-org/security/gitlab!2529))
+
 ## 14.10.4 (2022-06-01)
 ### Security (7 changes)

GITALY_SERVER_VERSION

-2b069d8536df98547acba92719b7554d1c7f2262
+0c72a4ba3de2125098d72fce52b99df3d4ad5475

Gemfile

@@ -44,7 +44,7 @@ gem 'omniauth-dingtalk-oauth2', '~> 1.0'
 gem 'omniauth-alicloud', '~> 1.0.1'
 gem 'omniauth-facebook', '~> 4.0.0'
 gem 'omniauth-github', '~> 1.4'
-gem 'omniauth-gitlab', '~> 1.0.2'
+gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
 gem 'omniauth-google-oauth2', '~> 0.6.0'
 gem 'omniauth-oauth2-generic', '~> 0.2.2'
 gem 'omniauth-saml', '~> 1.10'
@@ -407,7 +407,7 @@ group :development, :test do
 end
 
 group :development, :test, :danger do
-  gem 'gitlab-dangerfiles', '~> 3.4.1', require: false
+  gem 'gitlab-dangerfiles', '~> 3.4.2', require: false
 end
 
 group :development, :test, :coverage do
@@ -466,7 +466,7 @@ gem 'benchmark-memory', '~> 0.1', require: false
 gem 'activerecord-explain-analyze', '~> 0.1', require: false
 
 # OAuth
-gem 'oauth2', '~> 1.4'
+gem 'oauth2', '~> 2.0'
 
 # Health check
 gem 'health_check', '~> 3.0'
@@ -546,6 +546,10 @@ gem 'ipaddress', '~> 0.8.3'
 
 gem 'parslet', '~> 1.8'
 
-gem 'ipynbdiff', '0.4.7'
+gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff'
 
 gem 'ed25519', '~> 1.3.0'
+
+# Error Tracking OpenAPI client
+# See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature
+gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api'

Gemfile.lock

+PATH
+  remote: vendor/gems/error_tracking_open_api
+  specs:
+    error_tracking_open_api (1.0.0)
+      typhoeus (~> 1.0, >= 1.0.1)
+
+PATH
+  remote: vendor/gems/ipynbdiff
+  specs:
+    ipynbdiff (0.4.7)
+      diffy (~> 3.3)
+      json (~> 2.5, >= 2.5.1)
+
 PATH
   remote: vendor/gems/mail-smtp_pool
   specs:
@@ -5,6 +18,13 @@ PATH
       connection_pool (~> 2.0)
       mail (~> 2.7)
 
+PATH
+  remote: vendor/gems/omniauth-gitlab
+  specs:
+    omniauth-gitlab (4.0.0)
+      omniauth (~> 1.0)
+      omniauth-oauth2 (~> 1.7.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -475,7 +495,7 @@ GEM
       terminal-table (~> 1.5, >= 1.5.1)
     gitlab-chronic (0.10.5)
       numerizer (~> 0.2)
-    gitlab-dangerfiles (3.4.1)
+    gitlab-dangerfiles (3.4.2)
       danger (>= 8.4.5)
       danger-gitlab (>= 8.0.0)
       rake
@@ -667,9 +687,6 @@ GEM
     invisible_captcha (1.1.0)
       rails (>= 4.2)
     ipaddress (0.8.3)
-    ipynbdiff (0.4.7)
-      diffy (~> 3.3)
-      json (~> 2.5, >= 2.5.1)
     jaeger-client (1.1.0)
       opentracing (~> 0.3)
       thrift
@@ -815,12 +832,13 @@ GEM
       shellany (~> 0.0)
     numerizer (0.2.0)
     oauth (0.5.6)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (2.0.3)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
+      rash_alt (>= 0.4, < 1)
+      version_gem (~> 1.0)
     octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -868,9 +886,6 @@ GEM
     omniauth-github (1.4.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-gitlab (1.0.3)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.0)
     omniauth-google-oauth2 (0.6.0)
       jwt (>= 2.0)
       omniauth (>= 1.1.1)
@@ -1042,6 +1057,8 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     randexp (0.1.7)
+    rash_alt (0.4.12)
+      hashie (>= 3.4)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -1400,6 +1417,7 @@ GEM
     validates_hostname (1.0.11)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
+    version_gem (1.0.0)
     version_sorter (2.2.4)
     view_component (2.50.0)
       activesupport (>= 5.0.0, < 8.0)
@@ -1508,6 +1526,7 @@ DEPENDENCIES
   elasticsearch-rails (~> 7.2)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
+  error_tracking_open_api!
   erubi (~> 1.9.0)
   escape_utils (~> 1.1)
   factory_bot_rails (~> 6.2.0)
@@ -1534,7 +1553,7 @@ DEPENDENCIES
   gitaly (~> 15.1.0.pre.rc1)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
-  gitlab-dangerfiles (~> 3.4.1)
+  gitlab-dangerfiles (~> 3.4.2)
   gitlab-experiment (~> 0.7.1)
   gitlab-fog-azure-rm (~> 1.3.0)
   gitlab-labkit (~> 0.23.0)
@@ -1575,7 +1594,7 @@ DEPENDENCIES
   icalendar
   invisible_captcha (~> 1.1.0)
   ipaddress (~> 0.8.3)
-  ipynbdiff (= 0.4.7)
+  ipynbdiff!
   jira-ruby (~> 2.1.4)
   js_regex (~> 3.7)
   json (~> 2.5.1)
@@ -1604,7 +1623,7 @@ DEPENDENCIES
   net-ldap (~> 0.16.3)
   net-ntp
   nokogiri (~> 1.13.6)
-  oauth2 (~> 1.4)
+  oauth2 (~> 2.0)
   octokit (~> 4.15)
   ohai (~> 16.10)
   oj (~> 3.10.6)
@@ -1619,7 +1638,7 @@ DEPENDENCIES
   omniauth-dingtalk-oauth2 (~> 1.0)
   omniauth-facebook (~> 4.0.0)
   omniauth-github (~> 1.4)
-  omniauth-gitlab (~> 1.0.2)
+  omniauth-gitlab (~> 4.0.0)!
   omniauth-google-oauth2 (~> 0.6.0)
   omniauth-oauth2-generic (~> 0.2.2)
   omniauth-salesforce (~> 1.0.5)

app/assets/javascripts/batch_comments/components/submit_dropdown.vue

@@ -22,6 +22,18 @@ export default {
   computed: {
     ...mapGetters(['getNotesData', 'getNoteableData', 'noteableType', 'getCurrentUserLastNote']),
   },
+  mounted() {
+    // We override the Bootstrap Vue click outside behaviour
+    // to allow for clicking in the autocomplete dropdowns
+    // without this override the submit dropdown will close
+    // whenever a item in the autocomplete dropdown is clicked
+    const originalClickOutHandler = this.$refs.dropdown.$refs.dropdown.clickOutHandler;
+    this.$refs.dropdown.$refs.dropdown.clickOutHandler = (e) => {
+      if (!e.target.closest('.atwho-container')) {
+        originalClickOutHandler(e);
+      }
+    };
+  },
   methods: {
     ...mapActions('batchComments', ['publishReview']),
     async submitReview() {
@@ -52,7 +64,13 @@ export default {
 </script>
 
 <template>
-  <gl-dropdown right class="submit-review-dropdown" variant="info" category="secondary">
+  <gl-dropdown
+    ref="dropdown"
+    right
+    class="submit-review-dropdown"
+    variant="info"
+    category="secondary"
+  >
     <template #button-content>
       {{ __('Finish review') }}
       <gl-icon class="dropdown-chevron" name="chevron-up" />

app/assets/javascripts/blob/3d_viewer/index.js

@@ -98,9 +98,9 @@ export default class Renderer {
     requestAnimationFrame(this.renderWrapper);
   }
 
-  changeObjectMaterials(type) {
+  changeObjectMaterials(material) {
     this.objects.forEach((obj) => {
-      obj.changeMaterial(type);
+      obj.changeMaterial(material);
     });
   }
 

app/assets/javascripts/blob/3d_viewer/mesh_object.js

@@ -30,7 +30,7 @@ export default class MeshObject extends Mesh {
     }
   }
 
-  changeMaterial(type) {
-    this.material = materials[type];
+  changeMaterial(materialKey) {
+    this.material = materials[materialKey];
   }
 }

app/assets/javascripts/blob/stl_viewer.js

@@ -5,15 +5,15 @@ export default () => {
 
   [].slice.call(document.querySelectorAll('.js-material-changer')).forEach((el) => {
     el.addEventListener('click', (e) => {
-      const { target } = e;
+      const { currentTarget } = e;
 
       e.preventDefault();
 
       document.querySelector('.js-material-changer.selected').classList.remove('selected');
-      target.classList.add('selected');
-      target.blur();
+      currentTarget.classList.add('selected');
+      currentTarget.blur();
 
-      viewer.changeObjectMaterials(target.dataset.type);
+      viewer.changeObjectMaterials(currentTarget.dataset.material);
     });
   });
 };

app/assets/javascripts/boards/components/board_card_inner.vue

@@ -254,7 +254,7 @@ export default {
       <div
         class="gl-display-flex align-items-start flex-wrap-reverse board-card-number-container gl-overflow-hidden"
       >
-        <gl-loading-icon v-if="item.isLoading" size="lg" class="mt-3" />
+        <gl-loading-icon v-if="item.isLoading" size="lg" class="gl-mt-5" />
         <span
           v-if="item.referencePath"
           class="board-card-number gl-overflow-hidden gl-display-flex gl-mr-3 gl-mt-3"

app/assets/javascripts/clusters_list/components/agent_table.vue

@@ -58,7 +58,7 @@ export default {
   },
   computed: {
     fields() {
-      const tdClass = 'gl-py-5!';
+      const tdClass = 'gl-pt-3! gl-pb-4! gl-vertical-align-middle!';
       return [
         {
           key: 'name',
@@ -184,7 +184,7 @@ export default {
         data-testid="cluster-agent-connection-status"
       >
         <span :class="$options.AGENT_STATUSES[item.status].class" class="gl-mr-3">
-          <gl-icon :name="$options.AGENT_STATUSES[item.status].icon" :size="12" /></span
+          <gl-icon :name="$options.AGENT_STATUSES[item.status].icon" :size="16" /></span
         >{{ $options.AGENT_STATUSES[item.status].name }}
       </span>
       <gl-tooltip v-if="item.status === 'active'" :target="getStatusCellId(item)" placement="right">