From 1beab03f691771b380cccb7ffb5cdeebff5053de Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Sat, 5 Feb 2022 19:09:49 +0530 Subject: [PATCH] New upstream version 14.6.4+ds1 --- CHANGELOG.md | 4 + GITALY_SERVER_VERSION | 2 +- Gemfile | 2 +- Gemfile.lock | 4 +- VERSION | 2 +- .../javascripts/create_item_dropdown.js | 7 +- .../notebook/cells/output/html.vue | 3 + .../components/details/app.vue | 2 +- .../components/functional/delete_package.vue | 9 +- .../jira_connect/users_controller.rb | 10 ++ app/finders/users_finder.rb | 2 +- app/graphql/mutations/packages/destroy.rb | 1 + app/graphql/types/project_type.rb | 6 + app/models/application_setting.rb | 4 + .../integrations/enable_ssl_verification.rb | 32 +++++ .../concerns/integrations/has_web_hook.rb | 6 +- app/models/integrations/bamboo.rb | 3 +- app/models/integrations/buildkite.rb | 2 +- app/models/integrations/drone_ci.rb | 26 ++-- app/models/integrations/jenkins.rb | 1 + app/models/integrations/jira.rb | 10 +- app/models/integrations/mock_ci.rb | 23 ++-- app/models/integrations/teamcity.rb | 18 ++- app/models/system_note_metadata.rb | 2 +- app/models/user.rb | 19 ++- .../concerns/protected_ref_name_sanitizer.rb | 12 -- .../packages/destroy_package_service.rb | 12 ++ .../protected_branches/base_service.rb | 11 -- .../protected_branches/create_service.rb | 2 +- .../protected_branches/update_service.rb | 2 +- app/services/protected_tags/base_service.rb | 16 --- app/services/protected_tags/create_service.rb | 4 +- app/services/protected_tags/update_service.rb | 4 +- app/views/devise/confirmations/new.html.haml | 2 +- app/views/devise/passwords/new.html.haml | 2 +- ...roup_from_another_instance_panel.html.haml | 1 + app/workers/irker_worker.rb | 18 ++- ...age_files_limit_to_application_settings.rb | 7 ++ ...ettings_package_files_limit_constraints.rb | 15 +++ db/schema_migrations/20220113135449 | 1 + db/schema_migrations/20220113135924 | 1 + db/structure.sql | 2 + doc/api/graphql/reference/index.md | 4 +- doc/api/integrations.md | 6 +- doc/api/members.md | 8 +- doc/api/packages.md | 14 +++ doc/api/status_checks.md | 1 + doc/api/users.md | 2 +- lib/api/helpers/integrations_helpers.rb | 20 +++- lib/api/project_packages.rb | 6 +- lib/banzai/filter/blockquote_fence_filter.rb | 2 +- lib/gitlab/url_blocker.rb | 8 ++ locale/gitlab.pot | 9 ++ package.json | 2 +- .../groups/members/manage_members_spec.rb | 4 +- spec/features/issues/notes_on_issues_spec.rb | 58 +++++++++ .../issues/user_comments_on_issue_spec.rb | 2 +- spec/features/projects/packages_spec.rb | 16 +++ spec/features/protected_branches_spec.rb | 11 ++ spec/finders/users_finder_spec.rb | 12 ++ spec/frontend/create_item_dropdown_spec.js | 11 +- .../cells/output/html_sanitize_fixtures.js | 11 +- .../components/details/app_spec.js | 4 +- .../functional/delete_package_spec.js | 13 +- spec/graphql/types/project_type_spec.rb | 41 +++++++ .../filter/blockquote_fence_filter_spec.rb | 10 ++ spec/lib/gitlab/url_blocker_spec.rb | 18 +-- spec/models/application_setting_spec.rb | 3 + .../enable_ssl_verification_spec.rb | 23 ++++ spec/models/integrations/bamboo_spec.rb | 2 + spec/models/integrations/drone_ci_spec.rb | 48 ++++++++ spec/models/integrations/irker_spec.rb | 18 ++- spec/models/integrations/jenkins_spec.rb | 4 + spec/models/integrations/jira_spec.rb | 17 +++ spec/models/integrations/mock_ci_spec.rb | 73 +++++++++++ spec/models/integrations/teamcity_spec.rb | 60 ++++++++-- spec/models/user_spec.rb | 113 +++++++++++++++--- .../mutations/packages/destroy_spec.rb | 14 +++ spec/requests/api/project_packages_spec.rb | 17 +++ .../jira_connect/users_controller_spec.rb | 35 ++++++ .../packages/destroy_package_service_spec.rb | 18 +++ .../protected_branches/create_service_spec.rb | 36 +----- .../protected_branches/update_service_spec.rb | 33 +---- .../protected_tags/create_service_spec.rb | 36 +----- .../protected_tags/update_service_spec.rb | 33 +---- spec/support/helpers/dns_helpers.rb | 10 +- .../enable_ssl_verification_shared_context.rb | 47 ++++++++ .../has_web_hook_shared_examples.rb | 10 ++ spec/workers/irker_worker_spec.rb | 15 ++- yarn.lock | 10 +- 90 files changed, 1002 insertions(+), 278 deletions(-) create mode 100644 app/models/concerns/integrations/enable_ssl_verification.rb delete mode 100644 app/services/concerns/protected_ref_name_sanitizer.rb delete mode 100644 app/services/protected_tags/base_service.rb create mode 100644 db/migrate/20220113135449_add_package_files_limit_to_application_settings.rb create mode 100644 db/migrate/20220113135924_add_application_settings_package_files_limit_constraints.rb create mode 100644 db/schema_migrations/20220113135449 create mode 100644 db/schema_migrations/20220113135924 create mode 100644 spec/models/concerns/integrations/enable_ssl_verification_spec.rb create mode 100644 spec/models/integrations/mock_ci_spec.rb create mode 100644 spec/requests/jira_connect/users_controller_spec.rb create mode 100644 spec/support/shared_contexts/models/concerns/integrations/enable_ssl_verification_shared_context.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index b97e7faf92..5c356e303f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 14.6.4 (2022-02-03) + +No changes. + ## 14.6.3 (2022-01-18) ### Fixed (4 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index f8a030aae5..7d6296b6cb 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -14.6.3 \ No newline at end of file +14.6.4 \ No newline at end of file diff --git a/Gemfile b/Gemfile index 1d88df8296..9f152aa521 100644 --- a/Gemfile +++ b/Gemfile @@ -166,7 +166,7 @@ gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-kroki', '~> 0.5.0', require: false -gem 'rouge', '~> 3.26.1' +gem 'rouge', '~> 3.27.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.11.4' diff --git a/Gemfile.lock b/Gemfile.lock index 2f30df9186..d15a27d60e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1056,7 +1056,7 @@ GEM rexml (3.2.5) rinku (2.0.0) rotp (6.2.0) - rouge (3.26.1) + rouge (3.27.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1605,7 +1605,7 @@ DEPENDENCIES responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.2.5) - rouge (~> 3.26.1) + rouge (~> 3.27.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 5.0.1) diff --git a/VERSION b/VERSION index f8a030aae5..7d6296b6cb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.6.3 \ No newline at end of file +14.6.4 \ No newline at end of file diff --git a/app/assets/javascripts/create_item_dropdown.js b/app/assets/javascripts/create_item_dropdown.js index 1472adf458..b39720c609 100644 --- a/app/assets/javascripts/create_item_dropdown.js +++ b/app/assets/javascripts/create_item_dropdown.js @@ -1,4 +1,3 @@ -import { escape } from 'lodash'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; export default class CreateItemDropdown { @@ -37,14 +36,14 @@ export default class CreateItemDropdown { }, selectable: true, toggleLabel(selected) { - return selected && 'id' in selected ? escape(selected.title) : this.defaultToggleLabel; + return selected && 'id' in selected ? selected.title : this.defaultToggleLabel; }, fieldName: this.fieldName, text(item) { - return escape(item.text); + return item.text; }, id(item) { - return escape(item.id); + return item.id; }, onFilter: this.toggleCreateNewButton.bind(this), clicked: (options) => { diff --git a/app/assets/javascripts/notebook/cells/output/html.vue b/app/assets/javascripts/notebook/cells/output/html.vue index ca02ee18dd..2d1d8845e4 100644 --- a/app/assets/javascripts/notebook/cells/output/html.vue +++ b/app/assets/javascripts/notebook/cells/output/html.vue @@ -30,6 +30,9 @@ export default { }, safeHtmlConfig: { ADD_TAGS: ['use'], // to support icon SVGs + FORBID_TAGS: ['style'], + FORBID_ATTR: ['style'], + ALLOW_DATA_ATTR: false, }, }; diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/details/app.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/app.vue index d49c1be520..9f6b23d6cf 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/app.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/app.vue @@ -299,7 +299,7 @@ export default {