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.1
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.2
Choose a head ref
  • 8 commits
  • 10 files changed
  • 6 contributors

Commits on Jan 18, 2023

  1. Set disable_gravatar/enable_federated_avatar when offline mode is true ( 

    #22479) (#22496)

Backport #22479.

When offline mode is true, we should set `disable_gravatar` to `true`
and `enable_federated_avatar` to `false` in system settings.
    @wolfogre
    wolfogre authored Jan 18, 2023
    Configuration menu
    Copy the full SHA
    e902b98 View commit details
    Browse the repository at this point in the history

  2. Reliable selection of admin user (#22509) (#22511) 

    Backport #22509

Co-authored-by: Sybren <[email protected]>
    @jolheiser @drsybren
    jolheiser and drsybren authored Jan 18, 2023
    Configuration menu
    Copy the full SHA
    e6e2c2f View commit details
    Browse the repository at this point in the history

  3. Fix 500 error viewing pull request when fork has pull requests disab… 

    …led (#22512) (#22515)

Backport #22512

Co-authored-by: Brecht Van Lommel <[email protected]>
    @jolheiser @brechtvl
    jolheiser and brechtvl authored Jan 18, 2023
    Configuration menu
    Copy the full SHA
    63e5db5 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. cgo cross-compile for freebsd (#22397) (#22519) 

    Provide pre-compiled cgo binaries for freebsd

Co-authored-by: John Olheiser <[email protected]>
    @techknowlogick @jolheiser
    techknowlogick and jolheiser authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    4b3e456 View commit details
    Browse the repository at this point in the history

  2. Fix invalid issue branch reference if not specified in template (#22513… 

    …) (#22520)

Backport #22513

Co-authored-by: Brecht Van Lommel <[email protected]>
    @jolheiser @brechtvl
    jolheiser and brechtvl authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    fa33271 View commit details
    Browse the repository at this point in the history

  3. Fix issue not auto-closing when it includes a reference to a branch (#… 

    …22514) (#22521)

Backport #22514

Co-authored-by: Brecht Van Lommel <[email protected]>
    @jolheiser @brechtvl
    jolheiser and brechtvl authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    fd7ebaa View commit details
    Browse the repository at this point in the history

  4. chore: changelog 1.18.2 (#22530) 

    Signed-off-by: jolheiser <[email protected]>
    @jolheiser
    jolheiser authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    1ae2525 View commit details
    Browse the repository at this point in the history

  5. When updating by rebase we need to set the environment for head repo (#… 

    …22535) (#22536)

Backport #22535

The update by rebase code reuses the merge code but shortcircuits and
pushes back up to the head. However, it doesn't set the correct pushing
environment - and just uses the same environment as the base repo. This
leads to the push update failing and thence the PR becomes out-of-sync
with the head.

This PR fixes this and adjusts the trace logging elsewhere to help make
this clearer.

Fix #18802

Signed-off-by: Andrew Thornton <[email protected]>

Signed-off-by: Andrew Thornton <[email protected]>
    @zeripath
    zeripath authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    3c531d3 View commit details
    Browse the repository at this point in the history
Loading