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.

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

Fix integration test, merge main #1970

Merged
merged 12 commits into from
Dec 23, 2023
Merged

Commits on Dec 21, 2023

  1. Use information from previous blame parts (go-gitea#28572)

    Fixes go-gitea#28545
    
    `git blame` output can contain blocks without commit information if it
    was outputted before (the `0dafa97ea3f6d9662299579e5be1875cd28baaae 48
    26 1` line):
    ```
    fec25436488499df7231f63b857f66457c193d5c 24 25 1
    author Bastien Montagne
    author-mail <bastien@blender.org>
    author-time 1660731031
    author-tz +0200
    committer Bastien Montagne
    committer-mail <bastien@blender.org>
    committer-time 1660731031
    committer-tz +0200
    summary LibOverride: Add Make/Reset/Clear entries to IDTemplate contextual menu.
    previous 839ece6477203382b7a7483062961540180ff1cd source/blender/editors/interface/interface_ops.c
    filename source/blender/editors/interface/interface_ops.c
            #include "BLT_translation.h"
    0dafa97ea3f6d9662299579e5be1875cd28baaae 48 26 1
    
    3d57bc4397fca53bc9702a27bbf50102827829b0 27 27 1
    author Hans Goudey
    author-mail <hans@blender.org>
    author-time 1700131315
    author-tz +0100
    committer Hans Goudey
    committer-mail <hooglyboogly@noreply.localhost>
    committer-time 1700131315
    committer-tz +0100
    summary Cleanup: Move several blenkernel headers to C++
    previous 451c054d9b7d3148a646caa5a72fb127a5b5c408 source/blender/editors/interface/interface_ops.cc
    filename source/blender/editors/interface/interface_ops.cc
            #include "BKE_context.hh"
    ```
    This PR reuses data from the previous blame part to fill these gaps.
    KN4CK3R authored Dec 21, 2023
    Configuration menu
    Copy the full SHA
    3142693 View commit details
    Browse the repository at this point in the history
  2. improve possible performance bottleneck (go-gitea#28547)

    Replace go-gitea#28500
    
    ---------
    
    Co-authored-by: Giteabot <teabot@gitea.io>
    lunny and GiteaBot authored Dec 21, 2023
    Configuration menu
    Copy the full SHA
    b35d3fd View commit details
    Browse the repository at this point in the history
  3. Fix 500 error of searching commits (go-gitea#28576)

    Regression of go-gitea#28454 . Now the string is escaped HTML, so it doesn't
    need `| Safe`.
    
    Fix go-gitea#28575
    wxiaoguang authored Dec 21, 2023
    Configuration menu
    Copy the full SHA
    04b235d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    838db2f View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. Configuration menu
    Copy the full SHA
    21229ed View commit details
    Browse the repository at this point in the history
  2. Fix 405 method not allowed CORS / OIDC (go-gitea#28583)

    Follow go-gitea#28184
    Follow go-gitea#28515
    
    Fix problem with 405 method not allowed for CORS wrt OIDC
    morphelinho authored Dec 22, 2023
    Configuration menu
    Copy the full SHA
    19869d1 View commit details
    Browse the repository at this point in the history
  3. Fix status_check_contexts matching bug (go-gitea#28582)

    Fix go-gitea#28570
    Follow go-gitea#24633
    
    ---
    Copied from
    go-gitea#28570 (comment)
    
    The feature introduced in go-gitea#24633 should be compatible with
    `status_check_contexts`. However, if one or more of
    `status_check_contexts` is not a legal glob expressions, `glob.Compile`
    will fail and the contexts cannot match.
    
    
    https://github.com/go-gitea/gitea/blob/21229ed2c8ed00f57100adf9ebc5f4a08da9a66e/routers/web/repo/pull.go#L653-L663
    Zettat123 authored Dec 22, 2023
    Configuration menu
    Copy the full SHA
    907c97a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    06f8727 View commit details
    Browse the repository at this point in the history
  5. Fix wrong due date rendering in issue list page (go-gitea#28588)

    It included the hours, minutes, and seconds. By removing these, the date
    renders correctly.
    
    Signed-off-by: Yarden Shoham <git@yardenshoham.com>
    yardenshoham authored Dec 22, 2023
    Configuration menu
    Copy the full SHA
    d9ed931 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4d5c6a7 View commit details
    Browse the repository at this point in the history
  7. fix integration test

    jackHay22 committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    7d38b85 View commit details
    Browse the repository at this point in the history
  8. add header

    jackHay22 committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    e086daa View commit details
    Browse the repository at this point in the history