Add "Update Branch" button to Pull Requests by 6543 · Pull Request #9784 · go-gitea/gitea

6543 · 2020-01-15T16:41:47Z

close #9750

Look

Changes

Future Improvements:

different Update Modis (Update Branch button settings: allow choosing merge strategy isaacs/github#1419)
Update IsUserAllowedToUpdate to allow maintainer of baseRepo to change branch on headRepo
-> PR-Author must allow this access (need migration to add this option)
imprufe Default Message for merges (Provide Default messages for merges #9393) -> ignore merge commits from baseBranch

lunny · 2020-01-16T01:48:04Z

I would like to put it like below because the right space of the merge button will be used by manually merge hints.

…iewerMissed" use it but dont exist jet :/

- remove useless js chage

Repo: user2/repo1 Base: branch1 Head: pr-to-update

codecov-io · 2020-01-16T19:22:27Z

Codecov Report

Merging #9784 into master will decrease coverage by <.01%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master    #9784      +/-   ##
==========================================
- Coverage   42.35%   42.35%   -0.01%     
==========================================
  Files         604      604              
  Lines       79040    79041       +1     
==========================================
- Hits        33480    33475       -5     
- Misses      41447    41453       +6     
  Partials     4113     4113

Impacted Files	Coverage Δ
cmd/dump.go	`0% <0%> (ø)`	⬆️
services/pull/check.go	`54.54% <0%> (-2.1%)`	⬇️
modules/log/event.go	`64.61% <0%> (-1.03%)`	⬇️
models/gpg_key.go	`55.03% <0%> (-0.56%)`	⬇️
services/pull/patch.go	`69.81% <0%> (+1.88%)`	⬆️

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 f26c8b3...246748f. Read the comment docs.

lafriks · 2020-01-17T00:56:32Z

Please update screenshot for blog post ;)

6543 · 2020-01-17T00:56:50Z

sure

6543 · 2020-01-17T01:01:44Z

done

6543 · 2020-01-17T02:10:52Z

@lunny done

6543 · 2020-01-17T02:44:40Z

I'm ready if you are 🚀

guillep2k

Great work! 🚀

guillep2k · 2020-01-17T04:31:15Z

+	}
+
+	// default merge commit message
+	message := fmt.Sprintf("Merge branch '%s' into %s", issue.PullRequest.BaseBranch, issue.PullRequest.HeadBranch)


This should be configurable via .ini or via Crowdin.

But for this one, sometimes, we use English commit messages even if I'm using a Chinese User Interface.

We can use app.ini like we did with closing keywords and WIP...

guillep2k · 2020-01-17T04:41:17Z

LGTM, but only two nit that can be addressed now if we'd like to.

6543 · 2020-01-17T06:08:41Z

