From 4ebdcbc5df17afe3b88237386c8c923ae07a68b4 Mon Sep 17 00:00:00 2001 From: Alex Ward Date: Tue, 20 Mar 2018 21:39:14 +0000 Subject: [PATCH 01/17] Fix style of "In your repositories" when selected (#3699) Signed-off-by: Alex Ward --- routers/repo/issue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index a63572d5b..234937b1a 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -111,7 +111,7 @@ func Issues(ctx *context.Context) { viewType := ctx.Query("type") sortType := ctx.Query("sort") - types := []string{"all", "assigned", "created_by", "mentioned"} + types := []string{"all", "your_repositories", "assigned", "created_by", "mentioned"} if !com.IsSliceContainsStr(types, viewType) { viewType = "all" } From 05abd030112907e0c791c832adf2643c05a6d053 Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Tue, 20 Mar 2018 21:40:24 +0000 Subject: [PATCH 02/17] [skip ci] Updated translations via Crowdin --- options/locale/locale_de-DE.ini | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index cc44c25f3..86c5bc313 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -639,13 +639,13 @@ issues.label_templates.use=Dieses Label Set benutzen issues.label_templates.fail_to_load_file=Fehler beim Laden der Label Template Datei '%s': %v issues.add_label_at=hat das
%s
-Label %s hinzugefügt issues.remove_label_at=hat das
%s
-Label %s entfernt -issues.add_milestone_at=`fügte das Issue zum %s Meilenstein hinzu %s` -issues.change_milestone_at=`änderte den Meilenstein von %s zu %s %s` -issues.remove_milestone_at=`entfernte das Issue vom %s Meilenstein %s` +issues.add_milestone_at=`hat diesen Issue %[2]s zum %[1]s Meilenstein hinzugefügt` +issues.change_milestone_at=`hat den Meilenstein %[3]s von %[1]s zu %[2]s geändert` +issues.remove_milestone_at=`hat diesen Issue %[2]s vom %[1]s Meilenstein entfernt` issues.deleted_milestone=`(gelöscht)` -issues.self_assign_at=`wies sich das Issue selbst zu %s` -issues.add_assignee_at=`wurde zugewiesen von %s %s` -issues.remove_assignee_at=`entfernte seine Zuweisung %s` +issues.self_assign_at=`hat sich das Issue %s selbst zugewiesen` +issues.add_assignee_at=`wurde %s zugewiesen von %s` +issues.remove_assignee_at=`hat seine Zuweisung %s entfernt` issues.change_title_at=`Titel von %s nach %s %s geändert` issues.delete_branch_at=`löschte die Branch %s %s` issues.open_tab=%d offen @@ -675,14 +675,14 @@ issues.action_milestone=Meilenstein issues.action_milestone_no_select=Kein Meilenstein issues.action_assignee=Zuständig issues.action_assignee_no_select=Niemand zuständig -issues.opened_by=%[1]s geöffnet von %[3]s +issues.opened_by=%[1]s von %[3]s geöffnet issues.opened_by_fake=geöffnet %[1]s von %[2]s issues.previous=Vorherige issues.next=Nächste issues.open_title=Offen issues.closed_title=Geschlossen issues.num_comments=%d Kommentare -issues.commented_at=`kommentierte %s` +issues.commented_at=`hat %s kommentiert` issues.delete_comment_confirm=Bist du sicher dass du diesen Kommentar löschen möchtest? issues.no_content=Hier gibt es bis jetzt noch keinen Inhalt. issues.close_issue=Schließen @@ -722,20 +722,20 @@ issues.subscribe=Abonnieren issues.unsubscribe=Abbestellen issues.tracker=Zeiterfassung issues.start_tracking_short=Start -issues.start_tracking=Starte Zeiterfassungsstopuhr -issues.start_tracking_history=begann zu arbeiten %s +issues.start_tracking=Starte Zeiterfassung +issues.start_tracking_history=hat die Zeiterfassung %s gestartet issues.tracking_already_started=`Du hast die Zeiterfassung bereits in diesem Issue gestartet!` issues.stop_tracking=Stopp -issues.stop_tracking_history=stoppte zu arbeiten %s +issues.stop_tracking_history=hat die Zeiterfassung %s angehalten issues.add_time=Zeit manuell hinzufügen issues.add_time_short=Hinzufügen issues.add_time_cancel=Abbrechen -issues.add_time_history=fügte gearbeitete Zeit hinzu %s +issues.add_time_history=hat %s gearbeitete Zeit hinzugefügt issues.add_time_hours=Stunden issues.add_time_minutes=Minuten issues.add_time_sum_to_small=Es wurde keine Zeit eingetragen issues.cancel_tracking=Abbrechen -issues.cancel_tracking_history=brach die Zeiterfassung ab %s +issues.cancel_tracking_history=hat die Zeiterfassung %s abgebrochen issues.time_spent_total=Insgesamt gearbeitete Zeit pulls.desc=Pull-Requests helfen dir deinen Code zu überprüfen und neuen Code mit der Codebasis zusammenzuführen. From e64aa18dc97f2cf25bc642c7d987a4a3bed494ac Mon Sep 17 00:00:00 2001 From: Chri-s Date: Wed, 21 Mar 2018 19:12:49 +0100 Subject: [PATCH 03/17] Change protected branch settings title to existing locale entry (#3694) --- routers/repo/setting_protected_branch.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/setting_protected_branch.go b/routers/repo/setting_protected_branch.go index b8ff6d6ec..ac1017b91 100644 --- a/routers/repo/setting_protected_branch.go +++ b/routers/repo/setting_protected_branch.go @@ -98,7 +98,7 @@ func SettingsProtectedBranch(c *context.Context) { return } - c.Data["Title"] = c.Tr("repo.settings.protected_branches") + " - " + branch + c.Data["Title"] = c.Tr("repo.settings.protected_branch") + " - " + branch c.Data["PageIsSettingsBranches"] = true protectBranch, err := models.GetProtectedBranchBy(c.Repo.Repository.ID, branch) From 2dc6f15eca007105fb6c3972265e6da53696bdf1 Mon Sep 17 00:00:00 2001 From: Gerben Date: Fri, 23 Mar 2018 15:10:42 +0100 Subject: [PATCH 04/17] Don't warn users about *every* dirty form (#3707) The choice regarding which forms should or should not trigger a warning is subjective. I tried to be consistent and not warn about forms that: - run an action, rather than edit data: search, send an email. - delete data: a warning about losing data would be confusing Note that forms on sign-in pages were already ignored (using a selector, rather than an explicit class on the form element). Fixes #3698. --- public/js/index.js | 7 +++++-- templates/admin/base/search.tmpl | 2 +- templates/admin/config.tmpl | 2 +- templates/explore/code.tmpl | 2 +- templates/explore/search.tmpl | 2 +- templates/org/settings/delete.tmpl | 2 +- templates/repo/commits_table.tmpl | 2 +- templates/repo/home.tmpl | 2 +- templates/repo/issue/search.tmpl | 2 +- templates/repo/search.tmpl | 2 +- templates/user/auth/activate.tmpl | 2 +- templates/user/auth/forgot_passwd.tmpl | 2 +- templates/user/auth/reset_passwd.tmpl | 2 +- templates/user/settings/applications.tmpl | 2 +- templates/user/settings/delete.tmpl | 2 +- 15 files changed, 19 insertions(+), 16 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index 1e795a504..8b3d7c3d7 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1663,8 +1663,11 @@ function selectRange($list, $select, $from) { } $(function () { - if ($('.user.signin').length > 0) return; - $('form').areYouSure(); + // Warn users that try to leave a page after entering data into a form. + // Except on sign-in pages, and for forms marked as 'ignore-dirty'. + if ($('.user.signin').length === 0) { + $('form:not(.ignore-dirty)').areYouSure(); + } // Parse SSH Key $("#ssh-key-content").on('change paste keyup',function(){ diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl index 749e42af2..7d23e51c8 100644 --- a/templates/admin/base/search.tmpl +++ b/templates/admin/base/search.tmpl @@ -17,7 +17,7 @@ -
+
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index fd9f4f330..7c353ad30 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -185,7 +185,7 @@ {{end}}
{{.i18n.Tr "admin.config.mailer_user"}}
{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}

- + {{.CsrfTokenHtml}}
diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl index 600348621..742ed5944 100644 --- a/templates/explore/code.tmpl +++ b/templates/explore/code.tmpl @@ -2,7 +2,7 @@
{{template "explore/navbar" .}}
- +
diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 6f37bcb23..906dd06ca 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -15,7 +15,7 @@
- +
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index dc1858e5c..3b0ee09b1 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -13,7 +13,7 @@

{{.i18n.Tr "org.settings.delete_prompt" | Str2html}}

- + {{.CsrfTokenHtml}}
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 4503976e0..8a8e2c369 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -5,7 +5,7 @@
{{if .PageIsCommits}} - +
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 91db56c98..9f705c967 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -10,7 +10,7 @@
{{if .RepoSearchEnabled}}
- +
diff --git a/templates/repo/issue/search.tmpl b/templates/repo/issue/search.tmpl index 5e0f9a562..522bced3c 100644 --- a/templates/repo/issue/search.tmpl +++ b/templates/repo/issue/search.tmpl @@ -1,4 +1,4 @@ - +
diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl index 3ddc5de86..c4413e788 100644 --- a/templates/repo/search.tmpl +++ b/templates/repo/search.tmpl @@ -3,7 +3,7 @@ {{template "repo/header" .}}
- +
+
+ +
+ {{end}} + {{if .IsRepositoryOwner}}

{{.i18n.Tr "repo.settings.danger_zone"}} From 4c6e170ceb56a8c316e523dd44137fa02ca29735 Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Tue, 27 Mar 2018 14:14:57 +0000 Subject: [PATCH 10/17] [skip ci] Updated translations via Crowdin --- options/locale/locale_de-DE.ini | 6 +++--- options/locale/locale_hu-HU.ini | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 12507c007..e4d3d1560 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -1022,11 +1022,11 @@ settings.protected_branch_can_push_no=Du kannst nicht pushen settings.branch_protection=Branch-Protection für %s settings.protect_this_branch=Diese Branch schützen settings.protect_this_branch_desc=Verhindere Force-Pushes sowie Löschungen. -settings.protect_whitelist_committers=Erlaube wer in diese Branch pushen kann +settings.protect_whitelist_committers=Erlaube, wer in diese Branch pushen kann settings.protect_whitelist_committers_desc=Füge Benutzer oder Teams zur Whitelist hinzu. Benutzer auf der Whitelist können Push-Restriktionen umgehen. -settings.protect_whitelist_users=Benutzer, die in diese Branch pushen können +settings.protect_whitelist_users=Benutzer, die in diese Branch pushen dürfen settings.protect_whitelist_search_users=Benutzer suchen -settings.protect_whitelist_teams=Teams, deren Mitglieder in diese Branch pushen können. +settings.protect_whitelist_teams=Teams, deren Mitglieder in diese Branch pushen dürfen settings.protect_whitelist_search_teams=Teams suchen settings.add_protected_branch=Schutz aktivieren settings.delete_protected_branch=Schutz deaktivieren diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini index 4261d5cfc..3765b8847 100644 --- a/options/locale/locale_hu-HU.ini +++ b/options/locale/locale_hu-HU.ini @@ -1028,6 +1028,10 @@ settings.protect_whitelist_users=Felhasználók, akik push-olhatnak az ágra settings.protect_whitelist_search_users=Felhasználók keresése settings.protect_whitelist_teams=Csoportok, melyeknek tagjai pusholhatnak az ágra. settings.protect_whitelist_search_teams=Csoportok keresése +settings.protect_merge_whitelist_committers=Korlátozza mely felhasználók egyesíthetnek más ágakat ebbe +settings.protect_merge_whitelist_committers_desc=Felhasználók vagy csapatok hozzáadása, akik egyesíthetnek más ágakat ebbe. Ha nincsen beállítva, bárki aki rendelkezik hozzáféréssel egyesíthet. +settings.protect_merge_whitelist_users=Felhasználók, akik egyesíthetnek más ágakat ebbe +settings.protect_merge_whitelist_teams=Korlátozza mely csapatok egyesíthetnek más ágakat ebbe settings.add_protected_branch=Védelem engedélyezése settings.delete_protected_branch=Védelem letiltása settings.update_protect_branch_success=%s ág védelme opciók sikeresen módosítva. From ab5cc6f3a9f2228cefa29b8535492ddacdd99616 Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Thu, 29 Mar 2018 04:39:51 +0300 Subject: [PATCH 11/17] Correctly check http git access rights for reverse proxy authorized users (#3721) --- routers/repo/http.go | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/routers/repo/http.go b/routers/repo/http.go index 08ccf3ed6..e4e26e4f0 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -184,33 +184,33 @@ func HTTP(ctx *context.Context) { return } } + } - if !isPublicPull { - has, err := models.HasAccess(authUser.ID, repo, accessMode) - if err != nil { - ctx.ServerError("HasAccess", err) - return - } else if !has { - if accessMode == models.AccessModeRead { - has, err = models.HasAccess(authUser.ID, repo, models.AccessModeWrite) - if err != nil { - ctx.ServerError("HasAccess2", err) - return - } else if !has { - ctx.HandleText(http.StatusForbidden, "User permission denied") - return - } - } else { + if !isPublicPull { + has, err := models.HasAccess(authUser.ID, repo, accessMode) + if err != nil { + ctx.ServerError("HasAccess", err) + return + } else if !has { + if accessMode == models.AccessModeRead { + has, err = models.HasAccess(authUser.ID, repo, models.AccessModeWrite) + if err != nil { + ctx.ServerError("HasAccess2", err) + return + } else if !has { ctx.HandleText(http.StatusForbidden, "User permission denied") return } - } - - if !isPull && repo.IsMirror { - ctx.HandleText(http.StatusForbidden, "mirror repository is read-only") + } else { + ctx.HandleText(http.StatusForbidden, "User permission denied") return } } + + if !isPull && repo.IsMirror { + ctx.HandleText(http.StatusForbidden, "mirror repository is read-only") + return + } } if !repo.CheckUnitUser(authUser.ID, authUser.IsAdmin, unitType) { From a8beef890dc6aa9262442969ae6d14c53282025b Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Thu, 29 Mar 2018 01:41:06 +0000 Subject: [PATCH 12/17] [skip ci] Updated translations via Crowdin --- options/locale/locale_hu-HU.ini | 2 ++ options/locale/locale_nl-NL.ini | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini index 3765b8847..5f0c520af 100644 --- a/options/locale/locale_hu-HU.ini +++ b/options/locale/locale_hu-HU.ini @@ -910,6 +910,8 @@ settings.pulls.ignore_whitespace=A whitespace-ek figyelmen kívül hagyása az settings.pulls.allow_merge_commits=Egyesítési commit engedélyezése settings.pulls.allow_rebase_merge=Rebase engedélyezése egyesítésnél settings.pulls.allow_squash_commits=Squash engedélyezése egyesítés előtt +settings.admin_settings=Rendszergazdai Beállítások +settings.admin_enable_health_check=Ellenőrzések (git fsck) engedélyezése settings.danger_zone=Veszélyes terület settings.new_owner_has_same_repo=Az új tulajdonos már rendelkezik ilyen nevű tárolóval. Kérjük válasszon egy másik nevet. settings.convert=Hagyományos tárolóvá alakítás diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index 94b7be1e8..1bd03b297 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -169,9 +169,11 @@ repos=Repositories users=Gebruikers organizations=Organisaties search=Zoeken +code=Code repo_no_results=Er zijn geen overeenkomende repositories gevonden. user_no_results=Er zijn geen overeenkomende gebruikers gevonden. org_no_results=Er zijn geen overeenkomende organisaties gevonden. +code_search_results=Zoekresultaten voor ‘%s’ [auth] create_new_account=Account aanmaken @@ -610,8 +612,11 @@ issues.new.closed_milestone=Gesloten mijlpalen issues.new.assignee=Toegewezen aan issues.new.clear_assignee=Verwijder verantwoordelijke issues.new.no_assignee=Geen verantwoordelijke +issues.no_ref=Geen Branch/Tag gespecificeerd issues.create=Maak probleem issues.new_label=Nieuw Label +issues.new_label_placeholder=Labelnaam… +issues.new_label_desc_placeholder=Omschrijving… issues.create_label=Maak label issues.label_templates.title=Laad een vooraf gedefinieerde set labels issues.label_templates.helper=Selecteer een labelset @@ -620,6 +625,7 @@ issues.change_milestone_at='mijlpaal bewerkt van %s %s %s' issues.remove_milestone_at=' %s is verwijderd uit de %s mijlpaal' issues.deleted_milestone=` (verwijderd)` issues.add_assignee_at=`was toegekend door %s %s` +issues.change_title_at='titel aangepast van %s naar %s %s' issues.open_tab=%d Open issues.close_tab=%d gesloten issues.filter_label=Label @@ -671,6 +677,7 @@ issues.edit=Bewerken issues.cancel=Annuleren issues.save=Opslaan issues.label_title=Labelnaam +issues.label_description=Label omschrijving issues.label_color=Labelkleur issues.label_count=%d labels issues.label_open_issues=%d geopende problemen @@ -688,6 +695,7 @@ issues.attachment.open_tab=`Klik om "%s" in een nieuw tabblad te bekijken` issues.attachment.download=`Klik om "%s" te downloaden` issues.subscribe=Abonneren issues.unsubscribe=Uitschrijven +issues.tracker=Tijd tracker issues.start_tracking_short=Start issues.start_tracking=Start tijdregistratie issues.start_tracking_history=`%s is begonnen` @@ -728,6 +736,8 @@ pulls.is_checking=Controle van conflicten is nog bezig, ververs deze pagina in e pulls.can_auto_merge_desc=Dit pull-request kan automatisch samengevoegd worden. pulls.cannot_auto_merge_helper=Gelieve beide versies manueel samen te voegen om de conflicten op te lossen. pulls.merge_pull_request=Samenvoegen van pull verzoek +pulls.rebase_merge_pull_request=Rebase en Merge +pulls.squash_merge_pull_request=Squash en Merge milestones.new=Nieuwe mijlpaal milestones.open_tab=%d geopend @@ -783,6 +793,7 @@ activity.period.halfweekly=3 dagen activity.period.weekly=1 week activity.period.monthly=1 maand activity.overview=Overzicht +activity.active_prs_count_n=%d Actieve Pull Requests activity.title.user_1=%d gebruiker activity.title.user_n=%d gebruikers activity.title.prs_1=%d Pull aanvraag @@ -791,6 +802,7 @@ activity.title.prs_merged_by=%s samengevoegd door %s activity.title.prs_opened_by=%s voorgesteld door %s activity.merged_prs_label=Samengevoegd activity.opened_prs_label=Voorgesteld +activity.active_issues_count_n=%d Actieve onderwerpen activity.closed_issues_count_1=Gesloten problemen activity.closed_issues_count_n=Gesloten problemen activity.title.issues_1=%d Probleem @@ -809,6 +821,7 @@ activity.published_release_label=Gepubliceerd search=Zoek search.search_repo=Zoek repository +search.results=Zoek resultaat voor "%s" in %s settings=Instellingen settings.options=Opties @@ -817,6 +830,7 @@ settings.collaboration.admin=Beheerder settings.collaboration.write=Schrijf settings.collaboration.read=Lees settings.collaboration.undefined=Ongedefinieerd +settings.hooks=Webhooks settings.githooks=Git-hooks settings.basic_settings=Basis instellingen settings.mirror_settings=Kopie Settings @@ -835,7 +849,9 @@ settings.use_external_issue_tracker=Externe issuetracker gebruiken settings.tracker_url_format=URL-formaat externe issuetracker settings.tracker_issue_style.numeric=Nummeriek settings.tracker_issue_style.alphanumeric=Alfanummeriek +settings.enable_timetracker=Tijd tracker inschakelen settings.pulls_desc=Schakel 'pull request' in om publieke bijdragen te mogelijk te maken +settings.admin_settings=Beheerdersinstellingen settings.danger_zone=Gevaren zone settings.new_owner_has_same_repo=De nieuwe eigenaar heeft al een repository met deze naam settings.convert=Converteren naar gewone repository @@ -850,6 +866,7 @@ settings.transfer_form_title=Voer de volgende informatie in om de bewerking te b settings.wiki_delete=Wiki gegevens verwijderen settings.wiki_delete_desc=Als U wiki informatie wist gaat deze onherroepelijk verloren. Weet u het zeker? settings.wiki_delete_notices_1=- Deze operatie wist de wiki voor %s en schakelt de wiki uit +settings.confirm_wiki_delete=Wiki gegevens verwijderen settings.wiki_deletion_success=De repository met wiki data is succesvol gewist. settings.delete=Verwijder deze repository settings.delete_desc=Als u eenmaal een repository verwijderd is er geen weg terug. Gelieve zeker te zijn van uw acties. @@ -866,6 +883,7 @@ settings.delete_collaborator=Verwijderen settings.collaborator_deletion=Verwijder Medewerker settings.collaborator_deletion_desc=Deze gebruiker zal niet langer toegang hebben tot deze repository. Wilt U doorgaan? settings.remove_collaborator_success=medewerker is verwijderd. +settings.search_user_placeholder=Zoek gebruiker… settings.org_not_allowed_to_be_collaborator=De organisatie kan niet toegevoegd worden als medewerker. settings.user_is_org_member=Gebruiker is lid van de organisatie die als een medewerker kan niet worden toegevoegd. settings.add_webhook=Webhook toevoegen @@ -901,6 +919,7 @@ settings.event_pull_request=Pull request settings.event_push=Push settings.event_push_desc=Git push naar een repository settings.event_repository=Repository +settings.event_repository_desc=Repository gemaakt of verwijderd settings.active=Actief settings.add_hook_success=Nieuwe webhook toegevoegd. settings.update_webhook=Bewerk webhook @@ -915,6 +934,7 @@ settings.slack_channel=Slack kanaal settings.deploy_keys=Installeer sleutels settings.add_deploy_key=Toevoegen deploy sleutel settings.deploy_key_desc=Sleutels voor uitrol hebben enkel leesrechten. Ze zijn niet dezelfde als de SSH sleutels van persoonlijke accounts. +settings.is_writable=Schrijftoegang toestaan settings.no_deploy_keys=U hebt nog geen deploy sleutels toegevoegd. settings.title=Titel settings.deploy_key_content=Inhoud @@ -926,11 +946,15 @@ settings.deploy_key_deletion_success=Deploy sleutel werd met succes verwijderd! settings.branches=Branches settings.protected_branch=Branch bescherming settings.protected_branch_can_push=Push toestaan? +settings.protected_branch_can_push_no=U mag niet pushen +settings.protect_this_branch=Bescherm deze branch +settings.protect_whitelist_users=Gebruikers die mogen pushen naar deze branch settings.protect_whitelist_search_users=Zoek gebruikers settings.protect_whitelist_search_teams=Zoek teams settings.add_protected_branch=Bescherming aanzetten settings.delete_protected_branch=Bescherming uitzetten settings.remove_protected_branch_success=%s is ontgrendeld +settings.choose_branch=Kies een branch… settings.no_protected_branch=Er zijn geen beschermde branches diff.browse_source=Bladeren bron @@ -959,6 +983,7 @@ release.title=Titel release.content=Inhoud release.write=Schrijf release.preview=Voorbeeld +release.loading=Laden… release.prerelease_desc=Dit is een beta-versie release.prerelease_helper=Wij wijzen u erop dat deze release is niet geschikt voor productie doeleinden. release.cancel=Annuleren @@ -983,6 +1008,7 @@ branch.deletion_success=%s is verwijderd. branch.deletion_failed=%s verwijderen is mislukt. branch.create_branch=Maak branch %s branch.create_from=van '%s' +branch.create_success=Branch '%s' is met succes aangemaakt! branch.deleted_by=Verwijderd door %s [org] @@ -995,6 +1021,8 @@ people=Mensen teams=Teams lower_members=leden lower_repositories=repositories +create_new_team=Nieuw team +create_team=Maak team org_desc=Omschrijving team_name=Teamnaam team_desc=Omschrijving @@ -1054,6 +1082,7 @@ teams.read_permission_desc=Dit team heeft Lees rechten : leden teams.write_permission_desc=Dit team heeft Schrijf rechten : leden kunnen repositories lezen en push aanvragen verwerken. teams.admin_permission_desc=Dit team heeft Beheerders rechten : leden kunnen repositories lezen en push aanvragen verwerken en medewerkers toevoegen. teams.repositories=Teamrepositories +teams.search_repo_placeholder=Repository zoeken… teams.add_team_repository=Nieuwe teamrepositorie aanmaken teams.remove_repo=Verwijder teams.add_nonexistent_repo=De opslagplaats die u probeert toe te voegen bestaat niet: maak deze eerst aan. @@ -1062,6 +1091,7 @@ teams.add_nonexistent_repo=De opslagplaats die u probeert toe te voegen bestaat dashboard=Overzicht users=Gebruikers organizations=Organisaties +repositories=Repositories authentication=Authenticaties config=Configuratie notices=Systeem aankondigingen @@ -1115,6 +1145,7 @@ dashboard.total_gc_pause=Totaal GC verwerkingstijd dashboard.last_gc_pause=Laatste GC verwerkingstijd dashboard.gc_times=GC verwerkingen +users.user_manage_panel=Gebruikersbeheer paneel users.new_account=Nieuw account aanmaken users.name=Naam users.activated=Geactiveerd @@ -1246,6 +1277,7 @@ config.mail_notify=E-mailnotificaties config.disable_key_size_check=Controle op key-lengte uitschakelen config.enable_captcha=CAPTCHA inschakelen config.active_code_lives=Actieve Code leven +config.default_enable_timetracking=Time tracking standaard inschakelen config.no_reply_address=No-reply emailadres config.webhook_config=Webhook configuratie @@ -1261,6 +1293,7 @@ config.mailer_user=Gebruiker config.mailer_use_sendmail=Gebruik Sendmail config.mailer_sendmail_path=Sendmail pad config.send_test_mail=Testbericht verzenden +config.test_mail_failed=Verzenden van een testmail naar '%s' is mislukt: %v config.test_mail_sent=Test-email is verstuurd naar '%s'. config.oauth_config=OAuth-configuratie @@ -1366,8 +1399,10 @@ no_unread=Je hebt geen ongelezen meldingen. no_read=Je hebt geen gelezen meldingen. mark_as_read=Markeer als gelezen mark_as_unread=Markeer als ongelezen +mark_all_as_read=Markeer alles als gelezen [gpg] +error.generate_hash=Genereren van commit hash mislukt error.no_committer_account=Geen account gekoppeld aan de committers e-mail error.no_gpg_keys_found=Geen bekende sleutel gevonden voor deze handtekening in de database From 1c5cbc390bd67194470859a5731719bf069b5ef4 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Thu, 29 Mar 2018 21:32:40 +0800 Subject: [PATCH 13/17] refactor: import order. (#3736) --- routers/api/v1/repo/branch.go | 4 ++-- routers/api/v1/repo/collaborators.go | 4 ++-- routers/api/v1/repo/file.go | 4 ++-- routers/api/v1/repo/fork.go | 4 ++-- routers/api/v1/repo/hook.go | 4 ++-- routers/api/v1/repo/issue.go | 4 ++-- routers/api/v1/repo/issue_comment.go | 4 ++-- routers/api/v1/repo/issue_label.go | 4 ++-- routers/api/v1/repo/issue_tracked_time.go | 1 + routers/api/v1/repo/key.go | 4 ++-- routers/api/v1/repo/label.go | 4 ++-- routers/api/v1/repo/milestone.go | 4 ++-- routers/api/v1/repo/release.go | 4 ++-- routers/api/v1/repo/release_attachment.go | 10 ++++++---- routers/api/v1/repo/repo.go | 1 + routers/api/v1/repo/star.go | 4 ++-- routers/api/v1/repo/status.go | 1 + routers/api/v1/repo/subscriber.go | 4 ++-- 18 files changed, 37 insertions(+), 32 deletions(-) diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 8e44f4236..96c2b02cb 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -5,11 +5,11 @@ package repo import ( - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/routers/api/v1/convert" + + api "code.gitea.io/sdk/gitea" ) // GetBranch get a branch of a repository diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go index f35de08e5..963b7c53a 100644 --- a/routers/api/v1/repo/collaborators.go +++ b/routers/api/v1/repo/collaborators.go @@ -5,10 +5,10 @@ package repo import ( - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" + + api "code.gitea.io/sdk/gitea" ) // ListCollaborators list a repository's collaborators diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go index 4ea81255a..306b65a32 100644 --- a/routers/api/v1/repo/file.go +++ b/routers/api/v1/repo/file.go @@ -5,11 +5,11 @@ package repo import ( - "code.gitea.io/git" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/routers/repo" + + "code.gitea.io/git" ) // GetRawFile get a file by path on a repository diff --git a/routers/api/v1/repo/fork.go b/routers/api/v1/repo/fork.go index 694d7a947..843559d52 100644 --- a/routers/api/v1/repo/fork.go +++ b/routers/api/v1/repo/fork.go @@ -5,11 +5,11 @@ package repo import ( - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/routers/api/v1/utils" + + api "code.gitea.io/sdk/gitea" ) // ListForks list a repository's forks diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go index eb1742ac5..9c39094ba 100644 --- a/routers/api/v1/repo/hook.go +++ b/routers/api/v1/repo/hook.go @@ -5,12 +5,12 @@ package repo import ( - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/routers/api/v1/convert" "code.gitea.io/gitea/routers/api/v1/utils" + + api "code.gitea.io/sdk/gitea" ) // ListHooks list all hooks of a repository diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 04b0dec0e..ce13d8a6e 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -8,13 +8,13 @@ import ( "fmt" "strings" - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/indexer" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" + + api "code.gitea.io/sdk/gitea" ) // ListIssues list the issues of a repository diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go index 8abe2253a..5fb50550f 100644 --- a/routers/api/v1/repo/issue_comment.go +++ b/routers/api/v1/repo/issue_comment.go @@ -7,10 +7,10 @@ package repo import ( "time" - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" + + api "code.gitea.io/sdk/gitea" ) // ListIssueComments list all the comments of an issue diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go index fde919e50..95ea19d54 100644 --- a/routers/api/v1/repo/issue_label.go +++ b/routers/api/v1/repo/issue_label.go @@ -5,10 +5,10 @@ package repo import ( - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" + + api "code.gitea.io/sdk/gitea" ) // ListIssueLabels list all the labels of an issue diff --git a/routers/api/v1/repo/issue_tracked_time.go b/routers/api/v1/repo/issue_tracked_time.go index 15d898d5d..1111d672a 100644 --- a/routers/api/v1/repo/issue_tracked_time.go +++ b/routers/api/v1/repo/issue_tracked_time.go @@ -7,6 +7,7 @@ package repo import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" + api "code.gitea.io/sdk/gitea" ) diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go index a3586d255..1e3666ed4 100644 --- a/routers/api/v1/repo/key.go +++ b/routers/api/v1/repo/key.go @@ -7,12 +7,12 @@ package repo import ( "fmt" - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers/api/v1/convert" + + api "code.gitea.io/sdk/gitea" ) func composeDeployKeysAPILink(repoPath string) string { diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go index b9401cef6..77392787e 100644 --- a/routers/api/v1/repo/label.go +++ b/routers/api/v1/repo/label.go @@ -7,10 +7,10 @@ package repo import ( "strconv" - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" + + api "code.gitea.io/sdk/gitea" ) // ListLabels list all the labels of a repository diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go index 53edd3230..3953b0c3c 100644 --- a/routers/api/v1/repo/milestone.go +++ b/routers/api/v1/repo/milestone.go @@ -7,11 +7,11 @@ package repo import ( "time" - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/util" + + api "code.gitea.io/sdk/gitea" ) // ListMilestones list all the milestones for a repository diff --git a/routers/api/v1/repo/release.go b/routers/api/v1/repo/release.go index 629fb2ea5..70c1e0f26 100644 --- a/routers/api/v1/repo/release.go +++ b/routers/api/v1/repo/release.go @@ -5,10 +5,10 @@ package repo import ( - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" + + api "code.gitea.io/sdk/gitea" ) // GetRelease get a single release of a repository diff --git a/routers/api/v1/repo/release_attachment.go b/routers/api/v1/repo/release_attachment.go index 80b2064df..f11fac162 100644 --- a/routers/api/v1/repo/release_attachment.go +++ b/routers/api/v1/repo/release_attachment.go @@ -5,13 +5,15 @@ package repo import ( - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/sdk/gitea" "errors" "net/http" "strings" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" + + api "code.gitea.io/sdk/gitea" ) // GetReleaseAttachment gets a single attachment of the release diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index b85ffd8d2..25ed62fa4 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/routers/api/v1/convert" + api "code.gitea.io/sdk/gitea" ) diff --git a/routers/api/v1/repo/star.go b/routers/api/v1/repo/star.go index 3500eaf42..df4241dde 100644 --- a/routers/api/v1/repo/star.go +++ b/routers/api/v1/repo/star.go @@ -5,9 +5,9 @@ package repo import ( - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/modules/context" + + api "code.gitea.io/sdk/gitea" ) // ListStargazers list a repository's stargazers diff --git a/routers/api/v1/repo/status.go b/routers/api/v1/repo/status.go index 7f7ef1ae3..da2b459c2 100644 --- a/routers/api/v1/repo/status.go +++ b/routers/api/v1/repo/status.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" + api "code.gitea.io/sdk/gitea" ) diff --git a/routers/api/v1/repo/subscriber.go b/routers/api/v1/repo/subscriber.go index 737ae89f0..a3d5e2a27 100644 --- a/routers/api/v1/repo/subscriber.go +++ b/routers/api/v1/repo/subscriber.go @@ -5,9 +5,9 @@ package repo import ( - api "code.gitea.io/sdk/gitea" - "code.gitea.io/gitea/modules/context" + + api "code.gitea.io/sdk/gitea" ) // ListSubscribers list a repo's subscribers (i.e. watchers) From 36ea53332d5b78bf9366262f5bb0765361e2ecc2 Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Thu, 29 Mar 2018 13:34:02 +0000 Subject: [PATCH 14/17] [skip ci] Updated translations via Crowdin --- options/locale/locale_ru-RU.ini | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index e953537c7..7cecff9c1 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -910,6 +910,8 @@ settings.pulls.ignore_whitespace=Игнорировать незначащие settings.pulls.allow_merge_commits=Разрешить коммиты слияния settings.pulls.allow_rebase_merge=Разрешить rebase-слияние settings.pulls.allow_squash_commits=Разрешить объединять коммиты перед слиянием +settings.admin_settings=Административные настройки +settings.admin_enable_health_check=Выполнять проверки целостности этого репозитория (git fsck) settings.danger_zone=Опасная зона settings.new_owner_has_same_repo=У нового владельца уже есть хранилище с таким названием. settings.convert=Преобразовать в обычный репозиторий @@ -1028,6 +1030,10 @@ settings.protect_whitelist_users=Пользователи которые мог settings.protect_whitelist_search_users=Поиск пользователей settings.protect_whitelist_teams=Команды, члены которых могут делать push в эту ветку. settings.protect_whitelist_search_teams=Поиск команд +settings.protect_merge_whitelist_committers=Ограничить право на принятие Pull Request'ов в эту ветку списком +settings.protect_merge_whitelist_committers_desc=Вы можете добавлять пользователей или целые команды в "белый" список этой ветки. Только присутствующие в списке смогут принимать Pull Request'ы. В противном случае любой с правами на запись в репозиторий будет обладать такой возможностью. +settings.protect_merge_whitelist_users=Пользователи с правом на принятие Pull Request'ов в эту ветку +settings.protect_merge_whitelist_teams=Команды, члены которых обладают правом на принятие Pull Request'ов в эту ветку. settings.add_protected_branch=Включить защиту settings.delete_protected_branch=Отключить защиту settings.update_protect_branch_success=Настройки защиты ветки %s были успешно изменены. From 45d1fc03cb043b585c81d15163184be7691f5fc8 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 30 Mar 2018 07:21:27 +0800 Subject: [PATCH 15/17] fix go vet error (#3740) --- models/git_diff_test.go | 16 ++++++++-------- routers/repo/issue_label_test.go | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/models/git_diff_test.go b/models/git_diff_test.go index acdae2005..a29830c7f 100644 --- a/models/git_diff_test.go +++ b/models/git_diff_test.go @@ -21,16 +21,16 @@ func assertLineEqual(t *testing.T, d1 *DiffLine, d2 *DiffLine) { func TestDiffToHTML(t *testing.T) { assertEqual(t, "+foo bar biz", diffToHTML([]dmp.Diff{ - {dmp.DiffEqual, "foo "}, - {dmp.DiffInsert, "bar"}, - {dmp.DiffDelete, " baz"}, - {dmp.DiffEqual, " biz"}, + {Type: dmp.DiffEqual, Text: "foo "}, + {Type: dmp.DiffInsert, Text: "bar"}, + {Type: dmp.DiffDelete, Text: " baz"}, + {Type: dmp.DiffEqual, Text: " biz"}, }, DiffLineAdd)) assertEqual(t, "-foo bar biz", diffToHTML([]dmp.Diff{ - {dmp.DiffEqual, "foo "}, - {dmp.DiffDelete, "bar"}, - {dmp.DiffInsert, " baz"}, - {dmp.DiffEqual, " biz"}, + {Type: dmp.DiffEqual, Text: "foo "}, + {Type: dmp.DiffDelete, Text: "bar"}, + {Type: dmp.DiffInsert, Text: " baz"}, + {Type: dmp.DiffEqual, Text: " biz"}, }, DiffLineDel)) } diff --git a/routers/repo/issue_label_test.go b/routers/repo/issue_label_test.go index 9052a65d2..bf6251125 100644 --- a/routers/repo/issue_label_test.go +++ b/routers/repo/issue_label_test.go @@ -32,7 +32,7 @@ func TestInitializeLabels(t *testing.T) { ctx := test.MockContext(t, "user2/repo1/labels/initialize") test.LoadUser(t, ctx, 2) test.LoadRepo(t, ctx, 2) - InitializeLabels(ctx, auth.InitializeLabelsForm{"Default"}) + InitializeLabels(ctx, auth.InitializeLabelsForm{TemplateName: "Default"}) assert.EqualValues(t, http.StatusFound, ctx.Resp.Status()) models.AssertExistsAndLoadBean(t, &models.Label{ RepoID: 2, From d877bf7e15ebd5d9a74e58f3999e3276e76fa15e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 30 Mar 2018 22:49:46 +0800 Subject: [PATCH 16/17] Add config option to enable or disable log executed SQL (#3726) * add config option to enable or disable log executed SQL * rename ShowSQL to LogSQL --- custom/conf/app.ini.sample | 2 ++ docs/content/doc/advanced/config-cheat-sheet.en-us.md | 1 + docs/content/doc/advanced/config-cheat-sheet.zh-cn.md | 1 + models/models.go | 2 +- modules/setting/setting.go | 2 ++ 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index 7876f0a7b..3bd5a9c27 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -210,6 +210,8 @@ PATH = data/gitea.db SQLITE_TIMEOUT = 500 ; For iterate buffer, default is 50 ITERATE_BUFFER_SIZE = 50 +; Show the database generated SQL +LOG_SQL = true [indexer] ISSUE_INDEXER_PATH = indexers/issues.bleve diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 93b4da9d3..0ec48bd28 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -121,6 +121,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `PASSWD`: **\**: Database user password. Use \`your password\` for quoting if you use special characters in the password. - `SSL_MODE`: **disable**: For PostgreSQL only. - `PATH`: **data/gitea.db**: For SQLite3 only, the database file path. +- `LOG_SQL`: **true**: Log the executed SQL. ## Indexer (`indexer`) diff --git a/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md b/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md index 6320d6a43..09862cc3b 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md +++ b/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md @@ -80,6 +80,7 @@ menu: - `PASSWD`: 数据库用户密码。 - `SSL_MODE`: PostgreSQL数据库是否启用SSL模式。 - `PATH`: Tidb 或者 SQLite3 数据文件存放路径。 +- `LOG_SQL`: **true**: 显示生成的SQL，默认为真。 ## Security (`security`) diff --git a/models/models.go b/models/models.go index 7738e1a3c..b2f5e923e 100644 --- a/models/models.go +++ b/models/models.go @@ -270,7 +270,7 @@ func SetEngine() (err error) { // WARNING: for serv command, MUST remove the output to os.stdout, // so use log file to instead print to stdout. x.SetLogger(log.XORMLogger) - x.ShowSQL(true) + x.ShowSQL(setting.LogSQL) return nil } diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 9ef175d20..9ba3e5a66 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -159,6 +159,7 @@ var ( UseMSSQL bool UsePostgreSQL bool UseTiDB bool + LogSQL bool // Indexer settings Indexer struct { @@ -931,6 +932,7 @@ func NewContext() { } } IterateBufferSize = Cfg.Section("database").Key("ITERATE_BUFFER_SIZE").MustInt(50) + LogSQL = Cfg.Section("database").Key("LOG_SQL").MustBool(true) sec = Cfg.Section("attachment") AttachmentPath = sec.Key("PATH").MustString(path.Join(AppDataPath, "attachments")) From 3e06490d38ee631029b020ccd408231841e5d1da Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Sat, 31 Mar 2018 03:10:44 +0200 Subject: [PATCH 17/17] Add Size column to attachment (#3734) * Add size column to attachment Migrate attachments by calculating file sizes Signed-off-by: Jonas Franz * Calculate attachment size on creation Signed-off-by: Jonas Franz * Log error instead of returning error Signed-off-by: Jonas Franz --- models/attachment.go | 31 +++++++--------------- models/migrations/migrations.go | 2 ++ models/migrations/v61.go | 45 ++++++++++++++++++++++++++++++++ templates/repo/release/list.tmpl | 2 +- 4 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 models/migrations/v61.go diff --git a/models/attachment.go b/models/attachment.go index 47c76990b..4a5101b38 100644 --- a/models/attachment.go +++ b/models/attachment.go @@ -11,7 +11,6 @@ import ( "os" "path" - "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" api "code.gitea.io/sdk/gitea" @@ -29,6 +28,7 @@ type Attachment struct { CommentID int64 Name string DownloadCount int64 `xorm:"DEFAULT 0"` + Size int64 `xorm:"DEFAULT 0"` CreatedUnix util.TimeStamp `xorm:"created"` } @@ -44,13 +44,12 @@ func (a *Attachment) IncreaseDownloadCount() error { // APIFormat converts models.Attachment to api.Attachment func (a *Attachment) APIFormat() *api.Attachment { - size, _ := a.Size() return &api.Attachment{ ID: a.ID, Name: a.Name, Created: a.CreatedUnix.AsTime(), DownloadCount: a.DownloadCount, - Size: size, + Size: a.Size, UUID: a.UUID, DownloadURL: a.DownloadURL(), } @@ -67,25 +66,6 @@ func (a *Attachment) LocalPath() string { return AttachmentLocalPath(a.UUID) } -// Size returns the file's size of the attachment -func (a *Attachment) Size() (int64, error) { - fi, err := os.Stat(a.LocalPath()) - if err != nil { - return 0, err - } - return fi.Size(), nil -} - -// MustSize returns the result of a.Size() by ignoring errors -func (a *Attachment) MustSize() int64 { - size, err := a.Size() - if err != nil { - log.Error(4, "size: %v", err) - return 0 - } - return size -} - // DownloadURL returns the download url of the attached file func (a *Attachment) DownloadURL() string { return fmt.Sprintf("%sattachments/%s", setting.AppURL, a.UUID) @@ -115,6 +95,13 @@ func NewAttachment(name string, buf []byte, file multipart.File) (_ *Attachment, return nil, fmt.Errorf("Copy: %v", err) } + // Update file size + var fi os.FileInfo + if fi, err = fw.Stat(); err != nil { + return nil, fmt.Errorf("file size: %v", err) + } + attach.Size = fi.Size() + if _, err := x.Insert(attach); err != nil { return nil, err } diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 36c84a61a..16037e147 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -174,6 +174,8 @@ var migrations = []Migration{ NewMigration("add merge whitelist for protected branches", addProtectedBranchMergeWhitelist), // v60 -> v61 NewMigration("add is_fsck_enabled column for repos", addFsckEnabledToRepo), + // v61 -> v62 + NewMigration("add size column for attachments", addSizeToAttachment), } // Migrate database to current version diff --git a/models/migrations/v61.go b/models/migrations/v61.go new file mode 100644 index 000000000..bcbc7553b --- /dev/null +++ b/models/migrations/v61.go @@ -0,0 +1,45 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package migrations + +import ( + "fmt" + "os" + "path" + + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + + "github.com/go-xorm/xorm" +) + +func addSizeToAttachment(x *xorm.Engine) error { + type Attachment struct { + ID int64 `xorm:"pk autoincr"` + UUID string `xorm:"uuid UNIQUE"` + Size int64 `xorm:"DEFAULT 0"` + } + if err := x.Sync2(new(Attachment)); err != nil { + return fmt.Errorf("Sync2: %v", err) + } + + attachments := make([]Attachment, 0, 100) + if err := x.Find(&attachments); err != nil { + return fmt.Errorf("query attachments: %v", err) + } + for _, attach := range attachments { + localPath := path.Join(setting.AttachmentPath, attach.UUID[0:1], attach.UUID[1:2], attach.UUID) + fi, err := os.Stat(localPath) + if err != nil { + log.Error(4, "calculate file size of attachment[UUID: %s]: %v", attach.UUID, err) + continue + } + attach.Size = fi.Size() + if _, err := x.ID(attach.ID).Cols("size").Update(attach); err != nil { + return fmt.Errorf("update size column: %v", err) + } + } + return nil +} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 73e4a8682..af0f0fa82 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -79,7 +79,7 @@
  • {{.Name}} - {{.MustSize | FileSize}} + {{.Size | FileSize}}
    • {{end}}