Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.rubocop_todo.yml3
-rw-r--r--app/assets/stylesheets/page_bundles/ide_themes/_dark.scss7
-rw-r--r--app/assets/stylesheets/page_bundles/ide_themes/_solarized-dark.scss7
-rw-r--r--app/controllers/concerns/snippets_actions.rb5
-rw-r--r--changelogs/unreleased/himkp-fix-ide-discard.yml5
-rw-r--r--doc/user/gitlab_com/index.md2
-rw-r--r--spec/controllers/projects/snippets_controller_spec.rb10
-rw-r--r--spec/controllers/snippets_controller_spec.rb8
-rw-r--r--spec/factories/serverless/domain.rb4
-rw-r--r--spec/factories/serverless/domain_cluster.rb6
-rw-r--r--spec/factories/terraform/state.rb4
11 files changed, 27 insertions, 34 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 19115b7bedb..582c66bdffd 100644
--- a/.rubocop_todo.yml
+++ b/.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'
diff --git a/app/assets/stylesheets/page_bundles/ide_themes/_dark.scss b/app/assets/stylesheets/page_bundles/ide_themes/_dark.scss
index 41f9a8e6db7..5f31d554c19 100644
--- a/app/assets/stylesheets/page_bundles/ide_themes/_dark.scss
+++ b/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);
diff --git a/app/assets/stylesheets/page_bundles/ide_themes/_solarized-dark.scss b/app/assets/stylesheets/page_bundles/ide_themes/_solarized-dark.scss
index ccb6f7a333b..83c55310063 100644
--- a/app/assets/stylesheets/page_bundles/ide_themes/_solarized-dark.scss
+++ b/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);
diff --git a/app/controllers/concerns/snippets_actions.rb b/app/controllers/concerns/snippets_actions.rb
index e4c3df6ccc3..0153ede2821 100644
--- a/app/controllers/concerns/snippets_actions.rb
+++ b/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)
diff --git a/changelogs/unreleased/himkp-fix-ide-discard.yml b/changelogs/unreleased/himkp-fix-ide-discard.yml
new file mode 100644
index 00000000000..ead221539eb
--- /dev/null
+++ b/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
diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md
index 2d81aaaf498..673015bcb0c 100644
--- a/doc/user/gitlab_com/index.md
+++ b/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 |
diff --git a/spec/controllers/projects/snippets_controller_spec.rb b/spec/controllers/projects/snippets_controller_spec.rb
index 6b394fab14c..f9221c5a4ef 100644
--- a/spec/controllers/projects/snippets_controller_spec.rb
+++ b/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) { {} }
diff --git a/spec/controllers/snippets_controller_spec.rb b/spec/controllers/snippets_controller_spec.rb
index 1ccba7f9114..993ab5d1c72 100644
--- a/spec/controllers/snippets_controller_spec.rb
+++ b/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
diff --git a/spec/factories/serverless/domain.rb b/spec/factories/serverless/domain.rb
index 7a6a048fb34..c09af068d19 100644
--- a/spec/factories/serverless/domain.rb
+++ b/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
diff --git a/spec/factories/serverless/domain_cluster.rb b/spec/factories/serverless/domain_cluster.rb
index 40e0ecad5ad..e8ff6cf42b2 100644
--- a/spec/factories/serverless/domain_cluster.rb
+++ b/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'))
diff --git a/spec/factories/terraform/state.rb b/spec/factories/terraform/state.rb
index d80c1315e28..e5cea9e252e 100644
--- a/spec/factories/terraform/state.rb
+++ b/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 02:53:42 +0300