Fix 2-dot direct compare to use the right base commit #24133
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jtran
force-pushed
the
jt/fix-direct-compare
branch
from
2ff0b26 to
84aa181
Compare
jtran
force-pushed
the
jt/fix-direct-compare
branch
from
84aa181 to
766460c
Compare
Codecov Report
@@ Coverage Diff @@
## main #24133 +/- ##
==========================================
- Coverage 47.14% 47.08% -0.06%
==========================================
Files 1149 1161 +12
Lines 151446 153792 +2346
==========================================
+ Hits 71397 72418 +1021
- Misses 71611 72853 +1242
- Partials 8438 8521 +83
... and 159 files with indirect coverage changes Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
GiteaBot
added
the
lgtm/need 2
6543
added
the
outdated/backport/v1.19
6543
approved these changes
Apr 15, 2023
GiteaBot
added
lgtm/need 1
kdumontnu
approved these changes
Apr 15, 2023
GiteaBot
added
lgtm/done
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Apr 16, 2023
For 2-dot direct compare, we should use the base commit in the title and templates, as is used elsewhere, not the common ancestor which is used for 3-dot compare. I believe that this change should have been included in go-gitea#22949.
6543
pushed a commit
that referenced
this pull request
Apr 16, 2023
Backport #24133 by @jtran For 2-dot direct compare, we should use the base commit in the title and templates, as is used elsewhere, not the common ancestor which is used for 3-dot compare. I believe that this change should have been included in #22949. Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Apr 18, 2023
* giteaofficial/main: (25 commits) zh-cn support on doc pages (go-gitea#24166) [skip ci] Updated translations via Crowdin Use double quotes consistently in en-US (go-gitea#24141) Use correct locale key for forks page (go-gitea#24172) Improve Wiki TOC (go-gitea#24137) Localize activity heatmap (except tooltip) (go-gitea#24131) Support triggering workflows by wiki related events (go-gitea#24119) add CLI command to register runner tokens (go-gitea#23762) Add new user types `reserved`, `bot`, and `remote` (go-gitea#24026) Fix Org edit page bugs: renaming detection, maxlength (go-gitea#24161) Make HAS_GO a simply expanded variable (go-gitea#24169) Support converting varchar to nvarchar for mssql database (go-gitea#24105) Fix math and mermaid rendering bugs (go-gitea#24049) Refactor locale number (go-gitea#24134) [skip ci] Updated translations via Crowdin Use 1.18's aria role for dropdown menus (go-gitea#24144) Set EasyMDE heading font-size to the same size as the resulting markdown (go-gitea#24151) Fix 2-dot direct compare to use the right base commit (go-gitea#24133) Add migration to fix external unit access mode of owner/admin team (go-gitea#24117) Remove untranslatable `on_date` key (go-gitea#24106) ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For 2-dot direct compare, we should use the base commit in the title and templates, as is used elsewhere, not the common ancestor which is used for 3-dot compare. I believe that this change should have been included in #22949.