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

Prevent merge of outdated PRs on protected branches #11012

Merged
merged 13 commits into from
Apr 17, 2020
Merged

Prevent merge of outdated PRs on protected branches #11012

merged 13 commits into from
Apr 17, 2020

Conversation

6543
Copy link
Member

@6543 6543 commented Apr 8, 2020 •
edited

close #9786

@6543 6543 mentioned this pull request Apr 8, 2020
Open
17 tasks
@6543
Copy link
Member Author

6543 commented Apr 8, 2020

Screenshot at 2020-04-08 15-49-18
Screenshot at 2020-04-08 15-49-49

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 8, 2020
@guillep2k guillep2k changed the title [WPI] Protected Branch Block Outdated [WIP] Prevent merge of outdated PRs on protected branches Apr 9, 2020
@guillep2k guillep2k added the type/enhancement An improvement of existing functionality label Apr 9, 2020
@guillep2k guillep2k added this to the 1.12.0 milestone Apr 9, 2020
@guillep2k
Copy link
Member

I took the liberty of editing the title. I hope you don't mind. 😉

@6543 6543 force-pushed the protected-branch-check-uptodae branch from 2d810d5 to 767b072 Compare April 14, 2020 14:12
@6543 6543 changed the title [WIP] Prevent merge of outdated PRs on protected branches Prevent merge of outdated PRs on protected branches Apr 14, 2020
@codecov-io
Copy link

codecov-io commented Apr 14, 2020 •
edited

Codecov Report

Merging #11012 into master will increase coverage by 0.06%.
The diff coverage is 35.92%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #11012      +/-   ##
==========================================
+ Coverage   43.46%   43.53%   +0.06%     
==========================================
  Files         597      599       +2     
  Lines       84706    84818     +112     
==========================================
+ Hits        36821    36924     +103     
- Misses      43344    43350       +6     
- Partials     4541     4544       +3
Impacted Files Coverage Δ
models/issue_comment.go 46.68% <ø> (ø)
models/migrations/migrations.go 3.50% <ø> (ø)
models/migrations/v136.go 0.00% <0.00%> (ø)
models/migrations/v137.go 0.00% <0.00%> (ø)
models/repo_language_stats.go 66.37% <ø> (ø)
modules/analyze/code_langauge.go 81.25% <ø> (ø)
modules/auth/repo_form.go 43.69% <ø> (ø)
modules/auth/sso/basic.go 50.81% <0.00%> (+7.15%) ⬆️
modules/git/repo_language_stats.go 66.17% <ø> (ø)
modules/indexer/code/bleve.go 64.70% <ø> (ø)
... and 28 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 0040f8b...626cc55. Read the comment docs.

@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 Apr 14, 2020
guillep2k
guillep2k reviewed Apr 15, 2020
View reviewed changes
Copy link
Member

@guillep2k guillep2k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some nits

options/locale/locale_en-US.ini Outdated Show resolved Hide resolved
options/locale/locale_en-US.ini Outdated Show resolved Hide resolved
services/pull/merge.go Outdated Show resolved Hide resolved
@6543
Copy link
Member Author

6543 commented Apr 15, 2020

@guillep2k done

@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 Apr 15, 2020
@lafriks
Copy link
Member

lafriks commented Apr 15, 2020

Please resolve conflict

@6543
Copy link
Member Author

6543 commented Apr 16, 2020

@lafriks done

@6543
Copy link
Member Author

6543 commented Apr 16, 2020

ready to merge 🚀

@lafriks lafriks added the type/changelog Adds the changelog for a new Gitea version label Apr 16, 2020
@guillep2k
Copy link
Member

Ping LG-TM

@guillep2k guillep2k merged commit c52d48a into go-gitea:master Apr 17, 2020
@6543 6543 deleted the protected-branch-check-uptodae branch April 17, 2020 01:18
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
@6543 @guillep2k @lafriks
Prevent merge of outdated PRs on protected branches (go-gitea#11012)
8e8e5a6 
* Block PR on Outdated Branch

* finalize

* cleanup

* fix typo and sentences

thanks @guillep2k

Co-Authored-By: guillep2k <[email protected]>

Co-authored-by: guillep2k <[email protected]>
Co-authored-by: Lauris BH <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
@delvh delvh removed the type/changelog Adds the changelog for a new Gitea version label Oct 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

@guillep2k guillep2k guillep2k approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.12.0
Development

Successfully merging this pull request may close these issues.

Branch protection: Require branches to be up to date before merging
6 participants
@6543 @guillep2k @codecov-io @lafriks @GiteaBot @delvh