diff options
| author | Andrey Nering <andrey.nering@gmail.com> | 2016-06-29 12:11:00 -0300 |
|---|---|---|
| committer | 无闻 <u@gogs.io> | 2016-06-29 23:11:00 +0800 |
| commit | 743d22669a49b743f1963dc579294a092c4980c1 (patch) | |
| tree | dcb537495d87ae31e1b041d999a72c3dfc27b89a /conf | |
| parent | 84841c8c4b257bd627fcc033112237d40e3a329a (diff) | |
| download | gitea-743d22669a49b743f1963dc579294a092c4980c1.tar.gz gitea-743d22669a49b743f1963dc579294a092c4980c1.zip | |
Re-work MAX_DIFF_LINES: supress diff per file, not the whole diff (#3174)
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/app.ini | 25 | ||||
| -rw-r--r-- | conf/locale/locale_en-US.ini | 2 |
2 files changed, 17 insertions, 10 deletions
diff --git a/conf/app.ini b/conf/app.ini index bd6fb9bd6b..7f7b329030 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -12,7 +12,7 @@ RUN_MODE = dev ROOT = SCRIPT_TYPE = bash ; Default ANSI charset -ANSI_CHARSET = +ANSI_CHARSET = ; Force every new repository to be private FORCE_PRIVATE = false ; Global maximum creation limit of repository per user, -1 means no limit @@ -70,7 +70,7 @@ SSH_PORT = 22 ; Port number builtin SSH server listens on SSH_LISTEN_PORT = %(SSH_PORT)s ; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'. -SSH_ROOT_PATH = +SSH_ROOT_PATH = ; Directory to create temporary files when test publick key using ssh-keygen, ; default is system temporary directory. SSH_KEY_TEST_PATH = @@ -169,18 +169,18 @@ SUBJECT = %(APP_NAME)s ; Gmail: smtp.gmail.com:587 ; QQ: smtp.qq.com:25 ; Note, if the port ends with "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409. If the server supports STARTTLS it will always be used. -HOST = +HOST = ; Disable HELO operation when hostname are different. -DISABLE_HELO = +DISABLE_HELO = ; Custom hostname for HELO operation, default is from system. -HELO_HOSTNAME = +HELO_HOSTNAME = ; Do not verify the certificate of the server. Only use this for self-signed certificates -SKIP_VERIFY = +SKIP_VERIFY = ; Use client certificate USE_CERTIFICATE = false CERT_FILE = custom/mailer/cert.pem KEY_FILE = custom/mailer/key.pem -; Mail from address, RFC 5322. This can be just an email address, or the `"Name" <email@example.com>` format +; Mail from address, RFC 5322. This can be just an email address, or the `"Name" <email@example.com>` format FROM = ; Mailer user name and password USER = @@ -320,7 +320,7 @@ SCHEDULE = @every 24h TIMEOUT = 60s ; Arguments for command 'git fsck', e.g. "--unreachable --tags" ; see more on http://git-scm.com/docs/git-fsck/1.7.5 -ARGS = +ARGS = ; Check repository statistics [cron.check_repo_stats] @@ -328,10 +328,15 @@ RUN_AT_START = true SCHEDULE = @every 24h [git] -MAX_GIT_DIFF_LINES = 10000 +; Max number of lines allowed of a single file in diff view. +MAX_GIT_DIFF_LINES = 500 +; Max number of characters of a line allowed in diff view. +MAX_GIT_DIFF_LINE_CHARACTERS = 500 +; Max number of files shown in diff view. +MAX_GIT_DIFF_FILES = 100 ; Arguments for command 'git gc', e.g. "--aggressive --auto" ; see more on http://git-scm.com/docs/git-gc/1.7.5 -GC_ARGS = +GC_ARGS = ; Operation timeout in seconds [git.timeout] diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 87453efa6d..ad6f183230 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -690,6 +690,8 @@ diff.show_unified_view = Unified View diff.stats_desc = <strong> %d changed files</strong> with <strong>%d additions</strong> and <strong>%d deletions</strong> diff.bin = BIN diff.view_file = View File +diff.file_supressed = File diff supressed because it is too large +diff.too_many_files = Some files were not shown because too many files changed in this diff release.releases = Releases release.new_release = New Release |