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 raw wiki links (#31825) #31845

Merged
merged 6 commits into from
Aug 17, 2024
Merged

Commits on Aug 16, 2024

  1. Fix raw wiki links (go-gitea#31825)

    Fix go-gitea#31395
    
    This regression is introduced by go-gitea#30273. To find out how GitHub handles
    this case, I did [some
    tests](go-gitea#31395 (comment)).
    
    I use redirect in this PR instead of checking if the corresponding `.md`
    file exists when rendering the link because GitHub also uses redirect.
    With this PR, there is no need to resolve the raw wiki link when
    rendering a wiki page. If a wiki link points to a raw file, access will
    be redirected to the raw link.
    Zettat123 authored and GiteaBot committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    cc9449c View commit details
    Browse the repository at this point in the history
  2. Add missing repository type filter parameters to pager (go-gitea#31832)…

    … (go-gitea#31837)
    
    Backport go-gitea#31832 by @yp05327
    
    Fix go-gitea#31807
    
    ps: the newly added params's value will be changed.
    When the first time you selected the filter, the values of params will
    be `0` or `1`
    But in pager it will be `true` or `false`.
    So do we have `boolToInt` function?
    
    Co-authored-by: yp05327 <576951401@qq.com>
    GiteaBot and yp05327 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    771fb45 View commit details
    Browse the repository at this point in the history
  3. Avoid returning without written ctx when posting PR (go-gitea#31843) (g…

    …o-gitea#31848)
    
    Backport go-gitea#31843 by @wolfogre
    
    Fix go-gitea#31625.
    
    If `pull_service.NewPullRequest` return an error which misses each `if`
    check, `CompareAndPullRequestPost` will return immediately, since it
    doesn't write the HTTP response, a 200 response with empty body will be
    sent to clients.
    
    ```go
    	if err := pull_service.NewPullRequest(ctx, repo, pullIssue, labelIDs, attachments, pullRequest, assigneeIDs); err != nil {
    		if repo_model.IsErrUserDoesNotHaveAccessToRepo(err) {
    			ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err.Error())
    		} else if git.IsErrPushRejected(err) {
    			// ...
    			ctx.JSONError(flashError)
    		} else if errors.Is(err, user_model.ErrBlockedUser) {
    			// ...
    			ctx.JSONError(flashError)
    		} else if errors.Is(err, issues_model.ErrMustCollaborator) {
    			// ...
    			ctx.JSONError(flashError)
    		}
    		return
    	}
    ```
    
    Not sure what kind of error can cause it to happen, so this PR just
    expose it. And we can fix it when users report that creating PRs failed
    with error responses.
    
    It's all my guess since I cannot reproduce the problem, but even if it's
    not related, the code here needs to be improved.
    
    Co-authored-by: Jason Song <i@wolfogre.com>
    GiteaBot and wolfogre committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    1cf8f69 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. Merge branch 'backport-31825-v1.22' of github.com:GiteaBot/gitea into…

    … GiteaBot-backport-31825-v1.22
    lunny committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    f676d96 View commit details
    Browse the repository at this point in the history
  2. Fix bug

    lunny committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    4f61c0c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8407595 View commit details
    Browse the repository at this point in the history