Skip to content

Commit 8b5fede

Browse files
Merge remote-tracking branch 'origin/release/12.1' into dev
2 parents 5d0524e + 0565f49 commit 8b5fede

File tree

439 files changed

+777
-1152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

439 files changed

+777
-1152
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion

app/workers/copy_project_job.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ def perform(user_id:,
6161

6262
if target_project
6363
successful_status_update
64-
ProjectMailer.copy_project_succeeded(user, source_project, target_project, errors).deliver_now
64+
ProjectMailer.copy_project_succeeded(user, source_project, target_project, errors).deliver_later
6565
else
6666
failure_status_update
67-
ProjectMailer.copy_project_failed(user, source_project, target_project_name, errors).deliver_now
67+
ProjectMailer.copy_project_failed(user, source_project, target_project_name, errors).deliver_later
6868
end
6969
rescue StandardError => e
7070
logger.error { "Failed to finish copy project job: #{e} #{e.message}" }
7171
errors = [I18n.t('copy_project.failed_internal')]
7272
failure_status_update
73-
ProjectMailer.copy_project_failed(user, source_project, target_project_name, errors).deliver_now
73+
ProjectMailer.copy_project_failed(user, source_project, target_project_name, errors).deliver_later
7474
end
7575

7676
def store_status?

config/locales/crowdin/id.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1549,7 +1549,7 @@ id:
15491549
label_feeds_access_key_type: "RSS"
15501550
label_file_plural: "File"
15511551
label_filter_add: "Tambah Filter"
1552-
label_filter_plural: "Filter"
1552+
label_filter_plural: "Penyaring"
15531553
label_filters_toggle: "Tampilkan/Sembunyikan penyaringan"
15541554
label_float: "Float"
15551555
label_folder: "Folder"

config/locales/crowdin/js-cs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ cs:
656656
membership_updated: 'Členství bylo aktualizováno'
657657
title: 'Upozornění e-mailem'
658658
pause:
659-
label: 'Dočasně pozastavit denní připomenutí e-mailem'
659+
label: 'Dočasně pozastavit denní posílání oznámení e-mailem'
660660
first_day: 'První den'
661661
last_day: 'Poslední den'
662662
text_are_you_sure: "Jste si jisti?"

docs/README.md

Lines changed: 2 additions & 5 deletions

docs/api/README.md

Lines changed: 0 additions & 1 deletion

docs/api/faq/README.md

Lines changed: 0 additions & 1 deletion

docs/bim-guide/README.md

Lines changed: 1 addition & 4 deletions
-129 KB
-212 KB

0 commit comments

Comments
 (0)