zeripath 8eeb2877d5 Adjust error reporting from merge failures and use LC_ALL=C for git (#8548) ... There are two major components to this PR: * This PR handles merge and rebase failures from merging a little more nicely with Flash errors rather a 500. * All git commands are run in the LC_ALL="C" environment to ensure that error messages are in English. This DefaultLocale is defined in a way that if necessary (due to platform weirdness) it can be overridden at build time using LDFLAGS="-X "code.gitea.io/gitea/modules/git.DefaultLocale=C"" with C changed for the locale as necessary.		2019-11-10 08:42:51 +00:00
..
activity.go
attachment.go
blame.go
branch.go
commit.go
compare.go
download.go
editor_test.go
editor.go
http.go
issue_dependency.go
issue_label_test.go
issue_label.go
issue_lock.go
issue_stopwatch.go
issue_timetrack.go
issue_watch.go
issue.go
lfs.go
main_test.go
middlewares.go
milestone.go
pull_review.go
pull.go	Adjust error reporting from merge failures and use LC_ALL=C for git (#8548)	2019-11-10 08:42:51 +00:00
release_test.go
release.go
repo.go
search.go
setting_protected_branch.go
setting.go
settings_test.go
topic.go
view.go
webhook.go
wiki_test.go
wiki.go