@guillep2k it was to late :( ...

but now we can talk if we should localice merge commit ...

GrayedFox · 2020-05-26T12:24:00Z

Your friends from isaacs/github#1419 say hello 👋

They are wondering if now that the foundations have been laid, if the future improvements (in particular different Update Modis) might get some love. Cheers.

This comment has been minimized.

Sign in to view

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 16, 2020

lunny added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Jan 16, 2020

lunny added this to the 1.12.0 milestone Jan 16, 2020

guillep2k mentioned this pull request Jan 16, 2020

Functionality that is useful for Gitea's administrative workflow #8659

Open

17 tasks

6543 added 12 commits January 16, 2020 16:23

add Divergence

38a27df

add Update Button

2c7fc31

first working version

26d686f

re-use code

d8522ac

split raw merge commands and db-change functions (notify, cache, ...)

efe6982

use rawMerge (remove redundant code)

328ecc3

own function to get Diverging of PRs

9249d47

use FlashError

454ee44

correct Error Msg

5d5d919

hook is triggerd ... so remove comment

3c6157b

add "branch2" to "user2/repo1" because it unit-test "TestPullView_Rev…

88fa4c5

…iewerMissed" use it but dont exist jet :/

move GetPerm to IsUserAllowedToUpdate

7776738

6543 force-pushed the update-pr branch from 2aa71f1 to 7776738 Compare January 16, 2020 15:25

6543 added 8 commits January 16, 2020 16:30

add Flash Success MSG

e3adbd2

imprufe code

05c0c1b

- remove useless js chage

fix-lint

f7d924a

TEST: add PullRequest ID:5

e2f96d9

Repo: user2/repo1 Base: branch1 Head: pr-to-update

correct comments

8bad5d2

Merge branch 'master' into update-pr

7442991

make PR5 outdated

143d8e8

fix Tests

fb33b4b

WIP: add pull update test

069a393

lafriks reviewed Jan 16, 2020

View reviewed changes

Comment thread routers/repo/pull.go

GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 17, 2020

lafriks changed the title ~~Add "Update Branch" button to PR-View~~ Add "Update Branch" button to Pull Requests Jan 17, 2020

6543 mentioned this pull request Jan 17, 2020

[Feature Request] Protected Branch: Only Merge if PR is 0 Cmmits Behind BaseBranch #9816

Closed

lunny reviewed Jan 17, 2020

View reviewed changes

Comment thread services/pull/update.go Outdated

lunny reviewed Jan 17, 2020

View reviewed changes

Comment thread services/pull/update.go Outdated

6543 added 2 commits January 17, 2020 03:09

introduce IsSameRepo

717406e

remove useless check

f26c8b3

lunny approved these changes Jan 17, 2020

View reviewed changes

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 Jan 17, 2020

6543 mentioned this pull request Jan 17, 2020

Branch protection: Require branches to be up to date before merging #9786

Closed

Merge branch 'master' into update-pr

246748f

guillep2k approved these changes Jan 17, 2020

View reviewed changes

lafriks merged commit 36943e5 into go-gitea:master Jan 17, 2020

This was referenced Jan 17, 2020

[Discusion] Localize Commit Message for PullRequest Update #9823

Closed

[Docs] add usefull info to REQUIRE_SIGNIN_VIEW #9848

Merged

View pull request 500 #9914

Closed

zeripath mentioned this pull request Jan 24, 2020

Fix activity count in TestRepoActivity #9959

Merged

6543 mentioned this pull request Mar 31, 2020

Prevent deadlock in pull_service.GetDiverging(pr) #10905

Merged

markusamshove mentioned this pull request May 19, 2020

Add option/templates to configure automatic commit messages #11509

Open

1 task

go-gitea locked and limited conversation to collaborators Nov 24, 2020

delvh removed the release/highlight Marks a PR as a highlight-worthy change for the release notes. label Oct 7, 2023

Uh oh!

Conversation

6543 commented Jan 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Look

Changes

Future Improvements:

Uh oh!

This comment has been minimized.

lunny commented Jan 16, 2020

Uh oh!

codecov-io commented Jan 16, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

lafriks commented Jan 17, 2020

Uh oh!

6543 commented Jan 17, 2020

Uh oh!

6543 commented Jan 17, 2020

Uh oh!

Uh oh!

Uh oh!

6543 commented Jan 17, 2020

Uh oh!

6543 commented Jan 17, 2020

Uh oh!

guillep2k left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

guillep2k Jan 17, 2020

Choose a reason for hiding this comment

Uh oh!

lunny Jan 17, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

guillep2k Jan 17, 2020

Choose a reason for hiding this comment

Uh oh!

guillep2k commented Jan 17, 2020

Uh oh!

6543 commented Jan 17, 2020

Uh oh!

GrayedFox commented May 26, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

6543 commented Jan 15, 2020 •

edited

Loading

codecov-io commented Jan 16, 2020 •

edited

Loading

lunny Jan 17, 2020 •

edited

Loading

GrayedFox commented May 26, 2020 •

edited

Loading