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

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d65ee2f
Block PR on Outdated Branch
6543 Apr 8, 2020
767b072
finalize
6543 Apr 14, 2020
005843e
cleanup
6543 Apr 14, 2020
57beb56
Merge branch 'master' into protected-branch-check-uptodae
6543 Apr 14, 2020
12b8d8a
Merge branch 'master' into protected-branch-check-uptodae
6543 Apr 15, 2020
678b230
fix typo and sentences
6543 Apr 15, 2020
037cb7c
Merge branch 'master' into protected-branch-check-uptodae
6543 Apr 15, 2020
1cf9a7d
Merge branch 'master' into protected-branch-check-uptodae
6543 Apr 15, 2020
a4176be
Merge branch 'master' into protected-branch-check-uptodae
6543 Apr 15, 2020
626cc55
Merge branch 'master' into protected-branch-check-uptodae
6543 Apr 15, 2020
67216fe
Merge branch 'master' into protected-branch-check-uptodae
lafriks Apr 16, 2020
510c8e2
Merge branch 'master' into protected-branch-check-uptodae
6543 Apr 16, 2020
9585160
Merge branch 'master' into protected-branch-check-uptodae
6543 Apr 16, 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
Merge branch 'master' into protected-branch-check-uptodae
  • Loading branch information
@6543
6543 committed Apr 15, 2020
commit 626cc5586d305398ed59b8fbb33ddd3531ab19b0
4 changes: 2 additions & 2 deletions templates/repo/issue/view_content/pull.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
{{$.i18n.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }}
</div>
{{end}}
{{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection .IsBlockedByOutdatedBranch (and .EnableStatusCheck (not .IsRequiredStatusCheckSuccess))}}
{{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection .IsBlockedByOutdatedBranch (and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess))}}
{{if and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .RequireSigned) .WillSign)}}
{{if $notAllOverridableChecksOk}}
<div class="item text yellow">
Expand Down Expand Up @@ -353,7 +353,7 @@
<i class="icon icon-octicon">{{svg "octicon-x" 16}}</i>
{{$.i18n.Tr "repo.pulls.blocked_by_outdated_branch"}}
</div>
{{else if and .EnableStatusCheck (not .IsRequiredStatusCheckSuccess)}}
{{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}}
<div class="item text red">
{{svg "octicon-x" 16}}
{{$.i18n.Tr "repo.pulls.required_status_check_failed"}}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.