0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-26 21:54:32 +01:00
gitea/models
6543 36943e56d6 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>
2020-01-17 08:03:40 +02:00
..
fixtures Add "Update Branch" button to Pull Requests (#9784) 2020-01-17 08:03:40 +02:00
migrations Migrate reactions when migrating repository from github (#9599) 2020-01-15 12:14:07 +01:00
access.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
access_test.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
action.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
action_list.go
action_test.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
admin.go
admin_test.go
attachment.go Only serve attachments when linked to issue/release and if accessible by user (#9340) 2020-01-05 01:20:08 +02:00
attachment_test.go Only serve attachments when linked to issue/release and if accessible by user (#9340) 2020-01-05 01:20:08 +02:00
branches.go Add require signed commit for protected branch (#9708) 2020-01-15 09:32:57 +01:00
branches_test.go
commit_status.go
commit_status_test.go
consistency.go
context.go
convert.go
error.go Add require signed commit for protected branch (#9708) 2020-01-15 09:32:57 +01:00
error_oauth2.go
external_login_user.go Migrate reactions when migrating repository from github (#9599) 2020-01-15 12:14:07 +01:00
gpg_key.go
gpg_key_test.go
helper.go
helper_directory.go
helper_environment.go Add owner_name column for table repository for maintaince reason (#9717) 2020-01-12 17:36:21 +08:00
issue.go Migrate reactions when migrating repository from github (#9599) 2020-01-15 12:14:07 +01:00
issue_assignees.go remove unused method and rename createcommentWithNoAction (#9367) 2019-12-16 11:54:24 +08:00
issue_assignees_test.go
issue_comment.go Migrate reactions when migrating repository from github (#9599) 2020-01-15 12:14:07 +01:00
issue_comment_list.go
issue_comment_test.go
issue_dependency.go
issue_dependency_test.go Refactor comment (#9330) 2019-12-15 16:57:34 -05:00
issue_label.go Move create/fork repository from models to modules/repository (#9489) 2020-01-12 20:11:17 +08:00
issue_label_test.go
issue_list.go [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_list_test.go [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_lock.go remove unused method and rename createcommentWithNoAction (#9367) 2019-12-16 11:54:24 +08:00
issue_milestone.go [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_milestone_test.go [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_reaction.go Migrate reactions when migrating repository from github (#9599) 2020-01-15 12:14:07 +01:00
issue_reaction_test.go Migrate reactions when migrating repository from github (#9599) 2020-01-15 12:14:07 +01:00
issue_stopwatch.go
issue_stopwatch_test.go
issue_test.go Add "Update Branch" button to Pull Requests (#9784) 2020-01-17 08:03:40 +02:00
issue_tracked_time.go Move tracked time api convert to convert package (#9665) 2020-01-10 21:59:41 -05:00
issue_tracked_time_test.go [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_user.go
issue_user_test.go Add "Update Branch" button to Pull Requests (#9784) 2020-01-17 08:03:40 +02:00
issue_watch.go Fix Issue Unsubscription (#9634) 2020-01-07 15:41:35 +00:00
issue_watch_test.go Fix Issue Unsubscription (#9634) 2020-01-07 15:41:35 +00:00
issue_xref.go remove unused method and rename createcommentWithNoAction (#9367) 2019-12-16 11:54:24 +08:00
issue_xref_test.go Refactor comment (#9330) 2019-12-15 16:57:34 -05:00
lfs.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
lfs_lock.go
log.go
login_source.go
main_test.go
migrate.go Migrate reactions when migrating repository from github (#9599) 2020-01-15 12:14:07 +01:00
models.go Graceful: Xorm, RepoIndexer, Cron and Others (#9282) 2019-12-15 09:51:28 +00:00
models_test.go
notification.go [API] add endpoint to check notifications [Extend #9488] (#9595) 2020-01-14 16:37:19 +01:00
notification_test.go [API] Add notification endpoint (#9488) 2020-01-09 11:56:32 +00:00
oauth2.go
oauth2_application.go
oauth2_application_test.go
org.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
org_team.go [API] orgEditTeam make Fields optional (#9556) 2020-01-09 13:15:14 +00:00
org_team_test.go Move create/fork repository from models to modules/repository (#9489) 2020-01-12 20:11:17 +08:00
org_test.go
pull.go Add "Update Branch" button to Pull Requests (#9784) 2020-01-17 08:03:40 +02:00
pull_list.go Graceful: Xorm, RepoIndexer, Cron and Others (#9282) 2019-12-15 09:51:28 +00:00
pull_sign.go Add require signed commit for protected branch (#9708) 2020-01-15 09:32:57 +01:00
pull_test.go Add "Update Branch" button to Pull Requests (#9784) 2020-01-17 08:03:40 +02:00
release.go
repo.go Move RepoWorkingPool to services/repository package (#9754) 2020-01-15 04:14:50 +01:00
repo_activity.go
repo_branch.go Move newbranch to standalone package (#9627) 2020-01-14 11:38:04 +08:00
repo_collaboration.go
repo_collaboration_test.go
repo_generate.go Move create/fork repository from models to modules/repository (#9489) 2020-01-12 20:11:17 +08:00
repo_generate_test.go
repo_indexer.go Add owner_name column for table repository for maintaince reason (#9717) 2020-01-12 17:36:21 +08:00
repo_issue.go
repo_list.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
repo_list_test.go [BugFix] Hide public repos owned by private orgs (#9609) 2020-01-05 18:48:47 +00:00
repo_mirror.go
repo_permission.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
repo_permission_test.go
repo_redirect.go
repo_redirect_test.go
repo_sign.go Add require signed commit for protected branch (#9708) 2020-01-15 09:32:57 +01:00
repo_test.go Move create/fork repository from models to modules/repository (#9489) 2020-01-12 20:11:17 +08:00
repo_unit.go
repo_watch.go Batch hook pre- and post-receive calls (#8602) 2019-12-26 13:29:45 +02:00
repo_watch_test.go
review.go Mark PR reviews as stale at push and allow to dismiss stale approvals (#9532) 2020-01-09 01:47:45 +00:00
review_test.go
ssh_key.go
ssh_key_test.go
star.go
star_test.go
task.go Move create/fork repository from models to modules/repository (#9489) 2020-01-12 20:11:17 +08:00
test_fixtures.go
token.go
token_test.go
topic.go
topic_test.go
twofactor.go
u2f.go
u2f_test.go
unit.go
unit_tests.go
update.go Move push commits from models to modules/repository (#9370) 2020-01-10 17:34:21 +08:00
upload.go
user.go Migrate reactions when migrating repository from github (#9599) 2020-01-15 12:14:07 +01:00
user_follow.go
user_follow_test.go
user_heatmap.go
user_heatmap_test.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
user_mail.go
user_mail_test.go
user_openid.go
user_openid_test.go
user_test.go Restricted users (#6274) 2020-01-13 18:33:46 +01:00
userlist.go
userlist_test.go
webhook.go
webhook_test.go
wiki.go Add owner_name column for table repository for maintaince reason (#9717) 2020-01-12 17:36:21 +08:00
wiki_test.go Move wiki related funtions from models to services/wiki (#9355) 2020-01-07 18:27:36 +00:00