Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
8624e54ae6
commit
b1a7b1b7e3
|
|
@ -6,7 +6,8 @@ class Projects::BadgesController < Projects::ApplicationController
|
|||
before_action :no_cache_headers, only: [:pipeline, :coverage]
|
||||
before_action :authorize_read_build!, only: [:pipeline, :coverage]
|
||||
|
||||
feature_category :continuous_integration
|
||||
feature_category :continuous_integration, [:index, :pipeline]
|
||||
feature_category :code_testing, [:coverage]
|
||||
|
||||
def pipeline
|
||||
pipeline_status = Gitlab::Ci::Badge::Pipeline::Status
|
||||
|
|
|
|||
|
|
@ -11,9 +11,11 @@ class Projects::GraphsController < Projects::ApplicationController
|
|||
|
||||
track_redis_hll_event :charts, name: 'p_analytics_repo'
|
||||
|
||||
feature_category :source_code_management
|
||||
feature_category :source_code_management, [:show, :commits, :languages, :charts]
|
||||
urgency :low, [:show]
|
||||
|
||||
feature_category :continuous_integration, [:ci]
|
||||
|
||||
def show
|
||||
respond_to do |format|
|
||||
format.html
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
---
|
||||
name: query_project_ci_feature_usages_for_coverage
|
||||
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69890
|
||||
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339974
|
||||
milestone: '14.3'
|
||||
type: development
|
||||
group: group::testing
|
||||
default_enabled: false
|
||||
|
|
@ -103,7 +103,6 @@ gitlab_rails['ldap_servers'] = {
|
|||
'verify_certificates' => true,
|
||||
'bind_dn' => '_the_full_dn_of_the_user_you_will_bind_with',
|
||||
'password' => '_the_password_of_the_bind_user',
|
||||
'verify_certificates' => true,
|
||||
'tls_options' => {
|
||||
'ca_file' => '',
|
||||
'ssl_version' => '',
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ The following lists the currently supported OSs and their possible EOL dates.
|
|||
| Debian 9 | GitLab CE / GitLab EE 9.3.0 | amd64 | 2022 | <https://wiki.debian.org/DebianReleases#Production_Releases> |
|
||||
| Debian 10 | GitLab CE / GitLab EE 12.2.0 | amd64, arm64 | TBD | <https://wiki.debian.org/DebianReleases#Production_Releases> |
|
||||
| OpenSUSE 15.2 | GitLab CE / GitLab EE 13.11.0 | x86_64, aarch64 | Dec 2021 | <https://en.opensuse.org/Lifetime> |
|
||||
| OpenSUSE 15.3 | GitLab CE / GitLab EE 14.5.0 | x86_64, aarch64 | Nov 2022 | <https://en.opensuse.org/Lifetime> |
|
||||
| SLES 12 | GitLab EE 9.0.0 | x86_64 | Oct 2027 | <https://www.suse.com/lifecycle/> |
|
||||
| Ubuntu 18.04 | GitLab CE / GitLab EE 10.7.0 | amd64 | April 2023 | <https://wiki.ubuntu.com/Releases> |
|
||||
| Ubuntu 20.04 | GitLab CE / GitLab EE 13.2.0 | amd64, arm64 | April 2025 | <https://wiki.ubuntu.com/Releases> |
|
||||
|
|
|
|||
|
|
@ -1590,9 +1590,6 @@ msgstr ""
|
|||
msgid "APIFuzzing|Choose a profile"
|
||||
msgstr ""
|
||||
|
||||
msgid "APIFuzzing|Code snippet could not be generated. Try again later."
|
||||
msgstr ""
|
||||
|
||||
msgid "APIFuzzing|Configure HTTP basic authentication values. Other authentication methods are supported. %{linkStart}Learn more%{linkEnd}."
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.4.1' # This should stay in sync with the root's Gem
|
|||
gem 'allure-rspec', '~> 2.15.0'
|
||||
gem 'capybara', '~> 3.35.0'
|
||||
gem 'capybara-screenshot', '~> 1.0.23'
|
||||
gem 'rake', '~> 12.3.3'
|
||||
gem 'rake', '~> 13'
|
||||
gem 'rspec', '~> 3.10'
|
||||
gem 'selenium-webdriver', '~> 4.0'
|
||||
gem 'airborne', '~> 0.3.4', require: false # airborne is messing with rspec sandboxed mode so not requiring by default
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ GEM
|
|||
adamantium (0.2.0)
|
||||
ice_nine (~> 0.11.0)
|
||||
memoizable (~> 0.4.0)
|
||||
addressable (2.7.0)
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
airborne (0.3.4)
|
||||
activesupport
|
||||
|
|
@ -88,27 +88,25 @@ GEM
|
|||
gitlab (4.16.1)
|
||||
httparty (~> 0.14, >= 0.14.0)
|
||||
terminal-table (~> 1.5, >= 1.5.1)
|
||||
gitlab-qa (7.9.1)
|
||||
gitlab-qa (7.14.0)
|
||||
activesupport (~> 6.1)
|
||||
gitlab (~> 4.16.1)
|
||||
http (= 4.3.0)
|
||||
http (~> 5.0)
|
||||
nokogiri (~> 1.10)
|
||||
table_print (= 1.5.7)
|
||||
http (4.3.0)
|
||||
addressable (~> 2.3)
|
||||
http (5.0.4)
|
||||
addressable (~> 2.8)
|
||||
http-cookie (~> 1.0)
|
||||
http-form_data (~> 2.2)
|
||||
http-parser (~> 1.2.0)
|
||||
llhttp-ffi (~> 0.4.0)
|
||||
http-accept (1.7.0)
|
||||
http-cookie (1.0.3)
|
||||
http-cookie (1.0.4)
|
||||
domain_name (~> 0.5)
|
||||
http-form_data (2.3.0)
|
||||
http-parser (1.2.3)
|
||||
ffi-compiler (>= 1.0, < 2.0)
|
||||
httparty (0.19.0)
|
||||
httparty (0.20.0)
|
||||
mime-types (~> 3.0)
|
||||
multi_xml (>= 0.5.2)
|
||||
i18n (1.8.10)
|
||||
i18n (1.8.11)
|
||||
concurrent-ruby (~> 1.0)
|
||||
ice_nine (0.11.2)
|
||||
influxdb-client (1.17.0)
|
||||
|
|
@ -116,14 +114,17 @@ GEM
|
|||
rake
|
||||
launchy (2.4.3)
|
||||
addressable (~> 2.3)
|
||||
llhttp-ffi (0.4.0)
|
||||
ffi-compiler (~> 1.0)
|
||||
rake (~> 13.0)
|
||||
macaddr (1.7.2)
|
||||
systemu (~> 2.6.5)
|
||||
memoizable (0.4.2)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
method_source (0.9.0)
|
||||
mime-types (3.3.1)
|
||||
mime-types (3.4.0)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2021.0704)
|
||||
mime-types-data (3.2021.1115)
|
||||
mini_mime (1.1.0)
|
||||
mini_portile2 (2.6.1)
|
||||
minitest (5.14.4)
|
||||
|
|
@ -153,12 +154,12 @@ GEM
|
|||
pry-byebug (3.5.1)
|
||||
byebug (~> 9.1)
|
||||
pry (~> 0.10)
|
||||
public_suffix (4.0.1)
|
||||
public_suffix (4.0.6)
|
||||
racc (1.6.0)
|
||||
rack (2.2.3)
|
||||
rack-test (1.1.0)
|
||||
rack (>= 1.0, < 3)
|
||||
rake (12.3.3)
|
||||
rake (13.0.6)
|
||||
regexp_parser (2.1.1)
|
||||
require_all (3.0.0)
|
||||
rest-client (2.1.0)
|
||||
|
|
@ -212,7 +213,7 @@ GEM
|
|||
concurrent-ruby (~> 1.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.7)
|
||||
unf_ext (0.0.8)
|
||||
unicode-display_width (1.8.0)
|
||||
unparser (0.4.7)
|
||||
abstract_type (~> 0.0.7)
|
||||
|
|
@ -233,7 +234,7 @@ GEM
|
|||
selenium-webdriver (~> 4.0)
|
||||
xpath (3.2.0)
|
||||
nokogiri (~> 1.8)
|
||||
zeitwerk (2.4.2)
|
||||
zeitwerk (2.5.1)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
@ -255,7 +256,7 @@ DEPENDENCIES
|
|||
parallel (~> 1.19)
|
||||
parallel_tests (~> 2.29)
|
||||
pry-byebug (~> 3.5.1)
|
||||
rake (~> 12.3.3)
|
||||
rake (~> 13)
|
||||
rest-client (~> 2.1.0)
|
||||
rotp (~> 3.1.0)
|
||||
rspec (~> 3.10)
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ module QA
|
|||
end
|
||||
end
|
||||
|
||||
it "push and pull a npm package via CI using a #{params[:token_name]}" do
|
||||
it "push and pull a npm package via CI using a #{params[:token_name]}", quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/344537', type: :investigating } do
|
||||
Resource::Repository::Commit.fabricate_via_api! do |commit|
|
||||
commit.project = project
|
||||
commit.commit_message = 'Add .gitlab-ci.yml'
|
||||
|
|
|
|||
|
|
@ -1,8 +1,3 @@
|
|||
- "./ee/spec/requests/api/ci/minutes_spec.rb"
|
||||
- "./ee/spec/services/ci/minutes/additional_packs/change_namespace_service_spec.rb"
|
||||
- "./ee/spec/services/ci/minutes/additional_packs/create_service_spec.rb"
|
||||
- "./ee/spec/services/ci/minutes/refresh_cached_data_service_spec.rb"
|
||||
- "./spec/features/projects/infrastructure_registry_spec.rb"
|
||||
- "./spec/lib/gitlab/background_migration/copy_ci_builds_columns_to_security_scans_spec.rb"
|
||||
- "./spec/lib/gitlab/background_migration/migrate_pages_metadata_spec.rb"
|
||||
- "./spec/migrations/20210907211557_finalize_ci_builds_bigint_conversion_spec.rb"
|
||||
|
|
|
|||
Loading…
Reference in New Issue