Skip to content

Commit 8b31936

Browse files
Release OpenProject 12.0.9
2 parents 8e10842 + efee33b commit 8b31936

File tree

147 files changed

+30208
-30075
lines changed

Some content is hidden

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

147 files changed

+30208
-30075
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ GEM
345345
open4 (~> 1.3)
346346
coderay (1.1.3)
347347
colored2 (3.1.2)
348-
commonmarker (0.23.2)
348+
commonmarker (0.23.4)
349349
compare-xml (0.66)
350350
nokogiri (~> 1.8)
351351
concurrent-ruby (1.1.9)

app/workers/backup_job.rb

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,7 @@ def perform(
5353

5454
raise e
5555
ensure
56-
remove_files! db_dump_file_name, archive_file_name
57-
58-
backup.attachments.each(&:destroy) unless success?
59-
60-
Rails.logger.info(
61-
"BackupJob(include_attachments: #{include_attachments}) finished " \
62-
"with status #{job_status.status} " \
63-
"(dumped: #{dumped?}, archived: #{archived?})"
64-
)
56+
after_backup
6557
end
6658

6759
def run_backup!
@@ -77,6 +69,21 @@ def run_backup!
7769
store_backup file_name, backup: backup, user: user
7870
cleanup_previous_backups!
7971

72+
notify_backup_ready!
73+
end
74+
75+
def after_backup
76+
remove_files! db_dump_file_name, archive_file_name
77+
remove_backup_attachment! unless success?
78+
79+
Rails.logger.info(
80+
"BackupJob(include_attachments: #{include_attachments?}) finished " \
81+
"with status #{status} " \
82+
"(dumped: #{dumped?}, archived: #{archived?})"
83+
)
84+
end
85+
86+
def notify_backup_ready!
8087
UserMailer.backup_ready(user).deliver_later
8188
end
8289

@@ -88,6 +95,10 @@ def archived?
8895
@archived
8996
end
9097

98+
def status
99+
job_status.status
100+
end
101+
91102
def db_dump_file_name
92103
@db_dump_file_name ||= tmp_file_name "openproject", ".sql"
93104
end
@@ -118,6 +129,10 @@ def remove_files!(*files)
118129
end
119130
end
120131

132+
def remove_backup_attachment!
133+
backup.attachments.each(&:destroy)
134+
end
135+
121136
def store_backup(file_name, backup:, user:)
122137
File.open(file_name) do |file|
123138
call = Attachments::CreateService
@@ -228,18 +243,6 @@ def dump_command(output_file_path)
228243
"pg_dump -x -O -f '#{output_file_path}'"
229244
end
230245

231-
def success!
232-
payload = download_payload(url_helpers.backups_path(target_project))
233-
234-
if errors.any?
235-
payload[:errors] = errors
236-
end
237-
238-
upsert_status status: :success,
239-
message: I18n.t('copy_project.succeeded', target_project_name: target_project.name),
240-
payload: payload
241-
end
242-
243246
def failure!(error: nil)
244247
msg = I18n.t 'backup.failed'
245248

config/locales/crowdin/af.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -885,6 +885,7 @@ af:
885885
version: "Weergawe"
886886
work_package: "Werkspakket"
887887
backup:
888+
failed: "Backup failed"
888889
label_backup_token: "Backup token"
889890
label_create_token: "Create backup token"
890891
label_delete_token: "Delete backup token"
@@ -2844,7 +2845,7 @@ af:
28442845
wiki_menu_item_new_main_item_explanation: >
28452846
Jy is besig om die enigste hoof wiki-kieslysitem te skrap. Jy moet nou 'n wiki-blad kies waarvoor 'n nuwe hoof item gegenereer sal word. Om die wiki te skrap kan die wiki-module gedeaktiveer word deur die projekadministrateurs.
28462847
wiki_menu_item_delete_not_permitted: Die wiki-kieslysitem van die enigste wiki bladsy kan nie geskrap word nie.
2847-
query_menu_item_for: "Kieslysitem vir navraag \"%{title}\""
2848+
query_menu_item_for: "Menu item for query \"%{title}\""
28482849
#TODO: merge with work_packages top level key
28492850
work_package:
28502851
updated_automatically_by_child_changes: |

config/locales/crowdin/ar.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ ar:
161161
edit: 'تعديل إجراء مخصص %{name}'
162162
execute: 'Execute %{name}'
163163
upsale:
164-
title: 'الإجراءات المخصصة هي إحدى ميزات Enterprise Edition'
164+
title: 'Custom actions is an Enterprise Edition feature'
165165
description: 'Custom actions streamline everyday work by combining a set of individual steps into one button.'
166166
custom_fields:
167167
text_add_new_custom_field: >
@@ -905,6 +905,7 @@ ar:
905905
version: "الإصدار"
906906
work_package: "مجموعة العمل"
907907
backup:
908+
failed: "Backup failed"
908909
label_backup_token: "Backup token"
909910
label_create_token: "Create backup token"
910911
label_delete_token: "Delete backup token"
@@ -1798,7 +1799,7 @@ ar:
17981799
label_public_projects: "المشاريع العامة"
17991800
label_query_new: "استعلام جديد"
18001801
label_query_plural: "استعلامات مخصصة"
1801-
label_query_menu_item: "استعلام عنصر قائمة"
1802+
label_query_menu_item: "Query menu item"
18021803
label_read: "قراءة..."
18031804
label_register: "إنشاء حساب جديد"
18041805
label_register_with_developer: "التسجيل كمطور"
@@ -2197,7 +2198,7 @@ ar:
21972198
heading_getting_started: "Get an overview"
21982199
text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject."
21992200
text_show_again: "يمكنك إعادة تشغيل هذا الفيديو من قائمة المساعدة"
2200-
welcome: "مرحبًا بكم في أوبِن بروجِكت"
2201+
welcome: "Welcome to OpenProject"
22012202
select_language: "Please select your language"
22022203
permission_add_work_package_notes: "إضافة ملاحظات"
22032204
permission_add_work_packages: "إضافة مجموعات عمل"
@@ -2255,7 +2256,7 @@ ar:
22552256
permission_select_custom_fields: "Select custom fields"
22562257
permission_select_project_modules: "حدد وحدات المشروع"
22572258
permission_manage_types: "حدد أنواع"
2258-
permission_view_calendar: "عرض التقويم"
2259+
permission_view_calendar: "View calendar"
22592260
permission_view_changesets: "عرض مستودع التنقيحات في أوبينبروجيكت"
22602261
permission_view_commit_author_statistics: "عرض إحصائيات المؤلِّف المنفّذة"
22612262
permission_view_work_package_watchers: "عرض قائمة المراقبين"
@@ -2926,7 +2927,7 @@ ar:
29262927
wiki_menu_item_new_main_item_explanation: >
29272928
يتم حذف عنصر القائمة Wiki الرئيسي فقط. لديك الآن لاختيار صفحة wiki التي سيتم إنشاء عنصر جديد الرئيسي. لحذف صفحة wiki يمكن إلغاء تنشيط الوحدة النمطية Wiki بواسطة المسؤولين عن المشروع.
29282929
wiki_menu_item_delete_not_permitted: لا يمكن حذف عنصر القائمة ويكي لصفحة wiki فقط.
2929-
query_menu_item_for: "عنصر القائمة للاستعلام \"%{title}\""
2930+
query_menu_item_for: "Menu item for query \"%{title}\""
29302931
#TODO: merge with work_packages top level key
29312932
work_package:
29322933
updated_automatically_by_child_changes: |

config/locales/crowdin/az.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -885,6 +885,7 @@ az:
885885
version: "Version"
886886
work_package: "Work package"
887887
backup:
888+
failed: "Backup failed"
888889
label_backup_token: "Backup token"
889890
label_create_token: "Create backup token"
890891
label_delete_token: "Delete backup token"

config/locales/crowdin/bg.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -885,6 +885,7 @@ bg:
885885
version: "Версия"
886886
work_package: "Работен пакет"
887887
backup:
888+
failed: "Backup failed"
888889
label_backup_token: "Backup token"
889890
label_create_token: "Create backup token"
890891
label_delete_token: "Delete backup token"
@@ -1730,7 +1731,7 @@ bg:
17301731
label_public_projects: "Публични проекти"
17311732
label_query_new: "Ново търсене"
17321733
label_query_plural: "Потребителско търсене"
1733-
label_query_menu_item: "Търсене на елемент от менюто"
1734+
label_query_menu_item: "Query menu item"
17341735
label_read: "Прочитане..."
17351736
label_register: "Регистрирайте нов профил"
17361737
label_register_with_developer: "Регистрирайте се като разработчик"
@@ -1978,7 +1979,7 @@ bg:
19781979
mail_body_backup_waiting_period: The new token will be enabled in %{hours} hours.
19791980
mail_body_backup_token_warning: If this wasn't you, login to OpenProject immediately and reset it again.
19801981
mail_body_lost_password: "За да промените паролата си, използвайте следния линк:"
1981-
mail_body_register: "Добре дошли в OpenProject. Моля, активирайте акаунта си, като кликнете върху тази връзка:"
1982+
mail_body_register: "Welcome to OpenProject. Please activate your account by clicking on this link:"
19821983
mail_body_register_header_title: "Имейл с покана за участник в проекта"
19831984
mail_body_register_user: "Уважаеми %{name},"
19841985
mail_body_register_links_html: |
@@ -2121,7 +2122,7 @@ bg:
21212122
heading_getting_started: "Get an overview"
21222123
text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject."
21232124
text_show_again: "Можете да рестартирате това видео от менюто помощ"
2124-
welcome: "Добре дошли в OpenProject"
2125+
welcome: "Welcome to OpenProject"
21252126
select_language: "Изберете езика си"
21262127
permission_add_work_package_notes: "Добавяне на бележки"
21272128
permission_add_work_packages: "Add work packages"
@@ -2179,7 +2180,7 @@ bg:
21792180
permission_select_custom_fields: "Select custom fields"
21802181
permission_select_project_modules: "Select project modules"
21812182
permission_manage_types: "Select types"
2182-
permission_view_calendar: "Преглед на календара"
2183+
permission_view_calendar: "View calendar"
21832184
permission_view_changesets: "View repository revisions in OpenProject"
21842185
permission_view_commit_author_statistics: "View commit author statistics"
21852186
permission_view_work_package_watchers: "View watchers list"

config/locales/crowdin/ca.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ ca:
159159
edit: 'Edita l''acció personalitzada %{name}'
160160
execute: 'Executa %{name}'
161161
upsale:
162-
title: 'Accions personalitzades és una característica de l''Edició Enterprise'
162+
title: 'Custom actions is an Enterprise Edition feature'
163163
description: 'Les accions personalitzades agilitzen el treball quotidià combinant un conjunt de passos individuals en un sol botó.'
164164
custom_fields:
165165
text_add_new_custom_field: >
@@ -882,6 +882,7 @@ ca:
882882
version: "Versió"
883883
work_package: "Paquet de treball"
884884
backup:
885+
failed: "Backup failed"
885886
label_backup_token: "Backup token"
886887
label_create_token: "Create backup token"
887888
label_delete_token: "Delete backup token"
@@ -1727,7 +1728,7 @@ ca:
17271728
label_public_projects: "Projectes públics"
17281729
label_query_new: "Nova consulta"
17291730
label_query_plural: "Consultes personalitzades"
1730-
label_query_menu_item: "Element de menú de consulta"
1731+
label_query_menu_item: "Query menu item"
17311732
label_read: "Llegir..."
17321733
label_register: "Crea un nou compte"
17331734
label_register_with_developer: "Registrar com a desenvolupador"
@@ -2176,7 +2177,7 @@ ca:
21762177
permission_select_custom_fields: "Select custom fields"
21772178
permission_select_project_modules: "Selecciona els mòduls del projecte"
21782179
permission_manage_types: "Seleccioneu tipus"
2179-
permission_view_calendar: "Visualitzar calendari"
2180+
permission_view_calendar: "View calendar"
21802181
permission_view_changesets: "Veure les revisions del repositori a OpenProject"
21812182
permission_view_commit_author_statistics: "Veure les estadístiques de commits de l'autor"
21822183
permission_view_work_package_watchers: "Veure la llista d'observadors"
@@ -2839,7 +2840,7 @@ ca:
28392840
wiki_menu_item_new_main_item_explanation: >
28402841
Esteu Suprimint l'únic l'element de menú principal wiki. Ara cal triar una pàgina wiki per a la qual es generarà un nou element principal. Per suprimir la wiki, els administradors del projecte poden desactivar el mòdul wiki.
28412842
wiki_menu_item_delete_not_permitted: No es pot suprimir l'element de menú de wiki de la única pàgina wiki.
2842-
query_menu_item_for: "Element de menú per a la consulta \"%{title}\""
2843+
query_menu_item_for: "Menu item for query \"%{title}\""
28432844
#TODO: merge with work_packages top level key
28442845
work_package:
28452846
updated_automatically_by_child_changes: |

config/locales/crowdin/cs.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ cs:
161161
edit: 'Upravit vlastní akci %{name}'
162162
execute: 'Spustit %{name}'
163163
upsale:
164-
title: 'Vlastní akce pouze v Enterprise Edition'
164+
title: 'Custom actions is an Enterprise Edition feature'
165165
description: 'Vlastní akce zjednodušuje každodenní práci tím, že kombinuje několik kroků do jednoho tlačítka.'
166166
custom_fields:
167167
text_add_new_custom_field: >
@@ -260,7 +260,7 @@ cs:
260260
irreversible: "Tato akce je nevratná"
261261
confirmation: "Zadejte název zástupného uživatele %{name} pro potvrzení odstranění."
262262
upsale:
263-
title: Přiřadit práci lidem, kteří nejsou členy projektu.
263+
title: Assign work to people that are not members of the project.
264264
description: >
265265
Existuje několik scénářů, kde chcete přiřadit práci lidem, kteří nejsou členy vašeho projektu. Mohlo by se jednoduše stát, že ještě musíte najmout správnou osobu na zaměstnání. Nebo nechcete této osobě umožnit přístup k informacím o projektu, ale přesto chcete sledovat úkoly přidělené této osobě.
266266
prioritiies:
@@ -895,6 +895,7 @@ cs:
895895
version: "Verze"
896896
work_package: "Pracovní balíček"
897897
backup:
898+
failed: "Backup failed"
898899
label_backup_token: "Záložní token"
899900
label_create_token: "Vytvořit záložní token"
900901
label_delete_token: "Odstranit záložní token"
@@ -1764,7 +1765,7 @@ cs:
17641765
label_public_projects: "Veřejné projekty"
17651766
label_query_new: "Nový dotaz"
17661767
label_query_plural: "Vlastní dotazy"
1767-
label_query_menu_item: "Položka nabídky dotazu"
1768+
label_query_menu_item: "Query menu item"
17681769
label_read: "Číst..."
17691770
label_register: "Vytvořit nový účet"
17701771
label_register_with_developer: "Zaregistrovat se jako vývojář"
@@ -2014,7 +2015,7 @@ cs:
20142015
mail_body_backup_waiting_period: Nový token bude povolen za %{hours} hodin.
20152016
mail_body_backup_token_warning: Pokud jste to nebyl Vy, přihlaste se okamžitě do OpenProject a resetujte jej .
20162017
mail_body_lost_password: "Pro změnu vašeho hesla klikněte na následující odkaz:"
2017-
mail_body_register: "Vítejte v OpenProject. Aktivujte svůj účet kliknutím na tento odkaz:"
2018+
mail_body_register: "Welcome to OpenProject. Please activate your account by clicking on this link:"
20182019
mail_body_register_header_title: "E-mail pozvánka člena projektu"
20192020
mail_body_register_user: "Vážený %{name},"
20202021
mail_body_register_links_html: |
@@ -2158,7 +2159,7 @@ cs:
21582159
heading_getting_started: "Získejte přehled"
21592160
text_getting_started_description: "Získejte rychlý přehled o řízení projektu a týmové spolupráci s OpenProject."
21602161
text_show_again: "Toto video můžete restartovat z menu nápovědy"
2161-
welcome: "Vítejte v OpenProject"
2162+
welcome: "Welcome to OpenProject"
21622163
select_language: "Vyberte prosím svůj jazyk"
21632164
permission_add_work_package_notes: "Přidat poznámky"
21642165
permission_add_work_packages: "Přidat pracovní balíčky"
@@ -2216,7 +2217,7 @@ cs:
22162217
permission_select_custom_fields: "Vybrat vlastní pole"
22172218
permission_select_project_modules: "Vyberte moduly projektu"
22182219
permission_manage_types: "Vyberte typy"
2219-
permission_view_calendar: "Zobrazit kalendář"
2220+
permission_view_calendar: "View calendar"
22202221
permission_view_changesets: "Zobrazit revize repozitáře v OpenProject"
22212222
permission_view_commit_author_statistics: "Zobrazit statistiky autora commitu"
22222223
permission_view_work_package_watchers: "Zobrazit seznam sledujících"
@@ -2884,7 +2885,7 @@ cs:
28842885
wiki_menu_item_new_main_item_explanation: >
28852886
Odstraňujete jedinou hlavní položku nabídky wiki. Nyní musíte vybrat wiki stránku, pro kterou bude vytvořena nová hlavní položka. Pro odstranění wiki může být wiki modul deaktivován administrátorem projektu.
28862887
wiki_menu_item_delete_not_permitted: Položku wiki menu jediné wiki stránky nelze odstranit.
2887-
query_menu_item_for: "Položka nabídky pro dotaz \"%{title}\""
2888+
query_menu_item_for: "Menu item for query \"%{title}\""
28882889
#TODO: merge with work_packages top level key
28892890
work_package:
28902891
updated_automatically_by_child_changes: |

config/locales/crowdin/da.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ da:
159159
edit: 'Rediger brugerdefineret handling %{name}'
160160
execute: 'Udfør %{name}'
161161
upsale:
162-
title: 'Brugerdefinerede handlinger er en Enterprise Edition funktion'
162+
title: 'Custom actions is an Enterprise Edition feature'
163163
description: 'Tilpassede handlinger strømliner hverdagens arbejde ved at kombinere et sæt individuelle trin i én knap.'
164164
custom_fields:
165165
text_add_new_custom_field: >
@@ -258,7 +258,7 @@ da:
258258
irreversible: "Denne handling kan ikke fortrydes"
259259
confirmation: "Indtast pladsholderens brugernavn %{name} for at bekræfte sletningen."
260260
upsale:
261-
title: Tildel arbejde til personer, der ikke er medlemmer af projektet.
261+
title: Assign work to people that are not members of the project.
262262
description: >
263263
Der er flere scenarier, hvor du ønsker at tildele arbejde til folk, der ikke er medlem af dit projekt. Det kunne simpelthen være, at du stadig har brug for at ansætte den rigtige person til jobbet. Eller du vil bare ikke give personen adgang til projektets oplysninger, men vil stadig have spore opgaverne tildelt den pågældende person.
264264
prioritiies:
@@ -883,6 +883,7 @@ da:
883883
version: "Version"
884884
work_package: "Arbejdspakke"
885885
backup:
886+
failed: "Backup failed"
886887
label_backup_token: "Sikkerhedskopiér token"
887888
label_create_token: "Opret sikkerhedskopi token"
888889
label_delete_token: "Slet sikkerhedskopi token"
@@ -1728,7 +1729,7 @@ da:
17281729
label_public_projects: "Offentlige projekter"
17291730
label_query_new: "Ny forespørgsel"
17301731
label_query_plural: "Selvvalgte forespørgsler"
1731-
label_query_menu_item: "Punkt på forespørgselsmenu"
1732+
label_query_menu_item: "Query menu item"
17321733
label_read: "Læs..."
17331734
label_register: "Opret en ny konto"
17341735
label_register_with_developer: "Registrer dig som udvikler"
@@ -2119,7 +2120,7 @@ da:
21192120
heading_getting_started: "Get an overview"
21202121
text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject."
21212122
text_show_again: "You can restart this video from the help menu"
2122-
welcome: "Velkommen til OpenProject"
2123+
welcome: "Welcome to OpenProject"
21232124
select_language: "Please select your language"
21242125
permission_add_work_package_notes: "Tilføj noter"
21252126
permission_add_work_packages: "Tilføj arbejdspakker"
@@ -2177,7 +2178,7 @@ da:
21772178
permission_select_custom_fields: "Select custom fields"
21782179
permission_select_project_modules: "Vælg projektmoduler"
21792180
permission_manage_types: "Vælg typer"
2180-
permission_view_calendar: "Vis kalender"
2181+
permission_view_calendar: "View calendar"
21812182
permission_view_changesets: "View repository revisions in OpenProject"
21822183
permission_view_commit_author_statistics: "Vis statistik for tilknyttet forfatter"
21832184
permission_view_work_package_watchers: "Se liste over tilsynsførende"
@@ -2840,7 +2841,7 @@ da:
28402841
wiki_menu_item_new_main_item_explanation: >
28412842
Du er ved at slette det eneste overordnede punkt på wiki-menuen. Du skal nu vælge en wiki-side, udfra hvilken der kan dannes et nyt hovedpunkt. Hvis du vil slette wikien helt kan wiki-modulet deaktiveres af projektadministratorer.
28422843
wiki_menu_item_delete_not_permitted: Menupunktet til den eneste wiki-side kan ikke slettes.
2843-
query_menu_item_for: "Menupunkt for forespørgsel \"%{title}\""
2844+
query_menu_item_for: "Menu item for query \"%{title}\""
28442845
#TODO: merge with work_packages top level key
28452846
work_package:
28462847
updated_automatically_by_child_changes: |

0 commit comments

Comments
 (0)