diff --git a/app/assets/javascripts/issuable/components/issue_assignees.vue b/app/assets/javascripts/issuable/components/issue_assignees.vue index 5955f31fc70..21f35690f6d 100644 --- a/app/assets/javascripts/issuable/components/issue_assignees.vue +++ b/app/assets/javascripts/issuable/components/issue_assignees.vue @@ -91,7 +91,7 @@ export default { data-qa-selector="assignee_link" > - {{ __('Assignee') }} {{ assignee.name }} + {{ s__('Label|Assignee') }} {{ assignee.name }} @{{ assignee.username }} diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index 2a58ee7a868..f1525ed9763 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -160,10 +160,9 @@ module Projects # # rubocop: disable CodeReuse/ActiveRecord def destroy_mr_diff_relations! - mr_batch_size = 100 delete_batch_size = 1000 - project.merge_requests.each_batch(column: :iid, of: mr_batch_size) do |relation_ids| + project.merge_requests.each_batch(column: :iid, of: BATCH_SIZE) do |relation_ids| [MergeRequestDiffCommit, MergeRequestDiffFile].each do |model| loop do inner_query = model @@ -184,13 +183,12 @@ module Projects # rubocop: disable CodeReuse/ActiveRecord def destroy_merge_request_diffs! - mr_batch_size = 100 delete_batch_size = 1000 - project.merge_requests.each_batch(column: :iid, of: mr_batch_size) do |relation_ids| + project.merge_requests.each_batch(column: :iid, of: BATCH_SIZE) do |relation| loop do deleted_rows = MergeRequestDiff - .where(merge_request_id: relation_ids) + .where(merge_request: relation) .limit(delete_batch_size) .delete_all diff --git a/app/views/notify/send_admin_notification.html.haml b/app/views/notify/send_admin_notification.html.haml index f7f1528f332..20c44df360c 100644 --- a/app/views/notify/send_admin_notification.html.haml +++ b/app/views/notify/send_admin_notification.html.haml @@ -3,5 +3,5 @@ \---- %p - Don't want to receive updates from GitLab administrators? - = link_to 'Unsubscribe', @unsubscribe_url + = s_("Notify|Don't want to receive updates from GitLab administrators?") + = link_to _('Unsubscribe'), @unsubscribe_url diff --git a/config/application.rb b/config/application.rb index d28967f2966..8c5bb7fe110 100644 --- a/config/application.rb +++ b/config/application.rb @@ -264,7 +264,6 @@ module Gitlab config.assets.precompile << "page_bundles/cycle_analytics.css" config.assets.precompile << "page_bundles/dashboard_projects.css" config.assets.precompile << "page_bundles/dev_ops_reports.css" - config.assets.precompile << "page_bundles/environments.css" config.assets.precompile << "page_bundles/epics.css" config.assets.precompile << "page_bundles/error_tracking_details.css" config.assets.precompile << "page_bundles/error_tracking_index.css" diff --git a/doc/administration/audit_event_streaming.md b/doc/administration/audit_event_streaming.md index 59cb0282a9e..33142f31f8e 100644 --- a/doc/administration/audit_event_streaming.md +++ b/doc/administration/audit_event_streaming.md @@ -317,7 +317,7 @@ FLAG: On self-managed GitLab, by default this feature is available. To hide the feature, ask an administrator to [disable the feature flag](feature_flags.md) named `audit_event_streaming_git_operations`. -Streaming audit events can be sent when signed-in users push or pull a project's remote Git repositories: +Streaming audit events can be sent when signed-in users push, pull, or clone a project's remote Git repositories: - [Using SSH](../user/ssh.md). - Using HTTP or HTTPS. diff --git a/doc/api/group_repository_storage_moves.md b/doc/api/group_repository_storage_moves.md index 1b3940479bb..f1ad7f51ea0 100644 --- a/doc/api/group_repository_storage_moves.md +++ b/doc/api/group_repository_storage_moves.md @@ -194,6 +194,11 @@ Example response: ## Schedule a repository storage move for a group +Schedules a repository storage move for a group. This endpoint: + +- Moves only group Wiki repositories. +- Doesn't move repositories for projects in a group. To schedule project moves, use the [Project repository storage moves](project_repository_storage_moves.md) API. + ```plaintext POST /groups/:group_id/repository_storage_moves ``` diff --git a/locale/gitlab.pot b/locale/gitlab.pot index bed17f1e9fb..a2c4d167ee5 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -23037,6 +23037,9 @@ msgstr "" msgid "Labels|Promoting %{labelTitle} will make it available for all projects inside %{groupName}. Existing project labels with the same title will be merged. If a group label with the same title exists, it will also be merged. This action cannot be reversed." msgstr "" +msgid "Label|Assignee" +msgstr "" + msgid "Language" msgstr "" @@ -26862,6 +26865,9 @@ msgstr "" msgid "Notify|CI/CD project settings" msgstr "" +msgid "Notify|Don't want to receive updates from GitLab administrators?" +msgstr "" + msgid "Notify|Fingerprint: %{fingerprint}" msgstr ""