Merge branch 'main' into fix-16914-allow-basic-authentication-to-releases-download

zeripath · web-flow · commit 1811918c0de1 · 2021-09-02T06:51:28.000+01:00
diff --git a/options/locale/locale_bg-BG.ini b/options/locale/locale_bg-BG.ini
@@ -789,7 +789,6 @@ pulls.no_merge_helper=Включете опции за сливане в нас
 pulls.no_merge_wip=Тази заявка за сливане не може да бъде обединена, защото е отбелязана като работа в прогрес.
 ; </summary><code>%[2]s<br>%[3]s</code></details>
 pulls.status_checks_success=Всички проверявания бяха успешни
-pulls.update_branch=Осъвременяване на клона
 
 
 milestones.new=Нов етап
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
@@ -1423,7 +1423,6 @@ pulls.status_checks_failure=Některé kontroly se nezdařily
 pulls.status_checks_error=Některé kontroly nahlásily chyby
 pulls.status_checks_requested=Požadováno
 pulls.status_checks_details=Podrobnosti
-pulls.update_branch=Aktualizovat větev
 pulls.update_branch_success=Aktualizace větve byla úspěšná
 pulls.update_not_allowed=Nemáte oprávnění aktualizovat větev
 pulls.outdated_with_base_branch=Tato větev je zastaralá oproti základní větvi
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
@@ -1468,7 +1468,6 @@ pulls.status_checks_failure=Einige Prüfungen sind fehlgeschlagen
 pulls.status_checks_error=Einige Checks meldeten Fehler
 pulls.status_checks_requested=Erforderlich
 pulls.status_checks_details=Details
-pulls.update_branch=Branch aktualisieren
 pulls.update_branch_success=Branch-Aktualisierung erfolgreich
 pulls.update_not_allowed=Du hast keine Berechtigung, die Branch zu Updaten
 pulls.outdated_with_base_branch=Dieser Branch enthält nicht die neusten Commits der Basis-Branch
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
@@ -1459,7 +1459,6 @@ pulls.status_checks_failure=Algunas comprobaciones han fallado
 pulls.status_checks_error=Algunas comprobaciones reportaron errores
 pulls.status_checks_requested=Obligatorio
 pulls.status_checks_details=Detalles
-pulls.update_branch=Actualizar rama
 pulls.update_branch_success=La actualización de la rama ha finalizado correctamente
 pulls.update_not_allowed=No tiene permisos para actualizar esta rama
 pulls.outdated_with_base_branch=Esta rama está desactualizada con la rama base
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
@@ -1168,7 +1168,6 @@ pulls.merge_out_of_date=ادغام ناموفق: در حالی که ادغام 
 pulls.open_unmerged_pull_exists=`شما نمی‌توانید یک عملیات را انجام داده یا بازگشایی نمایید لذا (#%d)  مورد تقاضای واکشی با ویژگی منحصر به فرد هنوز رسیدگی نشده (معلق) است. `
 pulls.status_checking=برخی از بررسی‎ها در حال تعلیق هستند
 pulls.status_checks_success=تمامی بررسی‎ها موفق بودند
-pulls.update_branch=بروزرسانی شاخه
 pulls.update_branch_success=شاخه به موفقیت بروز شد
 
 
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
@@ -1399,7 +1399,6 @@ pulls.status_checks_failure=Certaines vérifications ont échoué
 pulls.status_checks_error=Quelques vérifications ont signalé des erreurs
 pulls.status_checks_requested=Requis
 pulls.status_checks_details=Détails
-pulls.update_branch=Mettre à jour la branche
 pulls.update_branch_success=La mise à jour de la branche a réussi
 pulls.update_not_allowed=Vous n'êtes pas autorisé à mettre à jour la branche
 pulls.outdated_with_base_branch=Cette branche est désynchronisée avec la branche de base
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
@@ -1282,7 +1282,6 @@ pulls.status_checks_failure=Alcuni controlli sono falliti
 pulls.status_checks_error=Alcuni controlli hanno segnalato errori
 pulls.status_checks_requested=Richiesto
 pulls.status_checks_details=Dettagli
-pulls.update_branch=Aggiorna branch
 pulls.update_branch_success=Brench aggiornato con successo
 pulls.update_not_allowed=Non sei abilitato ad aggiornare il branch
 pulls.outdated_with_base_branch=Questo brench non è aggiornato con il branch di base
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
@@ -1468,7 +1468,6 @@ pulls.status_checks_failure=失敗したステータスチェックがありま
 pulls.status_checks_error=ステータスチェックによりエラーが出ています
 pulls.status_checks_requested=必須
 pulls.status_checks_details=詳細
-pulls.update_branch=ブランチを更新
 pulls.update_branch_success=ブランチの更新が成功しました
 pulls.update_not_allowed=ブランチを更新する権限がありません
 pulls.outdated_with_base_branch=このブランチはベースブランチに対して最新ではありません
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
@@ -1451,7 +1451,6 @@ pulls.status_checks_failure=Dažas pārbaudes neizdevās izpildīt
 pulls.status_checks_error=Dažu pārbaužu izpildes laikā, radās kļūdas
 pulls.status_checks_requested=Obligāts
 pulls.status_checks_details=Papildu informācija
