mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-11 15:04:02 +09:00
Web editor: fix cannot create new file in subdirectory
This commit is contained in:
Unknwon committed
1 parent
429c92c0ce
commit
62b0dc4853
10 files changed
+15
-12
No files matched your search
@@ -3,7 +3,7 @@ Gogs - Go Git Service [
|
||||
|
||||
##### Current tip version: 0.9.92 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
|
||||
##### Current tip version: 0.9.93 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
|
||||
|
||||
| Web | UI | Preview |
|
||||
|:-------------:|:-------:|:-------:|
|
||||
|
||||
@@ -458,6 +458,7 @@ editor.file_editing_no_longer_exists = The file '%s' you are editing no longer e
|
||||
editor.file_changed_while_editing = File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
|
||||
editor.file_already_exists = A file with name '%s' already exists in this repository.
|
||||
editor.no_changes_to_show = There are no changes to show.
|
||||
editor.fail_to_update_file = Failed to update/create file '%s' with error: %v
|
||||
upload_files = Upload files
|
||||
upload_file = Upload file
|
||||
add_files_to_dir = Add files to %s
|
||||
|
||||
@@ -17,7 +17,7 @@ import (
|
||||
"github.com/gogits/gogs/modules/setting"
|
||||
)
|
||||
|
||||
const APP_VER = "0.9.92.0828"
|
||||
const APP_VER = "0.9.93.0829"
|
||||
|
||||
func init() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
|
||||
@@ -96,6 +96,7 @@ func (repo *Repository) UpdateRepoFile(doer *User, opts UpdateRepoFileOptions) (
|
||||
}
|
||||
|
||||
localPath := repo.LocalCopyPath()
|
||||
oldFilePath := path.Join(localPath, opts.OldTreeName)
|
||||
filePath := path.Join(localPath, opts.NewTreeName)
|
||||
os.MkdirAll(path.Dir(filePath), os.ModePerm)
|
||||
|
||||
@@ -106,8 +107,9 @@ func (repo *Repository) UpdateRepoFile(doer *User, opts UpdateRepoFileOptions) (
|
||||
}
|
||||
}
|
||||
|
||||
// If update a file, move if file name change.
|
||||
if len(opts.OldTreeName) > 0 && len(opts.NewTreeName) > 0 && opts.OldTreeName != opts.NewTreeName {
|
||||
// Ignore move step if it's a new file under a directory.
|
||||
// Otherwise, move the file when name changed.
|
||||
if com.IsFile(oldFilePath) && opts.OldTreeName != opts.NewTreeName {
|
||||
if err = git.MoveFile(localPath, opts.OldTreeName, opts.NewTreeName); err != nil {
|
||||
return fmt.Errorf("git mv %s %s: %v", opts.OldTreeName, opts.NewTreeName, err)
|
||||
}
|
||||
|
||||
@@ -4346,7 +4346,7 @@ func confLocaleLocale_deDeIni() (*asset, error) {
|
||||
return a, nil
|
||||
}
|
||||
|
||||
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xac\xbd\xfb\x72\xdb\x48\x92\x2f\xfc\x3f\x9e\x02\xed\x09\x87\xed\x08\x99\x1d\x3d\xb3\xdf\x25\x3a\xfa\xf2\xa9\xe5\xf6\x65\xd7\xb2\xb5\x96\x7a\xe6\x9b\xd3\xe1\x60\x83\x24\x44\x62\x4d\x02\x1c\x00\xb4\xac\x99\x98\x37\x38\x0f\x70\x9e\xef\x3c\xc9\xc9\xfc\x65\x66\x55\x16\x00\x4a\x76\xcf\xfa\x0f\x0b\xac\xca\xba\x67\x65\xe5\xad\xb2\x8a\xfd\x7e\xbe\x2a\xbb\x65\xfe\x7d\x7e\x9a\xef\x8b\xaa\xde\x96\x5d\x97\x77\xe5\xf6\xfa\xe9\xa6\xe9\xfa\x72\x95\xbf\xa8\x7a\xfa\xdd\x7e\xac\x96\x65\x96\x6d\x9a\x5d\x49\xa0\x2f\xe9\x4f\xb6\x2a\xba\xcd\xa2\x29\xda\x15\x25\x3c\xb3\xef\xac\xfc\xb4\xdf\x36\x2d\x03\xfd\x2c\x5f\xd9\xa6\xdc\xee\xb9\x0c\xfd\xc9\xba\x6a\x5d\xcf\xab\x9a\x7e\x5e\xd2\x57\xfe\xaa\x96\x94\xe6\xd0\x5b\xd2\xdb\x43\x2f\x69\x87\xbd\x25\xfd\xb2\xcf\xda\x72\x5d\x51\x6f\x5a\x4a\x7a\xa7\x9f\xd9\x4d\xb9\xe8\xaa\x9e\x5b\xfa\x8b\x7c\x65\x1f\xcb\xb6\xab\x1a\xae\xfd\xcf\xf2\x95\xed\x8b\x35\x03\x5c\xd0\x9f\xac\x2f\x77\xfb\x6d\x81\x02\x57\xfa\x99\x6d\x8b\x7a\x7d\x10\x98\xd7\xfa\x99\x2d\xdb\x92\xb2\xe6\x75\x79\x43\xa9\x67\xf8\x31\x9b\xcd\xb2\x03\x4d\xc2\x7c\xdf\x36\xd7\xd5\xb6\x9c\x17\xf5\x6a\xbe\x93\x61\xfe\x42\xe9\xb9\xa6\xe7\x94\x9e\x73\x3a\x86\x50\xae\x68\xa8\xf3\xa2\xd3\x71\xd0\x5c\xd2\xc8\x8b\x2e\x43\x55\x75\xb1\xb3\xd2\xfc\x99\x95\xbb\xa2\xda\xf2\xac\xf1\x5f\xea\x77\xd7\xdd\x34\x98\xda\x0b\xfd\xa4\x39\x98\xf7\xb7\xfb\x12\x53\xf0\xf4\x8a\xbe\xb2\x65\xb1\xef\x97\x9b\x82\xbb\x29\x5f\x19\x01\xed\x1b\x9a\x8b\xa6\xbd\x05\x9c\xfd\xc8\x9a\x76\x5d\xd4\xd5\xdf\x8b\x5e\xe6\xe7\xad\xfb\x99\xed\xaa\xb6\x6d\x78\x6a\xcf\xf1\x91\xd1\xc8\xe7\x5c\x0f\xa5\xbc\xa1\x49\x70\xb5\x70\xce\xae\x5a\xb7\x32\x8b\x9c\x79\x8e\x5f\x5c\x8b\xe4\x69\x4d\x92\x15\x6a\xbb\x6e\xda\x0f\x9a\xfa\x9c\x3f\x07\x55\x52\xe7\x34\x37\xed\x57\x51\xd3\x7a\x68\xee\x39\x7e\x24\x00\x5d\x56\xac\x76\x34\xc3\xfb\xa2\x2e\x79\xea\x4e\xf9\x17\xcd\x17\xfd\xca\x8a\xe5\xb2\x39\xd4\xfd\xbc\x2b\xfb\xbe\xaa\xd7\xbc\x06\xa7\x92\x94\x5f\x6a\x52\xe6\xf2\x42\xda\x6d\x73\x08\xab\x4c\xe9\x7f\xa5\x9f\xf9\x85\xfc\x94\x3c\x57\x08\x99\xa1\x24\x35\xd9\x57\x1f\xab\xbe\x2a\xa5\x31\xfb\x91\xed\x0f\xdb\x2d\xcd\xe7\xdf\x0e\x65\xd7\x73\xd6\x05\xfd\xa6\x19\x90\xdf\x59\xd5\x75\x07\x94\x78\x85\x8f\x8c\x16\xb5\x5e\x62\x38\x67\xf8\xc8\xb2\x5f\xab\xba\xeb\x8b\xed\xf6\x7d\xa6\x1f\x0c\x2c\x5f\x32\x4f\x7d\xd5\xa3\xb3\x9a\x98\x5f\xf6\xe5\xbe\xe3\x89\xce\x9f\x57\x6d\xd7\x3f\xed\x2b\x42\xb5\x77\x87\x3a\x5b\x35\xcb\x0f\x84\xc4\xbc\x21\xb1\x95\x5e\x5d\xe7\x34\xa6\x47\x84\xc6\xed\xa1\xae\x69\x14\xf9\x8b\x86\x46\x46\xcd\x54\xab\x32\x7f\x06\xe8\x93\x7c\xbf\x2d\x8b\x8e\x40\xca\x62\x95\x7f\x57\xe4\x7d\xd1\xae\xcb\xfe\xfb\x07\xf3\x05\x6d\x9e\x0f\x0f\xf2\x4d\x5b\x5e\x7f\xff\xe0\x61\xf7\xe0\x87\x17\x07\x2a\xb6\xad\xea\xb2\xfb\xee\xeb\xe2\x87\x7c\x59\x50\x0e\x8d\xf5\x36\x5f\x94\xd7\xbc\x57\xa8\xad\x9c\x90\xb4\x5e\xf3\x3e\xb9\xed\x37\xdc\x20\x2d\x18\x7d\x74\x39\x6f\xd4\xaf\x32\x9e\x25\xda\xc8\xf3\xd5\xc2\x88\x12\x3a\x84\xe4\x96\x66\xe9\xfc\xf6\xf2\x3f\x5f\x9f\xe4\x17\x44\x99\xd6\x6d\x89\x6f\xfa\x8f\x4a\xfc\x29\xa7\xd1\x5e\x55\xcf\x7e\x9a\x65\x54\xd6\x26\xe4\x59\xd1\x17\x0b\xee\x7b\x58\x24\xce\x94\x3d\x14\xf2\xb0\x93\x98\xd6\x81\xae\x75\x3d\x76\xa7\xee\xcc\xc9\x7d\x48\x75\xe8\xe6\x0d\x75\xbc\xe1\x1d\x4c\xe9\x61\x66\x2f\x64\xce\xa8\xaa\xfc\xd5\x9b\x37\x6f\x9f\xfd\x94\x97\xf5\x9a\x66\x26\xbf\xa9\xfa\x4d\x7e\xe8\xaf\xff\xdf\xf9\xba\xac\xcb\xb6\xd8\xce\x97\x15\x4f\x4a\x4b\x78\x95\xd3\x2c\xc9\x10\x67\x59\xd7\x6d\x89\xc0\xac\xb8\x95\xcb\xcb\xd7\xf9\x39\x7d\x52\x67\xa8\x2c\x77\xa4\xdf\x64\xdd\xdf\xb6\x3c\x51\xa1\xc1\xab\x4d\x99\x03\x67\x01\xd4\x5c\x0f\xe7\x25\x5f\x69\x5f\x67\xf9\x77\x8b\xf6\x07\xd7\xbf\x62\xd1\x35\xdb\x43\xaf\x25\x6f\x36\x65\x8d\x85\x22\x54\x6a\x7b\xa2\x56\x46\xfb\x67\x59\xd9\xb6\x73\xa2\x9b\xfd\x2d\x2f\x8f\xf6\xe5\x58\x2b\x52\x19\xa1\x72\xdd\xf4\xb4\xfc\x39\xca\x49\x15\x55\xfd\xb1\xd8\x56\x2b\x5a\xa4\x38\x91\x69\x59\x24\xae\x1a\x5a\x6f\x2e\x4d\x18\xdd\xdc\x60\x8a\x68\x83\x11\x59\xcf\x1f\xcc\x1e\x80\xce\x3e\x78\xfa\x60\x96\xd5\xcd\x5c\x88\x00\x53\xe4\x55\xd5\x15\x0b\xa2\xce\x72\x5a\xb4\x46\xec\xfe\xca\x78\x27\x5d\x51\x88\x3c\x81\xe0\x35\xe1\x13\x08\x84\x9f\x91\xb2\x20\x32\x0d\x5a\xa2\x54\xc4\x8f\xdd\x48\x4e\xc0\x0b\xa1\x3a\x21\x61\x34\xe6\xcc\x16\xda\xb0\xf2\x74\xbf\xdf\x56\x4b\x69\xfa\x85\xe4\x45\x04\xe5\xf3\x58\x27\xc5\xc3\x01\xc1\x2c\xcf\xa1\x19\xf5\x9a\xa9\x52\x9e\x90\x77\x94\xdf\x94\xb4\xe3\x36\x87\xb5\x9c\x49\xdb\xe6\xb0\xfa\x0a\x87\x83\xad\x5c\x24\xc1\xf9\xbb\x86\x3a\x0c\xac\x0a\x00\xb1\x89\x53\x22\x28\xcc\x02\xb4\xe5\xae\xe9\x79\xe2\xb4\x18\x93\xb9\x9b\x8a\x32\x69\xa4\x5d\xf1\x91\x0e\xb7\xbe\x91\xad\xbc\xa2\xad\xba\xe4\x8a\x67\x19\x91\x95\xb9\x6e\x27\xa2\x3f\xb2\xa5\x2c\x2d\xc5\x5d\x40\xed\x0e\xb4\x0b\x37\x54\x19\x4f\x3c\xf3\x21\x54\xe5\x54\x3f\x31\x24\xaa\x07\xd4\x81\x76\x7c\x43\x67\x26\x2f\xf4\x33\x7c\xe8\x6f\x5f\x3f\xf5\xaa\xb8\xbe\xa6\x5e\x75\xb4\x9b\x5e\xe6\xcb\x6d\x43\x5b\xf1\x97\x77\xaf\x3b\xde\x68\x9b\xf9\xbe\x69\xc1\x7f\x50\xd6\x05\x7d\x86\x34\x37\xd1\x0c\x51\x1f\x76\x0b\xfa\x75\xb3\xa9\x96\x1b\x99\x76\x2e\xc1\xfb\x83\x52\xa9\x8Line truncated
|
||||
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xac\xbd\xf9\x72\xdb\x48\xb2\x2f\xfc\x3f\x9e\x02\xed\x09\x87\xed\x08\x99\x8e\x9e\x39\xdf\x12\x1d\xbd\x7c\xb2\xdc\x5e\xce\xf1\xa2\x63\xa9\x67\xbe\xb9\x1d\x0e\x36\x48\x42\x24\x8e\x49\x80\x03\x80\x96\x35\x13\xf3\x06\xf7\x01\xee\xf3\xdd\x27\xb9\x99\xbf\xcc\xac\xca\x02\x40\xc9\xee\x39\xfe\xc3\x02\xab\xb2\xf6\xac\xac\xdc\x2a\xab\xd8\xef\xe7\xab\xb2\x5b\xe6\x3f\xe4\xa7\xf9\xbe\xa8\xea\x6d\xd9\x75\x79\x57\x6e\xaf\x1e\x6f\x9a\xae\x2f\x57\xf9\x8b\xaa\xa7\xdf\xed\xa7\x6a\x59\x66\xd9\xa6\xd9\x95\x04\xfa\x92\xfe\x64\xab\xa2\xdb\x2c\x9a\xa2\x5d\x51\xc2\x33\xfb\xce\xca\xcf\xfb\x6d\xd3\x32\xd0\xcf\xf2\x95\x6d\xca\xed\x9e\xcb\xd0\x9f\xac\xab\xd6\xf5\xbc\xaa\xe9\xe7\x05\x7d\xe5\xaf\x6a\x49\x69\x0e\xbd\x25\xbd\x3b\xf4\x92\x76\xd8\x5b\xd2\x2f\xfb\xac\x2d\xd7\x15\xf5\xa6\xa5\xa4\xf7\xfa\x99\x5d\x97\x8b\xae\xea\xb9\xa5\xbf\xc8\x57\xf6\xa9\x6c\xbb\xaa\xe1\xda\xff\x2c\x5f\xd9\xbe\x58\x33\xc0\x39\xfd\xc9\xfa\x72\xb7\xdf\x16\x28\x70\xa9\x9f\xd9\xb6\xa8\xd7\x07\x81\x79\xad\x9f\xd9\xb2\x2d\x29\x6b\x5e\x97\xd7\x94\x7a\x86\x1f\xb3\xd9\x2c\x3b\xd0\x24\xcc\xf7\x6d\x73\x55\x6d\xcb\x79\x51\xaf\xe6\x3b\x19\xe6\x2f\x94\x9e\x6b\x7a\x4e\xe9\x39\xa7\x63\x08\xe5\x8a\x86\x3a\x2f\x3a\x1d\x07\xcd\x25\x8d\xbc\xe8\x32\x54\x55\x17\x3b\x2b\xcd\x9f\x59\xb9\x2b\xaa\x2d\xcf\x1a\xff\xa5\x7e\x77\xdd\x75\x83\xa9\x3d\xd7\x4f\x9a\x83\x79\x7f\xb3\x2f\x31\x05\x8f\x2f\xe9\x2b\x5b\x16\xfb\x7e\xb9\x29\xb8\x9b\xf2\x95\x11\xd0\xbe\xa1\xb9\x68\xda\x1b\xc0\xd9\x8f\xac\x69\xd7\x45\x5d\xfd\xbd\xe8\x65\x7e\xde\xb9\x9f\xd9\xae\x6a\xdb\x86\xa7\xf6\x0d\x3e\x32\x1a\xf9\x9c\xeb\xa1\x94\xb7\x34\x09\xae\x16\xce\xd9\x55\xeb\x56\x66\x91\x33\xdf\xe0\x17\xd7\x22\x79\x5a\x93\x64\x85\xda\xae\x9a\xf6\xa3\xa6\x3e\xe7\xcf\x41\x95\xd4\x39\xcd\x4d\xfb\x55\xd4\xb4\x1e\x9a\xfb\x06\x3f\x12\x80\x2e\x2b\x56\x3b\x9a\xe1\x7d\x51\x97\x3c\x75\xa7\xfc\x8b\xe6\x8b\x7e\x65\xc5\x72\xd9\x1c\xea\x7e\xde\x95\x7d\x5f\xd5\x6b\x5e\x83\x53\x49\xca\x2f\x34\x29\x73\x79\x21\xed\xa6\x39\x84\x55\xa6\xf4\xbf\xd2\xcf\xfc\x5c\x7e\x4a\x9e\x2b\x84\xcc\x50\x92\x9a\xec\xab\x4f\x55\x5f\x95\xd2\x98\xfd\xc8\xf6\x87\xed\x96\xe6\xf3\x6f\x87\xb2\xeb\x39\xeb\x9c\x7e\xd3\x0c\xc8\xef\xac\xea\xba\x03\x4a\xbc\xc2\x47\x46\x8b\x5a\x2f\x31\x9c\x33\x7c\x64\xd9\xaf\x55\xdd\xf5\xc5\x76\xfb\x21\xd3\x0f\x06\x96\x2f\x99\xa7\xbe\xea\xd1\x59\x4d\xcc\x2f\xfa\x72\xdf\xf1\x44\xe7\xcf\xab\xb6\xeb\x1f\xf7\x15\xa1\xda\xfb\x43\x9d\xad\x9a\xe5\x47\x42\x62\xde\x90\xd8\x4a\xaf\xae\x72\x1a\xd3\x03\x42\xe3\xf6\x50\xd7\x34\x8a\xfc\x45\x43\x23\xa3\x66\xaa\x55\x99\x3f\x03\xf4\x49\xbe\xdf\x96\x45\x47\x20\x65\xb1\xca\xbf\x2f\xf2\xbe\x68\xd7\x65\xff\xc3\xbd\xf9\x82\x36\xcf\xc7\x7b\xf9\xa6\x2d\xaf\x7e\xb8\x77\xbf\xbb\xf7\xe3\x8b\x03\x15\xdb\x56\x75\xd9\x7d\xff\xa4\xf8\x31\x5f\x16\x94\x43\x63\xbd\xc9\x17\xe5\x15\xef\x15\x6a\x2b\x27\x24\xad\xd7\xbc\x4f\x6e\xfa\x0d\x37\x48\x0b\x46\x1f\x5d\xce\x1b\xf5\x9b\x8c\x67\x89\x36\xf2\x7c\xb5\x30\xa2\x84\x0e\x21\xb9\xa5\x59\x7a\x73\x73\xf1\x9f\xaf\x4f\xf2\x73\xa2\x4c\xeb\xb6\xc4\x37\xfd\x47\x25\xfe\x94\xd3\x68\x2f\xab\x67\x4f\x67\x19\x95\xb5\x09\x79\x56\xf4\xc5\x82\xfb\x1e\x16\x89\x33\x65\x0f\x85\x3c\xec\x24\xa6\x75\xa0\x6b\x5d\x8f\xdd\xa9\x3b\x73\x72\x1f\x52\x1d\xba\x79\x43\x1d\x6f\x79\x07\x53\x7a\x98\xd9\x73\x99\x33\xaa\x2a\x7f\xf5\xf6\xed\xbb\x67\x4f\xf3\xb2\x5e\xd3\xcc\xe4\xd7\x55\xbf\xc9\x0f\xfd\xd5\xff\x3b\x5f\x97\x75\xd9\x16\xdb\xf9\xb2\xe2\x49\x69\x09\xaf\x72\x9a\x25\x19\xe2\x2c\xeb\xba\x2d\x11\x98\x15\xb7\x72\x71\xf1\x3a\x7f\x43\x9f\xd4\x19\x2a\xcb\x1d\xe9\x37\x59\xf7\xb7\x2d\x4f\x54\x68\xf0\x72\x53\xe6\xc0\x59\x00\x35\x57\xc3\x79\xc9\x57\xda\xd7\x59\xfe\xfd\xa2\xfd\xd1\xf5\xaf\x58\x74\xcd\xf6\xd0\x6b\xc9\xeb\x4d\x59\x63\xa1\x08\x95\xda\x9e\xa8\x95\xd1\xfe\x59\x56\xb6\xed\x9c\xe8\x66\x7f\xc3\xcb\xa3\x7d\x39\xd6\x8a\x54\x46\xa8\x5c\x37\x3d\x2d\x7f\x8e\x72\x52\x45\x55\x7f\x2a\xb6\xd5\x8a\x16\x29\x4e\x64\x5a\x16\x89\xab\x86\xd6\x9b\x4b\x13\x46\x37\xd7\x98\x22\xda\x60\x44\xd6\xf3\x7b\xb3\x7b\xa0\xb3\xf7\x1e\xdf\x9b\x65\x75\x33\x17\x22\xc0\x14\x79\x55\x75\xc5\x82\xa8\xb3\x9c\x16\xad\x11\xbb\xbf\x32\xde\x49\x57\x14\x22\x4f\x20\x78\x4d\xf8\x04\x02\xe1\x67\xa4\x2c\x88\x4c\x83\x96\x28\x15\xf1\x63\x37\x92\x13\xf0\x42\xa8\x4e\x48\x18\x8d\x39\xb3\x85\x36\xac\x3c\xdd\xef\xb7\xd5\x52\x9a\x7e\x21\x79\x11\x41\xf9\x3c\xd6\x49\xf1\x70\x40\x30\xcb\x73\x68\x46\xbd\x66\xaa\x94\x27\xe4\x1d\xe5\x37\x25\xed\xb8\xcd\x61\x2d\x67\xd2\xb6\x39\xac\xbe\xc1\xe1\x60\x2b\x17\x49\x70\xfe\xbe\xa1\x0e\x03\xab\x02\x40\x6c\xe2\x94\x08\x0a\xb3\x00\x6d\xb9\x6b\x7a\x9e\x38\x2d\xc6\x64\xee\xba\xa2\x4c\x1a\x69\x57\x7c\xa2\xc3\xad\x6f\x64\x2b\xaf\x68\xab\x2e\xb9\xe2\x59\x46\x64\x65\xae\xdb\x89\xe8\x8f\x6c\x29\x4b\x4b\x71\x17\x50\xbb\x03\xed\xc2\x0d\x55\xc6\x13\xcf\x7c\x08\x55\x39\xd5\x4f\x0c\x89\xea\x01\x75\xa0\x1d\xdf\xd0\x99\xc9\x0b\xfd\x0c\x1f\xfa\xdb\xd7\x4f\xbd\x2a\xae\xae\xa8\x57\x1d\xed\xa6\x97\xf9\x72\xdb\xd0\x56\xfc\xe5\xfd\xeb\x8e\x37\xda\x66\xbe\x6f\x5a\xf0\x1f\x94\x75\x4e\x9f\x21\xcd\x4d\x34\x43\xd4\x87\xdd\x82\x7e\x5d\x6f\xaa\xe5\x46\xa6\x9d\x4b\xf0\xfe\xa0\x54\x6a\xeLine truncated
|
||||
|
||||
func confLocaleLocale_enUsIniBytes() ([]byte, error) {
|
||||
return bindataRead(
|
||||
@@ -4361,7 +4361,7 @@ func confLocaleLocale_enUsIni() (*asset, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 55208, mode: os.FileMode(420), modTime: time.Unix(1472383451, 0)}
|
||||
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 55286, mode: os.FileMode(420), modTime: time.Unix(1472453742, 0)}
|
||||
a := &asset{bytes: bytes, info: info}
|
||||
return a, nil
|
||||
}
|
||||
|
||||
@@ -126,8 +126,8 @@ func (s *Sender) Send(from string, to []string, msg io.WriterTo) error {
|
||||
return fmt.Errorf("NewClient: %v", err)
|
||||
}
|
||||
|
||||
if !setting.MailService.DisableHelo {
|
||||
hostname := setting.MailService.HeloHostname
|
||||
if !opts.DisableHelo {
|
||||
hostname := opts.HeloHostname
|
||||
if len(hostname) == 0 {
|
||||
hostname, err = os.Hostname()
|
||||
if err != nil {
|
||||
|
||||
+1
-1
@@ -1199,6 +1199,7 @@ footer .ui.language .menu {
|
||||
.repository #clone-panel {
|
||||
margin-top: -8px;
|
||||
width: 100%;
|
||||
padding-left: 20px;
|
||||
}
|
||||
.repository #clone-panel input {
|
||||
border-radius: 0;
|
||||
@@ -1227,7 +1228,6 @@ footer .ui.language .menu {
|
||||
.repository.file.list #file-buttons {
|
||||
font-weight: normal;
|
||||
margin-top: -3px;
|
||||
padding-right: 20px;
|
||||
}
|
||||
.repository.file.list #file-buttons .ui.button {
|
||||
padding: 8px 10px;
|
||||
|
||||
@@ -127,6 +127,7 @@
|
||||
#clone-panel {
|
||||
margin-top: -8px;
|
||||
width: 100%;
|
||||
padding-left: 20px;
|
||||
|
||||
input {
|
||||
border-radius: 0;
|
||||
@@ -161,7 +162,6 @@
|
||||
#file-buttons {
|
||||
font-weight: normal;
|
||||
margin-top: -3px;
|
||||
padding-right: 20px;
|
||||
.ui.button {
|
||||
padding: 8px 10px;
|
||||
}
|
||||
|
||||
@@ -267,7 +267,7 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo
|
||||
IsNewFile: isNewFile,
|
||||
}); err != nil {
|
||||
ctx.Data["Err_TreePath"] = true
|
||||
ctx.RenderWithErr(ctx.Tr("repo.editor.failed_to_update_file", err), EDIT_FILE, &form)
|
||||
ctx.RenderWithErr(ctx.Tr("repo.editor.fail_to_update_file", form.TreePath, err), EDIT_FILE, &form)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
0.9.92.0828
|
||||
0.9.93.0829
|
||||
Reference in new issue
Block a user