diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-09 06:10:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-09 06:10:21 +0300 |
commit | b3105472e25eafa9ac48f926f20ad95ccfd44086 (patch) | |
tree | 65d89ecfa1281cad20fb7eed4d133f1729144083 | |
parent | 3f8e9ba69efda3ef8f3989c5c4d56e422367200a (diff) |
Add latest changes from gitlab-org/gitlab@master
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.checksum | 2 | ||||
-rw-r--r-- | Gemfile.lock | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/page_bundles/wiki.scss | 4 | ||||
-rw-r--r-- | config/feature_categories.yml | 1 | ||||
-rw-r--r-- | doc/ci/pipelines/downstream_pipelines.md | 4 |
7 files changed, 9 insertions, 9 deletions
@@ -416,7 +416,7 @@ end group :development, :test do gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'parser', '~> 3.3' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'parser', '~> 3.3', '>= 3.3.0.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/Gemfile.checksum b/Gemfile.checksum index 2fcb5cbde20..a8492cb71ee 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -444,7 +444,7 @@ {"name":"pact-mock_service","version":"3.10.0","platform":"ruby","checksum":"898ec3b8d96f1934d15941c701ca7d5fef5ccff32022d9a196fb82073cd95e27"}, {"name":"pact-support","version":"1.18.1","platform":"ruby","checksum":"4a25961c8b1c4132e433a8eaa838b1e6914c6d3aae48eee705b9860a5e8b0476"}, {"name":"parallel","version":"1.22.1","platform":"ruby","checksum":"ebdf1f0c51f182df38522f70ba770214940bef998cdb6e00f36492b29699761f"}, -{"name":"parser","version":"3.3.0.0","platform":"ruby","checksum":"8ba7fa149ae1b268bae3e5aaf5b5345e16bd553406e1562c483fe9bed6ed00ad"}, +{"name":"parser","version":"3.3.0.2","platform":"ruby","checksum":"418c5d5b56143c541693b9a00968b7005f94440e94e0b2945b55dc543e562ea0"}, {"name":"parslet","version":"1.8.2","platform":"ruby","checksum":"08d1ab3721cd3f175bfbee8788b2ddff71f92038f2d69bd65454c22bb9fbd98a"}, {"name":"pastel","version":"0.8.0","platform":"ruby","checksum":"481da9fb7d2f6e6b1a08faf11fa10363172dc40fd47848f096ae21209f805a75"}, {"name":"peek","version":"1.1.0","platform":"ruby","checksum":"d6501ead8cde46d8d8ed0d59eb6f0ba713d0a41c11a2c4a81447b2dce37b3ecc"}, diff --git a/Gemfile.lock b/Gemfile.lock index 3adb90d0616..57c9b3a2e6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1232,7 +1232,7 @@ GEM expgen (~> 0.1) rainbow (~> 3.1.1) parallel (1.22.1) - parser (3.3.0.0) + parser (3.3.0.2) ast (~> 2.4.1) racc parslet (1.8.2) @@ -2016,7 +2016,7 @@ DEPENDENCIES os (~> 1.1) pact (~> 1.63) parallel (~> 1.19) - parser (~> 3.3) + parser (~> 3.3, >= 3.3.0.2) parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.4) diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 0eecf7bddc1..04799a6b8f8 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -601,6 +601,7 @@ .gutter-toggle { width: 100%; height: $sidebar-toggle-height; + margin-top: 0; margin-left: 0; border-bottom: 1px solid $border-color; border-radius: 0; diff --git a/app/assets/stylesheets/page_bundles/wiki.scss b/app/assets/stylesheets/page_bundles/wiki.scss index ed2c7662a98..2c47c01b89a 100644 --- a/app/assets/stylesheets/page_bundles/wiki.scss +++ b/app/assets/stylesheets/page_bundles/wiki.scss @@ -150,10 +150,6 @@ .wiki-sidebar-header { padding: 0 $gl-padding $gl-padding; - - .gutter-toggle { - margin-top: 0; - } } } diff --git a/config/feature_categories.yml b/config/feature_categories.yml index 4391673b360..a7e84d53c31 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -86,6 +86,7 @@ - mlops - mobile_devops - navigation +- okr_management - omnibus_package - on_call_schedule_management - onboarding diff --git a/doc/ci/pipelines/downstream_pipelines.md b/doc/ci/pipelines/downstream_pipelines.md index 61862a20436..ae2ca74e6f8 100644 --- a/doc/ci/pipelines/downstream_pipelines.md +++ b/doc/ci/pipelines/downstream_pipelines.md @@ -379,7 +379,9 @@ trigger_job: ::EndTabs -### View multi-project pipelines in pipeline graphs **(PREMIUM ALL)** +### View multi-project pipelines in pipeline graphs + +> [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/422282) from GitLab Premium to GitLab Free in 16.8. After you trigger a multi-project pipeline, the downstream pipeline displays to the right of the [pipeline graph](index.md#visualize-pipelines). |