From 0a298f5afa7c70ddf72b21d45830c891f06efaea Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 14 Mar 2017 17:37:33 +0100 Subject: [PATCH 1/2] Add notice that LFS mirroring is not supported --- options/locale/locale_de-DE.ini | 1 + options/locale/locale_en-US.ini | 1 + routers/repo/repo.go | 1 + templates/repo/migrate.tmpl | 5 ++++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 6398dff5480e9..a92d6a7536102 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -431,6 +431,7 @@ migrate.clone_local_path=oder Pfad auf dem lokalen Server migrate.permission_denied=Ihnen fehlen die Rechte zum Importieren lokaler Repositories. migrate.invalid_local_path=Der lokale Pfad ist ungültig, existiert nicht oder ist kein Ordner. migrate.failed=Fehler bei Migration: %v +migrate.lfs_mirror_unsupported = Migrieren von LFS Objekten wird nicht unterstützt - verwenden Sie stattdessen 'git lfs fetch --all' und 'git lfs push --all'. mirror_from=Mirror von forked_from=geforkt von diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f8e125076103e..00c344dc722b5 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -442,6 +442,7 @@ migrate.clone_local_path = or local server path migrate.permission_denied = You are not allowed to import local repositories. migrate.invalid_local_path = Invalid local path, it does not exist or not a directory. migrate.failed = Migration failed: %v +migrate.lfs_mirror_unsupported = Mirroring LFS objects is not supported - use 'git lfs fetch --all' and 'git lfs push --all' instead. mirror_from = mirror of forked_from = forked from diff --git a/routers/repo/repo.go b/routers/repo/repo.go index fa111d5e4a2f7..9b411648c61cd 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -153,6 +153,7 @@ func Migrate(ctx *context.Context) { ctx.Data["private"] = ctx.User.LastRepoVisibility ctx.Data["IsForcedPrivate"] = setting.Repository.ForcePrivate ctx.Data["mirror"] = ctx.Query("mirror") == "1" + ctx.Data["LFSActive"] = setting.LFS.StartServer ctxUser := checkContextUser(ctx, ctx.QueryInt64("org")) if ctx.Written() { diff --git a/templates/repo/migrate.tmpl b/templates/repo/migrate.tmpl index 17d563032816a..e05768e417ea6 100644 --- a/templates/repo/migrate.tmpl +++ b/templates/repo/migrate.tmpl @@ -12,7 +12,10 @@
- {{.i18n.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{.i18n.Tr "repo.migrate.clone_local_path"}}{{end}} + + {{.i18n.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{.i18n.Tr "repo.migrate.clone_local_path"}}{{end}} + {{if .LFSActive}}
{{.i18n.Tr "repo.migrate.lfs_mirror_unsupported"}}{{end}} +
From 858a6b7ca18f92f0dacf0cda8de797f46c493ea2 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 16 Mar 2017 11:10:44 +0100 Subject: [PATCH 2/2] Drop German translation --- options/locale/locale_de-DE.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index a92d6a7536102..6398dff5480e9 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -431,7 +431,6 @@ migrate.clone_local_path=oder Pfad auf dem lokalen Server migrate.permission_denied=Ihnen fehlen die Rechte zum Importieren lokaler Repositories. migrate.invalid_local_path=Der lokale Pfad ist ungültig, existiert nicht oder ist kein Ordner. migrate.failed=Fehler bei Migration: %v -migrate.lfs_mirror_unsupported = Migrieren von LFS Objekten wird nicht unterstützt - verwenden Sie stattdessen 'git lfs fetch --all' und 'git lfs push --all'. mirror_from=Mirror von forked_from=geforkt von