Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

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

@@ -1481,6 +1481,13 @@
       changes: ["vendor/gems/ipynbdiff/**/*"]
     - <<: *if-merge-request-labels-run-all-rspec
 
+.vendor:rules:omniauth_crowd:
+  rules:
+    - <<: *if-merge-request
+      changes: ["vendor/gems/omniauth_crowd/**/*"]
+    - <<: *if-merge-request-labels-run-all-rspec
+
+
 .vendor:rules:omniauth-gitlab:
   rules:
     - <<: *if-merge-request

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

@@ -14,6 +14,14 @@ vendor ipynbdiff:
     include: vendor/gems/ipynbdiff/.gitlab-ci.yml
     strategy: depend
 
+vendor omniauth_crowd:
+  extends:
+    - .vendor:rules:omniauth_crowd
+  needs: []
+  trigger:
+    include: vendor/gems/omniauth_crowd/.gitlab-ci.yml
+    strategy: depend
+
 vendor omniauth-gitlab:
   extends:
     - .vendor:rules:omniauth-gitlab

Gemfile

@@ -51,7 +51,7 @@ gem 'omniauth-oauth2-generic', '~> 0.2.2'
 gem 'omniauth-saml', '~> 1.10'
 gem 'omniauth-shibboleth', '~> 1.3.0'
 gem 'omniauth-twitter', '~> 1.4'
-gem 'omniauth_crowd', '~> 2.4.0'
+gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
 gem 'omniauth-authentiq', '~> 0.3.3'
 gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect'
 gem 'omniauth-salesforce', '~> 1.0.5'

Gemfile.lock

@@ -31,6 +31,14 @@ PATH
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.7.1)
 
+PATH
+  remote: vendor/gems/omniauth_crowd
+  specs:
+    omniauth_crowd (2.4.0)
+      activesupport
+      nokogiri (>= 1.4.4)
+      omniauth (~> 1.0, < 3)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -915,10 +923,6 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    omniauth_crowd (2.4.0)
-      activesupport
-      nokogiri (>= 1.4.4)
-      omniauth (~> 1.0)
     open4 (1.3.4)
     openid_connect (1.3.0)
       activemodel
@@ -1652,7 +1656,7 @@ DEPENDENCIES
   omniauth-saml (~> 1.10)
   omniauth-shibboleth (~> 1.3.0)
   omniauth-twitter (~> 1.4)
-  omniauth_crowd (~> 2.4.0)
+  omniauth_crowd (~> 2.4.0)!
   org-ruby (~> 0.9.12)
   pact (~> 1.12)
   parallel (~> 1.19)

app/models/container_registry/event.rb

@@ -6,6 +6,7 @@ class Event
 
     ALLOWED_ACTIONS = %w(push delete).freeze
     PUSH_ACTION = 'push'
+    DELETE_ACTION = 'delete'
     EVENT_TRACKING_CATEGORY = 'container_registry:notification'
 
     attr_reader :event
@@ -41,6 +42,10 @@ def target_tag?
       event['target'].has_key?('tag')
     end
 
+    def target_digest?
+      event['target'].has_key?('digest')
+    end
+
     def target_repository?
       !target_tag? && event['target'].has_key?('repository')
     end
@@ -53,6 +58,10 @@ def action_push?
       PUSH_ACTION == action
     end
 
+    def action_delete?
+      DELETE_ACTION == action
+    end
+
     def container_repository_exists?
       return unless container_registry_path
 
@@ -74,7 +83,7 @@ def project
 
     def update_project_statistics
       return unless supported?
-      return unless target_tag?
+      return unless target_tag? || (action_delete? && target_digest?)
       return unless project
 
       Rails.cache.delete(project.root_ancestor.container_repositories_size_cache_key)

doc/administration/index.md

@@ -207,7 +207,6 @@ Learn how to install, configure, update, and maintain your GitLab instance.
 
 ## Troubleshooting
 
-- [Debugging tips](troubleshooting/debug.md): Tips to debug problems when things go wrong.
 - [Log system](logs.md): Where to look for logs.
 - [Sidekiq Troubleshooting](troubleshooting/sidekiq.md): Debug when Sidekiq appears hung and is not processing jobs.
 - [Troubleshooting Elasticsearch](troubleshooting/elasticsearch.md)

doc/administration/troubleshooting/debug.md

@@ -1,14 +1,11 @@
 ---
-stage: Systems
-group: Distribution
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
+redirect_to: '../reference_architectures/troubleshooting.md'
+remove_date: '2022-10-19'
 ---
 
-# Debugging tips **(FREE SELF)**
+This document was moved to [another location](../reference_architectures/troubleshooting.md).
 
