Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add "Update Branch" button to Pull Requests #9784

Merged
merged 39 commits into from
Jan 17, 2020
Merged

Add "Update Branch" button to Pull Requests #9784

Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
38a27df
add Divergence
6543 Jan 15, 2020
2c7fc31
add Update Button
6543 Jan 15, 2020
26d686f
first working version
6543 Jan 16, 2020
d8522ac
re-use code
6543 Jan 16, 2020
efe6982
split raw merge commands and db-change functions (notify, cache, ...)
6543 Jan 16, 2020
328ecc3
use rawMerge (remove redundant code)
6543 Jan 16, 2020
9249d47
own function to get Diverging of PRs
6543 Jan 16, 2020
454ee44
use FlashError
6543 Jan 16, 2020
5d5d919
correct Error Msg
6543 Jan 16, 2020
3c6157b
hook is triggerd ... so remove comment
6543 Jan 16, 2020
88fa4c5
add "branch2" to "user2/repo1" because it unit-test "TestPullView_Rev…
6543 Jan 16, 2020
7776738
move GetPerm to IsUserAllowedToUpdate
6543 Jan 16, 2020
e3adbd2
add Flash Success MSG
6543 Jan 16, 2020
05c0c1b
imprufe code
6543 Jan 16, 2020
f7d924a
fix-lint
6543 Jan 16, 2020
e2f96d9
TEST: add PullRequest ID:5
6543 Jan 16, 2020
8bad5d2
correct comments
6543 Jan 16, 2020
7442991
Merge branch 'master' into update-pr
6543 Jan 16, 2020
143d8e8
make PR5 outdated
6543 Jan 16, 2020
fb33b4b
fix Tests
6543 Jan 16, 2020
069a393
WIP: add pull update test
6543 Jan 16, 2020
720fbf1
update revs
6543 Jan 16, 2020
892ddd9
update locales
6543 Jan 16, 2020
7aa9e84
working TEST
6543 Jan 16, 2020
7502ff5
Merge branch 'master' into update-pr
6543 Jan 16, 2020
36a34cd
update UI
6543 Jan 16, 2020
18fadef
misspell
6543 Jan 16, 2020
97e51ec
change style
6543 Jan 16, 2020
18eb495
add 1s delay so rev exist
6543 Jan 16, 2020
2b58961
move row up (before merge row)
6543 Jan 16, 2020
688a53a
fix lint nit
6543 Jan 16, 2020
97a6f83
UI remove divider
6543 Jan 16, 2020
32c5eee
Merge branch 'master' into update-pr
6543 Jan 16, 2020
6400bcc
Update style
lafriks Jan 17, 2020
fa4779b
nits
6543 Jan 17, 2020
fbbc7f4
do it right
6543 Jan 17, 2020
717406e
introduce IsSameRepo
6543 Jan 17, 2020
f26c8b3
remove useless check
6543 Jan 17, 2020
246748f
Merge branch 'master' into update-pr
6543 Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use FlashError
  • Loading branch information
@6543
6543 committed Jan 16, 2020
commit 454ee44ecab38f61974c2fc193839d33407152d5
4 changes: 2 additions & 2 deletions routers/repo/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,8 +658,8 @@ func UpdatePullRequest(ctx *context.Context) {
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index))
return
}
ctx.ServerError("Update", err)
return
ctx.Flash.Error(err.Error())
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index))
}
}

Expand Down