-pulls.update_branch=Atjaunot atzaru
 pulls.update_branch_success=Atzara atjaunināšana veiksmīgi pabeigta
 pulls.update_not_allowed=Jums nav tiesību veikt atzara atjaunošanu
 pulls.outdated_with_base_branch=Atzars ir novecojis salīdzinot ar bāzes atzaru
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
@@ -1278,7 +1278,6 @@ pulls.status_checks_failure=Sommige controles zijn mislukt
 pulls.status_checks_error=Sommige controles hebben foutmeldingen gerapporteerd
 pulls.status_checks_requested=Vereist
 pulls.status_checks_details=Details
-pulls.update_branch=Update branch
 pulls.update_branch_success=Branch update is geslaagd
 pulls.update_not_allowed=Je hebt geen toestemming om branch bij te werken
 pulls.outdated_with_base_branch=Deze branch is verouderd met de basis branch
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
@@ -1194,7 +1194,6 @@ pulls.status_checks_success=Wszystkie etapy powiodły się
 pulls.status_checks_warning=Niektóre etapy zgłosiły ostrzeżenia
 pulls.status_checks_failure=Niektóre etapy nie powiodły się
 pulls.status_checks_error=Niektóre etapy zgłosiły błędy
-pulls.update_branch=Zaktualizuj gałąź
 pulls.update_branch_success=Aktualizacja gałęzi powiodła się
 pulls.update_not_allowed=Nie masz uprawnień do aktualizacji gałęzi
 pulls.outdated_with_base_branch=Ta gałąź jest przestarzała w stosunku do gałęzi bazowej
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
@@ -1361,7 +1361,6 @@ pulls.status_checks_failure=Algumas verificações falharam
 pulls.status_checks_error=Algumas verificações reportaram erros
 pulls.status_checks_requested=Obrigatário
 pulls.status_checks_details=Detalhes
-pulls.update_branch=Atualizar branch
 pulls.update_branch_success=Atualização da branch foi bem-sucedida
 pulls.update_not_allowed=Você não tem permissão para atualizar a branch
 pulls.outdated_with_base_branch=Esta branch está desatualizado com a branch base
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
@@ -1468,7 +1468,8 @@ pulls.status_checks_failure=Algumas verificações falharam
 pulls.status_checks_error=Algumas verificações reportaram erros
 pulls.status_checks_requested=Obrigatório
 pulls.status_checks_details=Detalhes
-pulls.update_branch=Sincronizar ramo
+pulls.update_branch=Modificar ramo executando a integração
+pulls.update_branch_rebase=Modificar ramo mudando a base
 pulls.update_branch_success=A sincronização do ramo foi bem sucedida
 pulls.update_not_allowed=Não tem autorização para sincronizar o ramo
 pulls.outdated_with_base_branch=Este ramo é obsoleto em relação ao ramo base
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
@@ -1449,7 +1449,6 @@ pulls.status_checks_failure=Некоторые проверки не удали
 pulls.status_checks_error=Некоторые проверки сообщили об ошибках
 pulls.status_checks_requested=Требуется
 pulls.status_checks_details=Информация
-pulls.update_branch=Обновить ветку
 pulls.update_branch_success=Обновление ветки выполнено успешно
 pulls.update_not_allowed=У вас недостаточно прав для обновления ветки
 pulls.outdated_with_base_branch=Эта ветка отстает от базовой ветки
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
@@ -1198,7 +1198,6 @@ pulls.invalid_merge_option=Du kan inte använda detta mergealternativet för den
 ; </summary><code>%[2]s<br>%[3]s</code></details>
 pulls.push_rejected_no_message=Sammanfogningen misslyckades: Push-förfrågan avvisades, men utan något meddelande från fjärrvärden.<br>Granska githookarna för denna utvecklingskatalog
 pulls.open_unmerged_pull_exists=`Du kan inte återuppliva denna pull-request då det redan finns en identisk pull-request öppen (#%d).`
-pulls.update_branch=Uppdatera branch
 pulls.update_branch_success=Uppdatering av branchen lyckades
 pulls.outdated_with_base_branch=Denna branch är föråldrad gentemot bas-branchen
 
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
@@ -1440,7 +1440,6 @@ pulls.status_checks_failure=Bazı kontroller başarısız oldu
 pulls.status_checks_error=Bazı kontroller hatalar bildirdi
 pulls.status_checks_requested=Gerekli
 pulls.status_checks_details=Ayrıntılar
