diff options
author | Fabian Zaremba <fabian@youremail.eu> | 2016-12-26 02:16:37 +0100 |
---|---|---|
committer | Lunny Xiao <xiaolunwen@gmail.com> | 2016-12-26 09:16:37 +0800 |
commit | 2e7ccecfe6f3d52b1dd5277a0eaf7a628164c8ac (patch) | |
tree | 7c10ab7d01990f936abb5a316edde3ba697006ab /templates | |
parent | 4b7594d9fa0da67cbc8df74ee1711043168ebbbd (diff) | |
download | gitea-2e7ccecfe6f3d52b1dd5277a0eaf7a628164c8ac.tar.gz gitea-2e7ccecfe6f3d52b1dd5277a0eaf7a628164c8ac.zip |
Git LFS support v2 (#122)
* Import github.com/git-lfs/lfs-test-server as lfs module base
Imported commit is 3968aac269a77b73924649b9412ae03f7ccd3198
Removed:
Dockerfile CONTRIBUTING.md mgmt* script/ vendor/ kvlogger.go
.dockerignore .gitignore README.md
* Remove config, add JWT support from github.com/mgit-at/lfs-test-server
Imported commit f0cdcc5a01599c5a955dc1bbf683bb4acecdba83
* Add LFS settings
* Add LFS meta object model
* Add LFS routes and initialization
* Import github.com/dgrijalva/jwt-go into vendor/
* Adapt LFS module: handlers, routing, meta store
* Move LFS routes to /user/repo/info/lfs/*
* Add request header checks to LFS BatchHandler / PostHandler
* Implement LFS basic authentication
* Rework JWT secret generation / load
* Implement LFS SSH token authentication with JWT
Specification: https://github.com/github/git-lfs/tree/master/docs/api
* Integrate LFS settings into install process
* Remove LFS objects when repository is deleted
Only removes objects from content store when deleted repo is the only
referencing repository
* Make LFS module stateless
Fixes bug where LFS would not work after installation without
restarting Gitea
* Change 500 'Internal Server Error' to 400 'Bad Request'
* Change sql query to xorm call
* Remove unneeded type from LFS module
* Change internal imports to code.gitea.io/gitea/
* Add Gitea authors copyright
* Change basic auth realm to "gitea-lfs"
* Add unique indexes to LFS model
* Use xorm count function in LFS check on repository delete
* Return io.ReadCloser from content store and close after usage
* Add LFS info to runWeb()
* Export LFS content store base path
* LFS file download from UI
* Work around git-lfs client issue with unauthenticated requests
Returning a dummy Authorization header for unauthenticated requests
lets git-lfs client skip asking for auth credentials
See: https://github.com/github/git-lfs/issues/1088
* Fix unauthenticated UI downloads from public repositories
* Authentication check order, Finish LFS file view logic
* Ignore LFS hooks if installed for current OS user
Fixes Gitea UI actions for repositories tracking LFS files.
Checks for minimum needed git version by parsing the semantic version
string.
* Hide LFS metafile diff from commit view, marking as binary
* Show LFS notice if file in commit view is tracked
* Add notbefore/nbf JWT claim
* Correct lint suggestions - comments for structs and functions
- Add comments to LFS model
- Function comment for GetRandomBytesAsBase64
- LFS server function comments and lint variable suggestion
* Move secret generation code out of conditional
Ensures no LFS code may run with an empty secret
* Do not hand out JWT tokens if LFS server support is disabled
Diffstat (limited to 'templates')
-rw-r--r-- | templates/install.tmpl | 5 | ||||
-rw-r--r-- | templates/repo/diff/box.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/view_file.tmpl | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/templates/install.tmpl b/templates/install.tmpl index 44851c96fd..027d06166b 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -84,6 +84,11 @@ <input id="repo_root_path" name="repo_root_path" value="{{.repo_root_path}}" required> <span class="help">{{.i18n.Tr "install.repo_path_helper"}}</span> </div> + <div class="inline field {{if .Err_LFSRootPath}}error{{end}}"> + <label for="lfs_root_path">{{.i18n.Tr "install.lfs_path"}}</label> + <input id="lfs_root_path" name="lfs_root_path" value="{{.lfs_root_path}}"> + <span class="help">{{.i18n.Tr "install.lfs_path_helper"}}</span> + </div> <div class="inline required field {{if .Err_RunUser}}error{{end}}"> <label for="run_user">{{.i18n.Tr "install.run_user"}}</label> <input id="run_user" name="run_user" value="{{.run_user}}" required> diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 4f6c70a328..8ee4a001ce 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -66,7 +66,7 @@ <span class="del" data-line="{{.Deletion}}">- {{.Deletion}}</span> {{end}} </div> - <span class="file">{{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}}</span> + <span class="file">{{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.i18n.Tr "repo.stored_lfs"}}){{end}}</span> {{if not $file.IsSubmodule}} <div class="ui right"> {{if $file.IsDeleted}} diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 08d77c3f37..9382bb075e 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -5,11 +5,11 @@ {{if .ReadmeInList}} <strong>{{.FileName}}</strong> {{else}} - <strong>{{.FileName}}</strong> <span class="text grey normal">{{FileSize .FileSize}}</span> + <strong>{{.FileName}}</strong> <span class="text grey normal">{{FileSize .FileSize}}{{if .IsLFSFile}} ({{.i18n.Tr "repo.stored_lfs"}}){{end}}</span> {{end}} {{else}} <i class="file text outline icon ui left"></i> - <strong>{{.FileName}}</strong> <span class="text grey normal">{{FileSize .FileSize}}</span> + <strong>{{.FileName}}</strong> <span class="text grey normal">{{FileSize .FileSize}}{{if .IsLFSFile}} ({{.i18n.Tr "repo.stored_lfs"}}){{end}}</span> {{end}} {{if not .ReadmeInList}} <div class="ui right file-actions"> |