Skip to content

Add option to update pull request by rebase#16125

Merged
6543 merged 18 commits into
go-gitea:mainfrom
a1012112796:update-rebase
Aug 31, 2021
Merged

Add option to update pull request by rebase#16125
6543 merged 18 commits into
go-gitea:mainfrom
a1012112796:update-rebase

Conversation

@a1012112796

@a1012112796 a1012112796 commented Jun 10, 2021 •
edited
Loading

Copy link
Copy Markdown
Member

close #16019

Peek 2021-07-31 16-10

@a1012112796 a1012112796 added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Jun 10, 2021
@a1012112796
add option to update pull request by rebase
be765ca 
Signed-off-by: a1012112796 <1012112796@qq.com>
@a1012112796 a1012112796 changed the title add a option to update pull request by rebase add option to update pull request by rebase Jun 10, 2021
@lunny

lunny commented Jun 10, 2021

Copy link
Copy Markdown
Member

A button with dropdown is better, it's similiar as merge button.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 10, 2021
zeripath
zeripath suggested changes Jun 10, 2021
View reviewed changes
Comment thread services/pull/update.go Outdated
@a1012112796
remove not needed checkout step
40f7d26 
Signed-off-by: a1012112796 <1012112796@qq.com>
typeless
typeless reviewed Jun 24, 2021
View reviewed changes
Comment thread services/pull/update.go Outdated
@a1012112796 a1012112796 mentioned this pull request Jul 15, 2021
Closed
@a1012112796 a1012112796 requested review from typeless and zeripath July 31, 2021 08:15
zeripath
zeripath reviewed Jul 31, 2021
View reviewed changes
Comment thread routers/web/repo/pull.go Outdated
zeripath
zeripath reviewed Jul 31, 2021
View reviewed changes
Comment thread services/pull/merge.go
zeripath
zeripath reviewed Jul 31, 2021
View reviewed changes
Comment thread services/pull/merge.go
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Aug 2, 2021
@codecov-commenter

codecov-commenter commented Aug 3, 2021 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #16125 (6a5d0f1) into main (35735bb) will increase coverage by 0.02%.
The diff coverage is 72.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #16125      +/-   ##
==========================================
+ Coverage   45.35%   45.38%   +0.02%     
==========================================
  Files         750      750              
  Lines       85100    85127      +27     
==========================================
+ Hits        38601    38637      +36     
+ Misses      40255    40247       -8     
+ Partials     6244     6243       -1
Impacted Files Coverage Δ
models/pull.go 56.35% <ø> (ø)
routers/web/repo/pull.go 30.29% <20.00%> (-0.04%) ⬇️
routers/api/v1/repo/pull.go 29.47% <50.00%> (+0.12%) ⬆️
services/pull/update.go 54.66% <77.41%> (+8.90%) ⬆️
services/pull/merge.go 49.87% <90.00%> (+1.12%) ⬆️
modules/git/blame.go 65.71% <0.00%> (-1.43%) ⬇️
modules/log/event.go 59.72% <0.00%> (-0.93%) ⬇️
services/pull/patch.go 55.93% <0.00%> (+1.69%) ⬆️
services/pull/check.go 28.27% <0.00%> (+2.75%) ⬆️
services/repository/push.go 50.00% <0.00%> (+3.07%) ⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f03abe8...6a5d0f1. Read the comment docs.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Aug 29, 2021
@6543 6543 added this to the 1.16.0 milestone Aug 29, 2021
@lunny

lunny commented Aug 29, 2021

Copy link
Copy Markdown
Member

CI failed is related.

@6543 6543 changed the title add option to update pull request by rebase Add option to update pull request by rebase Aug 31, 2021
@6543 6543 merged commit cbf05c3 into go-gitea:main Aug 31, 2021
@6543 6543 mentioned this pull request Aug 31, 2021
Closed
@a1012112796 a1012112796 deleted the update-rebase branch August 31, 2021 14:09
zeripath added a commit to zeripath/gitea that referenced this pull request Sep 3, 2021
@zeripath
Ensure that rebase conflicts are handled in updates
a617294 
PR go-gitea#16125 did not update the error handlers to handle conflict errors relating
to rebases. This PR adds them.

Fix go-gitea#16922

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this pull request Sep 3, 2021
Merged
zeripath added a commit that referenced this pull request Sep 5, 2021
@zeripath
Ensure that rebase conflicts are handled in updates (#16952)
eb0330a 
PR #16125 did not update the error handlers to handle conflict errors relating
to rebases. This PR adds them.

Fix #16922

Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath added a commit to zeripath/gitea that referenced this pull request Sep 5, 2021
@zeripath
Ensure that rebase conflicts are handled in updates (go-gitea#16952)
bb4e4fd 
Backport go-gitea#16952

PR go-gitea#16125 did not update the error handlers to handle conflict errors relating
to rebases. This PR adds them.

Fix go-gitea#16922

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this pull request Sep 5, 2021
Merged
6543 pushed a commit that referenced this pull request Sep 5, 2021
@zeripath
Ensure that rebase conflicts are handled in updates (#16952) (#16960)
e5ded0e 
Backport #16952

PR #16125 did not update the error handlers to handle conflict errors relating
to rebases. This PR adds them.

Fix #16922

Signed-off-by: Andrew Thornton <art27@cantab.net>
@go-gitea go-gitea locked and limited conversation to collaborators Oct 19, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@lunny lunny lunny approved these changes

@6543 6543 6543 approved these changes

@typeless typeless Awaiting requested review from typeless

+1 more reviewer

@zeripath zeripath zeripath approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/feature Completely new functionality. Can only be merged if feature freeze is not active.

Projects

None yet

Milestone

1.16.0

Development

Successfully merging this pull request may close these issues.

[Proposal] add option to update pull request by rebase

7 participants

@a1012112796 @lunny @codecov-commenter @zeripath @typeless @6543 @GiteaBot