-pulls.update_branch=Dalı güncelle
 pulls.update_branch_success=Dal güncellemesi başarıyla gerçekleştirildi
 pulls.update_not_allowed=Dalı güncelleme izniniz yok
 pulls.outdated_with_base_branch=Bu dal, temel dal ile güncel değil
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
@@ -1431,7 +1431,6 @@ pulls.status_checks_failure=Декілька перевірок не були у
 pulls.status_checks_error=Декілька перевірок завершилися з помилками
 pulls.status_checks_requested=Обов'язково
 pulls.status_checks_details=Подробиці
-pulls.update_branch=Оновити гілку
 pulls.update_branch_success=Оновлення гілки пройшло успішно
 pulls.update_not_allowed=Ви не можете оновити гілку
 pulls.outdated_with_base_branch=Ця гілка застаріла відносно базової гілки
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
@@ -1451,7 +1451,6 @@ pulls.status_checks_failure=一些检查失败了
 pulls.status_checks_error=一些检查报告了错误
 pulls.status_checks_requested=必须
 pulls.status_checks_details=详情
-pulls.update_branch=更新分支
 pulls.update_branch_success=分支更新成功
 pulls.update_not_allowed=您无权更新分支
 pulls.outdated_with_base_branch=此分支相比基础分支已过期
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
@@ -1468,7 +1468,6 @@ pulls.status_checks_failure=一些檢查失敗了
 pulls.status_checks_error=一些檢查回報了錯誤
 pulls.status_checks_requested=必要
 pulls.status_checks_details=詳情
-pulls.update_branch=更新分支
 pulls.update_branch_success=分支更新成功
 pulls.update_not_allowed=您無權更新分支
 pulls.outdated_with_base_branch=相對於基底分支，此分支已過時
diff --git a/web_src/js/index.js b/web_src/js/index.js
@@ -1030,7 +1030,7 @@ async function initRepository() {
         if ($dropzone.length === 1) {
           $dropzone.data('saved', false);
 
-          const filenameDict = {};
+          const fileUuidDict = {};
           dz = await createDropzone($dropzone[0], {
             url: $dropzone.data('upload-url'),
             headers: {'X-Csrf-Token': csrf},
@@ -1048,28 +1048,24 @@ async function initRepository() {
             thumbnailHeight: 480,
             init() {
               this.on('success', (file, data) => {
-                filenameDict[file.name] = {
-                  uuid: data.uuid,
+                fileUuidDict[file.uuid] = {
                   submitted: false
                 };
                 const input = $(`<input id="${data.uuid}" name="files" type="hidden">`).val(data.uuid);
                 $dropzone.find('.files').append(input);
               });
               this.on('removedfile', (file) => {
-                if (!(file.name in filenameDict)) {
-                  return;
-                }
-                $(`#${filenameDict[file.name].uuid}`).remove();
-                if ($dropzone.data('remove-url') && !filenameDict[file.name].submitted) {
+                $(`#${file.uuid}`).remove();
+                if ($dropzone.data('remove-url') && !fileUuidDict[file.uuid].submitted) {
                   $.post($dropzone.data('remove-url'), {
-                    file: filenameDict[file.name].uuid,
+                    file: file.uuid,
                     _csrf: csrf,
                   });
                 }
               });
               this.on('submit', () => {
-                $.each(filenameDict, (name) => {
-                  filenameDict[name].submitted = true;
+                $.each(fileUuidDict, (fileUuid) => {
+                  fileUuidDict[fileUuid].submitted = true;
                 });
               });
               this.on('reload', () => {
@@ -1082,9 +1078,8 @@ async function initRepository() {
                     dz.emit('thumbnail', this, imgSrc);
                     dz.emit('complete', this);
                     dz.files.push(this);
-                    filenameDict[this.name] = {
+                    fileUuidDict[this.uuid] = {
                       submitted: true,
-                      uuid: this.uuid
                     };
                     $dropzone.find(`img[src='${imgSrc}']`).css('max-width', '100%');
                     const input = $(`<input id="${this.uuid}" name="files" type="hidden">`).val(this.uuid);
@@ -2695,7 +2690,6 @@ $(document).ready(async () => {
 
   // Dropzone
   for (const el of document.querySelectorAll('.dropzone')) {
-    const filenameDict = {};
     const $dropzone = $(el);
     await createDropzone(el, {
       url: $dropzone.data('upload-url'),
@@ -2713,18 +2707,15 @@ $(document).ready(async () => {
       thumbnailWidth: 480,
       thumbnailHeight: 480,
       init() {
-        this.on('success', (file, data) => {
-          filenameDict[file.name] = data.uuid;
+        this.on('success', (_file, data) => {
           const input = $(`<input id="${data.uuid}" name="files" type="hidden">`).val(data.uuid);
           $dropzone.find('.files').append(input);
         });
         this.on('removedfile', (file) => {
-          if (file.name in filenameDict) {
-            $(`#${filenameDict[file.name]}`).remove();
-          }
+          $(`#${file.uuid}`).remove();
           if ($dropzone.data('remove-url')) {
             $.post($dropzone.data('remove-url'), {
-              file: filenameDict[file.name],
+              file: file.uuid,
               _csrf: csrf
             });
           }
