Add latest changes from gitlab-org/gitlab@master

.rubocop_todo.yml

@@ -1286,8 +1286,5 @@ FactoryBot/InlineAssociation:
     - 'spec/factories/packages.rb'
     - 'spec/factories/packages/package_file.rb'
     - 'spec/factories/sent_notifications.rb'
-    - 'spec/factories/serverless/domain.rb'
-    - 'spec/factories/serverless/domain_cluster.rb'
-    - 'spec/factories/terraform/state.rb'
     - 'spec/factories/uploads.rb'
     - 'spec/factories/wiki_pages.rb'

app/assets/stylesheets/page_bundles/ide_themes/_dark.scss

@@ -35,6 +35,13 @@
   --ide-btn-success-hover-border-width: 2px;
   --ide-btn-success-focus-box-shadow: 0 0 0 1px #2da160;
 
+  // Danger styles should be the same as default styles in dark theme
+  --ide-btn-danger-secondary-background: var(--ide-btn-default-background);
+  --ide-btn-danger-secondary-border: var(--ide-btn-default-border);
+  --ide-btn-danger-secondary-hover-border: var(--ide-btn-default-hover-border);
+  --ide-btn-danger-secondary-hover-border-width: var(--ide-btn-default-hover-border-width);
+  --ide-btn-danger-secondary-focus-box-shadow: var(--ide-btn-default-focus-box-shadow);
+
   --ide-btn-disabled-background: transparent;
   --ide-btn-disabled-border: rgba(223, 223, 223, 0.24);
   --ide-btn-disabled-hover-border: rgba(223, 223, 223, 0.24);

app/assets/stylesheets/page_bundles/ide_themes/_solarized-dark.scss

@@ -35,6 +35,13 @@
   --ide-btn-success-hover-border-width: 2px;
   --ide-btn-success-focus-box-shadow: 0 0 0 1px #2da160;
 
+  // Danger styles should be the same as default styles in dark theme
+  --ide-btn-danger-secondary-background: var(--ide-btn-default-background);
+  --ide-btn-danger-secondary-border: var(--ide-btn-default-border);
+  --ide-btn-danger-secondary-hover-border: var(--ide-btn-default-hover-border);
+  --ide-btn-danger-secondary-hover-border-width: var(--ide-btn-default-hover-border-width);
+  --ide-btn-danger-secondary-focus-box-shadow: var(--ide-btn-default-focus-box-shadow);
+
   --ide-btn-disabled-background: transparent;
   --ide-btn-disabled-border: rgba(223, 223, 223, 0.24);
   --ide-btn-disabled-hover-border: rgba(223, 223, 223, 0.24);

app/controllers/concerns/snippets_actions.rb

@@ -57,11 +57,6 @@ module SnippetsActions
         render 'show'
       end
 
-      format.json do
-        conditionally_expand_blob(blob)
-        render_blob_json(blob)
-      end
-
       format.js do
         if @snippet.embeddable?
           conditionally_expand_blobs(blobs)

changelogs/unreleased/himkp-fix-ide-discard.yml

@@ -0,0 +1,5 @@
+---
+title: Fix danger-secondary button in the Web IDE dark theme
+merge_request: 45714
+author:
+type: fixed

doc/user/gitlab_com/index.md

@@ -85,6 +85,7 @@ which is part of [GitLab CI/CD](#gitlab-cicd).
 ## GitLab CI/CD
 
 Below are the current settings regarding [GitLab CI/CD](../../ci/README.md).
+Any settings or feature limits not listed here are using the defaults listed in the related documentation.
 
 | Setting                 | GitLab.com        | Default       |
 | -----------             | ----------------- | ------------- |
@@ -94,7 +95,6 @@ Below are the current settings regarding [GitLab CI/CD](../../ci/README.md).
 | [Max jobs in active pipelines](../../administration/instance_limits.md#number-of-jobs-in-active-pipelines) | `500` for Free tier, unlimited otherwise | Unlimited
 | [Max CI/CD subscriptions to a project](../../administration/instance_limits.md#number-of-cicd-subscriptions-to-a-project) | `2` | Unlimited |
 | [Max pipeline schedules in projects](../../administration/instance_limits.md#number-of-pipeline-schedules) | `10` for Free tier, `50` for all paid tiers | Unlimited |
-| [Max number of instance level variables](../../administration/instance_limits.md#number-of-instance-level-variables) | `25` | `25` |
 | [Scheduled Job Archival](../../user/admin_area/settings/continuous_integration.md#archive-jobs) | 3 months | Never |
 | Max test cases per [unit test report](../../ci/unit_test_reports.md) | `500_000` | Unlimited |
 

spec/controllers/projects/snippets_controller_spec.rb

@@ -180,16 +180,6 @@ RSpec.describe Projects::SnippetsController do
     end
   end
 
-  describe 'GET #show as JSON' do
-    it 'renders the blob from the repository' do
-      project_snippet = create(:project_snippet, :public, :repository, project: project, author: user)
-
-      get :show, params: { namespace_id: project.namespace, project_id: project, id: project_snippet.to_param }, format: :json
-
-      expect(assigns(:blob)).to eq(project_snippet.blobs.first)
-    end
-  end
-
   describe "GET #show for embeddable content" do
     let(:project_snippet) { create(:project_snippet, :repository, snippet_permission, project: project, author: user) }
     let(:extra_params) { {} }

spec/controllers/snippets_controller_spec.rb

@@ -205,14 +205,6 @@ RSpec.describe SnippetsController do
         end
       end
     end
-
-    context 'when requesting JSON' do
-      it 'renders the blob from the repository' do
-        get :show, params: { id: public_snippet.to_param }, format: :json
-
-        expect(assigns(:blob)).to eq(public_snippet.blobs.first)
-      end
-    end
   end
 
   describe 'POST #mark_as_spam' do

spec/factories/serverless/domain.rb

@@ -3,8 +3,8 @@
 FactoryBot.define do
   factory :serverless_domain, class: '::Serverless::Domain' do
     function_name { 'test-function' }
-    serverless_domain_cluster { create(:serverless_domain_cluster) }
-    environment { create(:environment) }
+    serverless_domain_cluster { association(:serverless_domain_cluster) }
+    environment { association(:environment) }
 
     skip_create
   end

spec/factories/serverless/domain_cluster.rb

@@ -2,9 +2,9 @@
 
 FactoryBot.define do
   factory :serverless_domain_cluster, class: '::Serverless::DomainCluster' do
-    pages_domain { create(:pages_domain) }
-    knative { create(:clusters_applications_knative) }
-    creator { create(:user) }
+    pages_domain { association(:pages_domain) }
+    knative { association(:clusters_applications_knative) }
+    creator { association(:user) }
 
     certificate do
       File.read(Rails.root.join('spec/fixtures/', 'ssl_certificate.pem'))

spec/factories/terraform/state.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :terraform_state, class: 'Terraform::State' do
-    project { create(:project) }
+    project { association(:project) }
 
     sequence(:name) { |n| "state-#{n}" }
 
@@ -14,7 +14,7 @@ FactoryBot.define do
     trait :locked do
       sequence(:lock_xid) { |n| "lock-#{n}" }
       locked_at { Time.current }
-      locked_by_user { create(:user) }
+      locked_by_user { association(:user) }
     end
 
     trait :with_version do