-Sometimes things don't work the way they should. Here are some tips on debugging issues out
-in production.
-
-## More information
-
-- [Debugging Stuck Ruby Processes](https://newrelic.com/blog/best-practices/debugging-stuck-ruby-processes-what-to-do-before-you-kill-9)
+<!-- This redirect file can be deleted after 2022-10-19. -->
+<!-- Redirects that point to other docs in the same project expire in three months. -->
+<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->

doc/administration/troubleshooting/index.md

@@ -21,8 +21,10 @@ installation.
 - [Linux cheat sheet](linux_cheat_sheet.md)
 - [Parsing GitLab logs with `jq`](log_parsing.md)
 - [Diagnostics tools](diagnostics_tools.md)
-- [Debugging tips](debug.md)
 - [Tracing requests with correlation ID](tracing_correlation_id.md)
 
+Some feature documentation pages also have a troubleshooting section at the end
+that you can check for feature-specific help.
+
 If you need a testing environment to troubleshoot, see the
 [apps for a testing environment](test_environments.md).

doc/api/project_level_variables.md

@@ -170,5 +170,5 @@ This parameter is used for filtering by attributes, such as `environment_scope`.
 Example usage:
 
 ```shell
-curl --request DELETE --globoff --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/1/variables/VARIABLE_1?filter[environment_scope]=production"
+curl --globoff --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/1/variables/VARIABLE_1?filter[environment_scope]=production"
 ```

doc/api/users.md

@@ -57,8 +57,7 @@ NOTE:
 Username search is case insensitive.
 
 In addition, you can filter users based on the states `blocked` and `active`.
-It does not support `active=false` or `blocked=false`. The list of billable users
-is the total number of users minus the blocked users.
+It does not support `active=false` or `blocked=false`.
 
 ```plaintext
 GET /users?active=true

spec/models/container_registry/event_spec.rb

@@ -40,16 +40,18 @@
 
     subject(:handle!) { described_class.new(raw_event).handle! }
 
-    it 'enqueues a project statistics update' do
-      expect(ProjectCacheWorker).to receive(:perform_async).with(project.id, [], [:container_registry_size])
+    shared_examples 'event with project statistics update' do
+      it 'enqueues a project statistics update' do
+        expect(ProjectCacheWorker).to receive(:perform_async).with(project.id, [], [:container_registry_size])
 
-      handle!
-    end
+        handle!
+      end
 
-    it 'clears the cache for the namespace container repositories size' do
-      expect(Rails.cache).to receive(:delete).with(group.container_repositories_size_cache_key)
+      it 'clears the cache for the namespace container repositories size' do
+        expect(Rails.cache).to receive(:delete).with(group.container_repositories_size_cache_key)
 
-      handle!
+        handle!
+      end
     end
 
     shared_examples 'event without project statistics update' do
@@ -60,10 +62,32 @@
       end
     end
 
+    it_behaves_like 'event with project statistics update'
+
     context 'with no target tag' do
       let(:target) { super().without('tag') }
 
       it_behaves_like 'event without project statistics update'
+
+      context 'with a target digest' do
+        let(:target) { super().merge('digest' => 'abc123') }
+
+        it_behaves_like 'event without project statistics update'
+      end
+
+      context 'with a delete action' do
+        let(:action) { 'delete' }
+
+        context 'without a target digest' do
+          it_behaves_like 'event without project statistics update'
+        end
+
+        context 'with a target digest' do
+          let(:target) { super().merge('digest' => 'abc123') }
+
+          it_behaves_like 'event with project statistics update'
+        end
+      end
     end
 
     context 'with an unsupported action' do

vendor/gems/omniauth_crowd/.gitlab-ci.yml

@@ -0,0 +1,30 @@
+workflow:
+  rules:
+    - if: $CI_MERGE_REQUEST_ID
+
+.rspec:
+  cache:
+    key: omniauth-gitlab-ruby
+    paths:
+      - vendor/gems/omniauth_crowd/vendor/ruby
+  before_script:
+    - cd vendor/gems/omniauth_crowd
+    - ruby -v                                   # Print out ruby version for debugging
+    - gem install bundler --no-document         # Bundler is not installed with the image
+    - bundle config set --local path 'vendor'   # Install dependencies into ./vendor/ruby
+    - bundle config set with 'development'
+    - bundle install -j $(nproc)
+  script:
+    - bundle exec rspec
+
+rspec-2.6:
+  image: "ruby:2.6"
+  extends: .rspec
+
+rspec-2.7:
+  image: "ruby:2.7"
+  extends: .rspec
+
+rspec-3.0:
+  image: "ruby:3.0"
+  extends: .rspec

vendor/gems/omniauth_crowd/Gemfile

@@ -0,0 +1,4 @@
+source 'http://rubygems.org'
+
+# Specify your gem's dependencies in omniauth-github.gemspec
+gemspec

vendor/gems/omniauth_crowd/Gemfile.lock

@@ -0,0 +1,74 @@
+PATH
+  remote: .
+  specs:
+    omniauth_crowd (2.4.0)
+      activesupport
+      nokogiri (>= 1.4.4)
+      omniauth (~> 1.0, < 3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    concurrent-ruby (1.0.5)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.2.5)
+    hashdiff (0.3.6)
+    hashie (3.4.3)
+    i18n (0.8.1)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    omniauth (1.3.1)
+      hashie (>= 1.2, < 4)
+      rack (>= 1.0, < 3)
+    public_suffix (3.0.0)
+    rack (1.6.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rake (10.5.0)
+    rexml (3.2.5)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    safe_yaml (1.0.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    webmock (3.0.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (> 1.0.0)
+  omniauth_crowd!
+  rack
+  rack-test
+  rake
+  rexml (~> 3.2.5)
+  rspec (~> 3.0.0)
+  webmock (~> 3.0.0)
+
+BUNDLED WITH
+   2.3.15

vendor/gems/omniauth_crowd/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Rob Di Marco
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.