From 63e6e3127139bed511c7af3fa354927ea0ffad4f Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 24 Oct 2015 15:35:26 -0400 Subject: add config and update locale --- conf/app.ini | 2 ++ conf/locale/locale_en-US.ini | 2 +- conf/locale/locale_zh-CN.ini | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/app.ini b/conf/app.ini index 213d945115..a5f7a0b7ca 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -11,6 +11,8 @@ RUN_MODE = dev [repository] ROOT = SCRIPT_TYPE = bash +; Patch test queue length, make it as large as possible. +PULL_REQUEST_QUEUE_LENGTH = 10000 [ui] ; Number of repositories that are showed in one explore page diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 1ad0b668f3..df5f3c148b 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -498,7 +498,7 @@ pulls.reopen_to_merge = Please reopen this pull request to perform merge operati pulls.merged = Merged pulls.has_merged = This pull request has been merged successfully! pulls.data_broken = Data of this pull request has been broken due to deletion of fork information. -pulls.is_checking = The conflit checking is still in progress, please refresh page in few moments. +pulls.is_checking = The conflict checking is still in progress, please refresh page in few moments. pulls.can_auto_merge_desc = You can perform auto-merge operation on this pull request. pulls.cannot_auto_merge_desc = You can't perform auto-merge operation because there are conflicts between commits. pulls.cannot_auto_merge_helper = Please use command line tool to solve it. diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini index 9dac513fbb..339b59d81b 100755 --- a/conf/locale/locale_zh-CN.ini +++ b/conf/locale/locale_zh-CN.ini @@ -498,6 +498,7 @@ pulls.reopen_to_merge=请重新开启合并请求来完成合并操作。 pulls.merged=已合并 pulls.has_merged=该合并请求已经成功合并！ pulls.data_broken=该合并请求的数据由于派生仓库的相关信息被删除而被破坏。 +pulls.is_checking=该合并请求正在进行冲突检查，请稍后再刷新页面。 pulls.can_auto_merge_desc=您可以实现该合并请求的自动合并操作。 pulls.cannot_auto_merge_desc=因为代码提交存在冲突，您无法对该合并请求执行自动合并操作。 pulls.cannot_auto_merge_helper=请使用命令行工具来解决冲突。 -- cgit v1.2.3