Skip to content

Conversation

lunny
Copy link
Member

@lunny lunny commented Jun 26, 2022

Fix #20131

@lunny lunny added this to the 1.18.0 milestone Jun 26, 2022
@lunny lunny requested a review from KN4CK3R June 26, 2022 13:03
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jun 26, 2022
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jun 26, 2022
@lunny
Copy link
Member Author

lunny commented Jun 27, 2022

Make L-G-T-M work

@lunny lunny merged commit 85d960d into go-gitea:main Jun 27, 2022
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 28, 2022
* upstream/main:
  [skip ci] Updated translations via Crowdin
  Add username check to doctor (go-gitea#20140)
  Refactor `i18n` to `locale` (go-gitea#20153)
  Remove support for sr-SP (go-gitea#20155)
  Hide notify mail setting ui if not enabled (go-gitea#20138)
  Fix custom folder name in customization docs (go-gitea#20148)
  Add missing parameter for error in log message (go-gitea#20144)
  Show scrollbar when necessary (go-gitea#20142)

# Conflicts:
#	templates/repo/issue/view_content/context_menu.tmpl
@6543
Copy link
Member

6543 commented Jul 12, 2022

need backportS

@lunny lunny deleted the lunny/hide_notify_mail_if_not_enabled branch July 12, 2022 13:38
lunny added a commit to lunny/gitea that referenced this pull request Jul 12, 2022
lunny added a commit to lunny/gitea that referenced this pull request Jul 12, 2022
@lunny lunny added backport/done All backports for this PR have been created skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Jul 12, 2022
zeripath pushed a commit that referenced this pull request Jul 12, 2022
tyroneyeh added a commit to tyroneyeh/gitea that referenced this pull request Jul 13, 2022
commit 713bc6c
Author: 6543 <6543@obermui.de>
Date:   Tue Jul 12 20:26:27 2022 +0200

    Changelog for 1.16.9 (update) (go-gitea#20341)

    * Changelog for 1.16.9 (update)

    * update security section

commit 6b7e860
Author: Lunny Xiao <xiaolunwen@gmail.com>
Date:   Wed Jul 13 01:13:31 2022 +0800

    Hide notify mail setting ui if not enabled (go-gitea#20138) (go-gitea#20337)

    Backport go-gitea#20138

commit 0f89417
Author: Gusted <williamzijl7@hotmail.com>
Date:   Tue Jul 12 12:52:20 2022 +0000

    Add write check for creating Commit status (go-gitea#20332) (go-gitea#20334)

    - Backport go-gitea#20332
      - Add write code checks for creating new commit status
      - Regression from go-gitea#5314
      - Resolves go-gitea#20331

commit 7c80a0b
Author: zeripath <art27@cantab.net>
Date:   Mon Jul 11 10:15:43 2022 +0100

    Ensure that drone tags 1.16.x and 1.16 on push to v1.16.x tag (go-gitea#20304)

    We need pushes to v1.16.9 to create tags to 1.16.9 and 1.16 but not 1 or latest.

    We have previously adjusted the manifest to remove the latest tag, and have removed
    auto_tags so that 1 does not get tagged but in doing so we also stopped 1.16 being
    tagged. So here we just state the that we tag x.yy in addition to x.yyz*.

    Signed-off-by: Andrew Thornton <art27@cantab.net>

commit b42df31
Author: zeripath <art27@cantab.net>
Date:   Wed Jul 6 02:47:16 2022 +0100

    Only show Followers that current user can access (go-gitea#20220) (go-gitea#20253)

    Backport go-gitea#20220

    Users who are following or being followed by a user should only be
    displayed if the viewing user can see them.

    Signed-off-by: Andrew Thornton <art27@cantab.net>

commit 6162fb0
Author: Gusted <williamzijl7@hotmail.com>
Date:   Fri Jul 1 17:39:10 2022 +0200

    Check for permission when fetching user controlled issues (go-gitea#20133) (go-gitea#20196)

    * Check if project has the same repository id with issue when assign project to issue

    * Check if issue's repository id match project's repository id

    * Add more permission checking

    * Remove invalid argument

    * Fix errors

    * Add generic check

    * Remove duplicated check

    * Return error + add check for new issues

    * Apply suggestions from code review

    Co-authored-by: Gusted <williamzijl7@hotmail.com>
    Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
    Co-authored-by: 6543 <6543@obermui.de>
lunny added a commit that referenced this pull request Jul 13, 2022
vsysoev pushed a commit to IntegraSDL/gitea that referenced this pull request Aug 10, 2022
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Don't show mail-notification settings when ENABLE_NOTIFY_MAIL is false
6 participants