aboutsummaryrefslogtreecommitdiffstats
path: root/models/issue_user_test.go
diff options
context:
space:
mode:
author6543 <6543@obermui.de>2020-01-17 07:03:40 +0100
committerLauris BH <lauris@nix.lv>2020-01-17 08:03:40 +0200
commit36943e56d66a2d711a6b0c27219ce91a3ddc020a (patch)
tree6e1c57454beeaa9d64470c82db1140a5f540ad65 /models/issue_user_test.go
parent9f40bb020eaea153eca77d3071a4f2cc8bcd2a8e (diff)
downloadgitea-36943e56d66a2d711a6b0c27219ce91a3ddc020a.tar.gz
gitea-36943e56d66a2d711a6b0c27219ce91a3ddc020a.zip
Add "Update Branch" button to Pull Requests (#9784)
* add Divergence * add Update Button * first working version * re-use code * split raw merge commands and db-change functions (notify, cache, ...) * use rawMerge (remove redundant code) * own function to get Diverging of PRs * use FlashError * correct Error Msg * hook is triggerd ... so remove comment * add "branch2" to "user2/repo1" because it unit-test "TestPullView_ReviewerMissed" use it but dont exist jet :/ * move GetPerm to IsUserAllowedToUpdate * add Flash Success MSG * imprufe code - remove useless js chage * fix-lint * TEST: add PullRequest ID:5 Repo: user2/repo1 Base: branch1 Head: pr-to-update * correct comments * make PR5 outdated * fix Tests * WIP: add pull update test * update revs * update locales * working TEST * update UI * misspell * change style * add 1s delay so rev exist * move row up (before merge row) * fix lint nit * UI remove divider * Update style * nits * do it right * introduce IsSameRepo * remove useless check Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'models/issue_user_test.go')
-rw-r--r--models/issue_user_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/models/issue_user_test.go b/models/issue_user_test.go
index a57ab33f9e..01e0bdc644 100644
--- a/models/issue_user_test.go
+++ b/models/issue_user_test.go
@@ -17,7 +17,7 @@ func Test_newIssueUsers(t *testing.T) {
newIssue := &Issue{
RepoID: repo.ID,
PosterID: 4,
- Index: 5,
+ Index: 6,
Title: "newTestIssueTitle",
Content: "newTestIssueContent",
}