From 5487465d35110ef72c2e7cea7ef031c3ddf4dcbc Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 8 Jul 2022 00:09:36 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/gitlab/namespaced_class.yml | 1 - Gemfile | 2 +- Gemfile.lock | 4 +- .../admin/users/components/user_actions.vue | 14 ++----- app/presenters/invitation_presenter.rb | 5 --- app/views/admin/identities/index.html.haml | 1 - app/views/admin/users/_head.html.haml | 17 ++++---- ...create_async_index_on_security_findings.rb | 22 ++++++++++ db/schema_migrations/20220706115138 | 1 + doc/administration/gitaly/index.md | 42 +++++++++++++++++++ .../site_architecture/folder_structure.md | 9 ++++ doc/development/fips_compliance.md | 8 ++++ doc/gitlab-basics/add-file.md | 2 +- .../dependency_scanning/index.md | 4 +- .../vulnerabilities/index.md | 2 +- .../compliance/license_compliance/index.md | 7 +++- ...occurrences_with_hashes_as_raw_metadata.rb | 2 +- lib/gitlab/json.rb | 2 +- package.json | 2 +- .../users/components/user_actions_spec.js | 6 --- yarn.lock | 8 ++-- 21 files changed, 116 insertions(+), 45 deletions(-) delete mode 100644 app/presenters/invitation_presenter.rb create mode 100644 db/post_migrate/20220706115138_create_async_index_on_security_findings.rb create mode 100644 db/schema_migrations/20220706115138 diff --git a/.rubocop_todo/gitlab/namespaced_class.yml b/.rubocop_todo/gitlab/namespaced_class.yml index c4388379258..16727389a31 100644 --- a/.rubocop_todo/gitlab/namespaced_class.yml +++ b/.rubocop_todo/gitlab/namespaced_class.yml @@ -428,7 +428,6 @@ Gitlab/NamespacedClass: - 'app/presenters/group_clusterable_presenter.rb' - 'app/presenters/group_member_presenter.rb' - 'app/presenters/instance_clusterable_presenter.rb' - - 'app/presenters/invitation_presenter.rb' - 'app/presenters/issue_presenter.rb' - 'app/presenters/label_presenter.rb' - 'app/presenters/member_presenter.rb' diff --git a/Gemfile b/Gemfile index 3aba7d5f933..5bc681c8e27 100644 --- a/Gemfile +++ b/Gemfile @@ -537,7 +537,7 @@ gem 'valid_email', '~> 0.1' # JSON gem 'json', '~> 2.5.1' gem 'json_schemer', '~> 0.2.18' -gem 'oj', '~> 3.10.6' +gem 'oj', '~> 3.13.16' gem 'multi_json', '~> 1.14.1' gem 'yajl-ruby', '~> 1.4.1', require: 'yajl' diff --git a/Gemfile.lock b/Gemfile.lock index 2a8baaee80c..efd43a58e51 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -861,7 +861,7 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - oj (3.10.6) + oj (3.13.16) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -1633,7 +1633,7 @@ DEPENDENCIES oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 16.10) - oj (~> 3.10.6) + oj (~> 3.13.16) omniauth (~> 1.8) omniauth-alicloud (~> 1.0.1) omniauth-atlassian-oauth2 (~> 0.2.0) diff --git a/app/assets/javascripts/admin/users/components/user_actions.vue b/app/assets/javascripts/admin/users/components/user_actions.vue index 40e5f8d9d70..691a292673c 100644 --- a/app/assets/javascripts/admin/users/components/user_actions.vue +++ b/app/assets/javascripts/admin/users/components/user_actions.vue @@ -94,13 +94,13 @@ export default { :data-testid="`user-actions-${user.id}`" >
- {{ + {{ $options.i18n.edit }} @@ -108,18 +108,12 @@ export default {
- {{ - $options.i18n.userAdministration - }} -