Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: go-gitea/gitea
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.18.4
Choose a base ref
...
head repository: go-gitea/gitea
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.18.5
Choose a head ref
  • 9 commits
  • 34 files changed
  • 11 contributors

Commits on Feb 21, 2023

  1. Hide 2FA status from other members in organization members list (#22999… 

    …) (#23023)

Backport #22999

This is rather private information that should not be given to all
members in the same organization. Only show it to organization owners.

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
    @yardenshoham @brechtvl
    yardenshoham and brechtvl authored Feb 21, 2023
    Configuration menu
    Copy the full SHA
    660a83b View commit details
    Browse the repository at this point in the history

  2. Use --message=%s for git commit message (#23028) (#23029) 

    Backport #23028

This backport is done by manually because the git module is different.
    @wxiaoguang
    wxiaoguang authored Feb 21, 2023
    Configuration menu
    Copy the full SHA
    c50d420 View commit details
    Browse the repository at this point in the history

  3. Fix the Manually Merged form (#23015) (#23017) 

    Backport #23015

---------

Co-authored-by: Jason Song <i@wolfogre.com>
    @wxiaoguang @wolfogre
    wxiaoguang and wolfogre authored Feb 21, 2023
    Configuration menu
    Copy the full SHA
    7b3ffe5 View commit details
    Browse the repository at this point in the history

  4. Render access log template as text instead of HTML (#23013) (#23025) 

    Backport #23013

Fix #22906 (comment)

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
    @yardenshoham @lunny
    yardenshoham and lunny authored Feb 21, 2023
    Configuration menu
    Copy the full SHA
    8fa62be View commit details
    Browse the repository at this point in the history

  5. Add force_merge to merge request and fix checking mergable (#23010) (#… 

    …23032)

Backport #23010.

Fix #23000.

The bug was introduced in #22633, and it seems that it has been noticed:
#22633 (comment) .

However, #22633 did nothing wrong, the logic should be "check if they is
admin only when `force` is true".

So we should provide the `ForceMerge` when merging from UI.

After this, an admin can also send a normal merge request with
`ForceMerge` false. So it fixes a potential bug: if the admin doesn't
want to do a force merge, they just see the green "Merge" button and
click it. At the same time, the status of the PR changed, and it
shouldn't be merged now, so the admin could send an unexpected force
merge.

In addition, I updated `ForceMerge *bool` to `ForceMerge bool`, I don't
see the reason to use a pointer.

And fixed the logic of CheckPullMergable to handle auto merge and force
merge correctly.
    @wolfogre
    wolfogre authored Feb 21, 2023
    Configuration menu
    Copy the full SHA
    90982bf View commit details
    Browse the repository at this point in the history

  6. Use beforeCommit instead of baseCommit (#22949) (#22996) 

    Backport #22949
Fixes #22946
Probably related to #19530

Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
    @kdumontnu @jtran
    kdumontnu and jtran authored Feb 21, 2023
    Configuration menu
    Copy the full SHA
    760cf41 View commit details
    Browse the repository at this point in the history

  7. Display attachments of review comment when comment content is blank (#… 

    …23035) (#23046)

Backport #23035

Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com>
    @jolheiser @sillyguodong
    jolheiser and sillyguodong authored Feb 21, 2023
    Configuration menu
    Copy the full SHA
    bbfd345 View commit details
    Browse the repository at this point in the history

  8. Return empty url for submodule tree entries (#23043) (#23048) 

    Backport #23043

Close #22614.

Refer to [Github's
API](https://docs.github.com/en/rest/git/trees?apiVersion=2022-11-28#get-a-tree),
if a tree entry is a submodule, its url will be an empty string.

Co-authored-by: Zettat123 <zettat123@gmail.com>
Co-authored-by: delvh <leon@kske.dev>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
    @yardenshoham @Zettat123
    @delvh @jolheiser
    4 people authored Feb 21, 2023
    Configuration menu
    Copy the full SHA
    8f5b2f1 View commit details
    Browse the repository at this point in the history

  9. Changelog 1.18.5 (#23045) 

    Signed-off-by: jolheiser <john.olheiser@gmail.com>
    @jolheiser
    jolheiser authored Feb 21, 2023
    Configuration menu
    Copy the full SHA
    48eb5ac View commit details
    Browse the repository at this point in the history
Loading