8000 Option to delay conflict checking of old pull requests until page view by brechtvl · Pull Request #27779 · go-gitea/gitea · GitHub
[go: up one dir, main page]
Skip to content
8000

Option to delay conflict checking of old pull requests until page view #27779

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

Merged
merged 14 commits into from
Apr 24, 2025
Merged

Option to delay conflict checking of old pull requests until page view #27779

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
dbd6fe1
Option to delay conflict checking of old pull requests until page view
brechtvl May 21, 2023
7ee1d02
Merge branch 'main' into delay-pr-check
wxiaoguang Apr 24, 2025
1c00cc3
temp
wxiaoguang Apr 24, 2025
7062121
fix test and add ui
wxiaoguang Apr 24, 2025
d1f8ad1
fix ui & test
wxiaoguang Apr 24, 2025
a643f3b
add tests
wxiaoguang Apr 24, 2025
384a28e
Update services/pull/check.go
wxiaoguang Apr 24, 2025
d545e22
Update services/pull/check.go
wxiaoguang Apr 24, 2025
e31fedf
Merge branch 'main' into delay-pr-check
wxiaoguang Apr 24, 2025
250103c
change text, add animation
wxiaoguang Apr 24, 2025
6abdcd6
add css todo
wxiaoguang Apr 24, 2025
06dc686
fix data-race
wxiaoguang Apr 24, 2025
7c3ee64
remove duplicate code
wxiaoguang Apr 24, 2025
118bf96
fix test
wxiaoguang Apr 24, 2025
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
change text, add animation
  • Loading branch information
@wxiaoguang
wxiaoguang committed Apr 24, 2025
commit 250103cb256580bcaf0efa2841001f3fdcbf9df2
2 changes: 1 addition & 1 deletion options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1880,7 +1880,7 @@ pulls.add_prefix = Add <strong>%s</strong> prefix
pulls.remove_prefix = Remove <strong>%s</strong> prefix
pulls.data_broken = This pull request is broken due to missing fork information.
pulls.files_conflicted = This pull request has changes conflicting with the target branch.
pulls.is_checking = "Merge conflict checking is in progress. Try again in few moments."
pulls.is_checking = Checking for merge conflicts ...
pulls.is_ancestor = "This branch is already included in the target branch. There is nothing to merge."
pulls.is_empty = "The changes on this branch are already on the target branch. This will be an empty commit."
pulls.required_status_check_failed = Some required checks were not successful.
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/issue/view_content/pull_merge_box.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
{{template "repo/issue/view_content/update_branch_by_merge" $}}
{{else if .Issue.PullRequest.IsChecking}}
<div class="item">
{{svg "octicon-sync"}}
{{svg "octicon-sync" 16 "circular-spin"}}
{{ctx.Locale.Tr "repo.pulls.is_checking"}}
</div>
{{else if .Issue.PullRequest.IsAncestor}}
Expand Down
Loading
0