summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2019-06-30 15:57:59 +0800
committerzeripath <art27@cantab.net>2019-06-30 08:57:59 +0100
commitff85dd3e12c05be98d9132de2e629523d096f712 (patch)
treec0b5d69eef2fd859204437bd8b206e06a7b8a47d /options
parent1e46eedce721e22e3e1e94eec6e0afccd36147c1 (diff)
downloadgitea-ff85dd3e12c05be98d9132de2e629523d096f712.tar.gz
gitea-ff85dd3e12c05be98d9132de2e629523d096f712.zip
Add commit statuses reports on pull request view (#6845)
* Add commit statuses reports on pull view * Add some translations * improve the UI * fix fmt * fix tests * add a new test git repo to fix tests * fix bug when headRepo or headBranch missing * fix tests * fix tests * fix consistency * fix tests * fix tests * change the test repo * fix tests * fix tests * fix migration * keep db size consistency * fix translation * change commit hash status table unique index * remove unused table * use char instead varchar * make hashCommitStatusContext private * split merge section with status check on pull view ui * fix tests; fix arc-green theme on pull ui
Diffstat (limited to 'options')
-rw-r--r--options/locale/locale_en-US.ini3
1 files changed, 3 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index acaa98c3a2..223df91fda 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -981,6 +981,9 @@ pulls.rebase_merge_commit_pull_request = Rebase and Merge (--no-ff)
pulls.squash_merge_pull_request = Squash and Merge
pulls.invalid_merge_option = You cannot use this merge option for this pull request.
pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.`
+pulls.status_checking = Some checks are pending
+pulls.status_checks_success = All checks were successful
+pulls.status_checks_error = Some checks failed
milestones.new = New Milestone
milestones.open_tab = %d Open