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.

Sign up for GitHub

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

Jump to bottom

Use correct user when determining max repo limits for error messages #18153

Merged
merged 3 commits into from
Jan 2, 2022
Merged

Use correct user when determining max repo limits for error messages #18153

merged 3 commits into from
Jan 2, 2022

Conversation

Gusted
Copy link
Contributor

@Gusted Gusted commented Jan 1, 2022 •
edited
Loading

  • Use the correct user(owner instead of ctx.User) to get the maxCreationLimit.

@Gusted Gusted added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Jan 1, 2022
@Gusted
Copy link
Contributor Author

Gusted commented Jan 1, 2022

This patch is already applied to the backport(#18152)

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 1, 2022
@Gusted Gusted mentioned this pull request Jan 1, 2022
Merged
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 2, 2022
@zeripath zeripath added backport/v1.15 and removed skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Jan 2, 2022
@zeripath
Copy link
Contributor

zeripath commented Jan 2, 2022

Please update the first comment of this PR to make this clearer that this is only in the error report.

@zeripath zeripath added the backport/done All backports for this PR have been created label Jan 2, 2022
@zeripath zeripath mentioned this pull request Jan 2, 2022
Merged
@zeripath zeripath changed the title fix: use correct user Use correct user when determining max repo limits for error messages Jan 2, 2022
@6543
Copy link
Member

6543 commented Jan 2, 2022

https://github.com/go-gitea/gitea/pull/18152/files#diff-1cfa6a4276f95644461cbed3c29525a454e7472fd1b4ad434e21b1eada0fe0e5R81 looks similar ...

@6543 6543 added this to the 1.16.0 milestone Jan 2, 2022
6543
6543 approved these changes Jan 2, 2022
View reviewed changes
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@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 Jan 2, 2022
@zeripath
Copy link
Contributor

zeripath commented Jan 2, 2022

make lgtm work

@zeripath zeripath merged commit 88da7a7 into go-gitea:main Jan 2, 2022
zeripath pushed a commit that referenced this pull request Jan 2, 2022
Use correct translation key for error messages due to max repo limits (…
f9bbed0 
…#18135 & #18153) (#18152)

- Backport #18135
- Backport #18153
@Gusted Gusted deleted the correct-user branch January 2, 2022 22:49
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jan 4, 2022
@zjjhot
Merge remote-tracking branch 'giteaoffical/main'
6cd8019 
* giteaoffical/main: (22 commits)
  Add MP4 as default allowed attachment type (go-gitea#18170)
  [skip ci] Updated translations via Crowdin
  Include folders into size cost (go-gitea#18158)
  Don't delete branch if other PRs with this branch are open (go-gitea#18164)
  Remove unused route "/tasks/trigger" (go-gitea#18160)
  Fix EasyMDE validation (go-gitea#18161)
  Fix bug (go-gitea#18168)
  tests: add coverage for models migration helpers  (go-gitea#18162)
  [skip ci] Updated translations via Crowdin
  Require codereview to have content (go-gitea#18156)
  chore(lint): use golangci-lint to call revive and misspell checker. (go-gitea#18145)
  Update owners for 2022 (go-gitea#18155)
  Refactor auth package (go-gitea#17962)
  Unify and simplify TrN for i18n (go-gitea#18141)
  Use correct user when determining max repo limits for error messages (go-gitea#18153)
  Add singuliere to MAINTAINERS (go-gitea#18148)
  [skip ci] Updated licenses and gitignores
  Add API to get issue/pull comments and events (timeline) (go-gitea#17403)
  Upgrade certmagic from v0.14.1 to v0.15.2 (go-gitea#18138)
  Upgrade certmagic from v0.14.1 to v0.15.2 (go-gitea#18138)
  ...
@richmahn richmahn mentioned this pull request Jan 14, 2022
Merged
zeripath pushed a commit that referenced this pull request Jan 14, 2022
@richmahn
Changelog for 1.15.10 (#18274)
a6f9ebf 
[1.15.10](https://github.com/go-gitea/gitea/releases/tag/v1.15.10) - 2022-01-14

* BUGFIXES
  * Fix inconsistent PR comment counts (#18260) (#18261)
  * Fix release link broken (#18252) (#18253)
  * Fix update user from site administration page bug (#18250) (#18251)
  * Set HeadCommit when creating tags (#18116) (#18173)
  * Use correct translation key for error messages due to max repo limits (#18135 & #18153) (#18152)
  * Fix purple color in suggested label colors (#18241) (#18242)
* SECURITY
  * Bump mermaid from 8.10.1 to 8.13.8 (#18198) (#18206)
zeripath pushed a commit to zeripath/gitea that referenced this pull request Jan 14, 2022
@richmahn @zeripath
Changelog for 1.15.10 (go-gitea#18274)
caea4f2 
[1.15.10](https://github.com/go-gitea/gitea/releases/tag/v1.15.10) - 2022-01-14

* BUGFIXES
  * Fix inconsistent PR comment counts (go-gitea#18260) (go-gitea#18261)
  * Fix release link broken (go-gitea#18252) (go-gitea#18253)
  * Fix update user from site administration page bug (go-gitea#18250) (go-gitea#18251)
  * Set HeadCommit when creating tags (go-gitea#18116) (go-gitea#18173)
  * Use correct translation key for error messages due to max repo limits (go-gitea#18135 & go-gitea#18153) (go-gitea#18152)
  * Fix purple color in suggested label colors (go-gitea#18241) (go-gitea#18242)
* SECURITY
  * Bump mermaid from 8.10.1 to 8.13.8 (go-gitea#18198) (go-gitea#18206)
@zeripath zeripath mentioned this pull request Jan 14, 2022
Merged
techknowlogick pushed a commit that referenced this pull request Jan 14, 2022
@zeripath @richmahn
Changelog for 1.15.10 (#18274) (#18276)
2b16ca7 
* Changelog for 1.15.10 (#18274)

[1.15.10](https://github.com/go-gitea/gitea/releases/tag/v1.15.10) - 2022-01-14

* BUGFIXES
  * Fix inconsistent PR comment counts (#18260) (#18261)
  * Fix release link broken (#18252) (#18253)
  * Fix update user from site administration page bug (#18250) (#18251)
  * Set HeadCommit when creating tags (#18116) (#18173)
  * Use correct translation key for error messages due to max repo limits (#18135 & #18153) (#18152)
  * Fix purple color in suggested label colors (#18241) (#18242)
* SECURITY
  * Bump mermaid from 8.10.1 to 8.13.8 (#18198) (#18206)

* update docs/config.yaml

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

Co-authored-by: Richard Mahn <richmahn@users.noreply.github.com>
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
Use correct user when determining max repo limits for error messages (g…
217dbb5 
…o-gitea#18153)

- Use the correct user(`owner` instead of `ctx.User`) to get the maxCreationLimit.
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
@zeripath @richmahn
Changelog for 1.15.10 (go-gitea#18274) (go-gitea#18276)
2e1a71f 
* Changelog for 1.15.10 (go-gitea#18274)

[1.15.10](https://github.com/go-gitea/gitea/releases/tag/v1.15.10) - 2022-01-14

* BUGFIXES
  * Fix inconsistent PR comment counts (go-gitea#18260) (go-gitea#18261)
  * Fix release link broken (go-gitea#18252) (go-gitea#18253)
  * Fix update user from site administration page bug (go-gitea#18250) (go-gitea#18251)
  * Set HeadCommit when creating tags (go-gitea#18116) (go-gitea#18173)
  * Use correct translation key for error messages due to max repo limits (go-gitea#18135 & go-gitea#18153) (go-gitea#18152)
  * Fix purple color in suggested label colors (go-gitea#18241) (go-gitea#18242)
* SECURITY
  * Bump mermaid from 8.10.1 to 8.13.8 (go-gitea#18198) (go-gitea#18206)

* update docs/config.yaml

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

Co-authored-by: Richard Mahn <richmahn@users.noreply.github.com>
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@6543 6543 6543 approved these changes

@zeripath zeripath zeripath approved these changes

Assignees
No one assigned
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. type/bug
Projects
None yet
Milestone
1.16.0
Development

Successfully merging this pull request may close these issues.
4 participants
@Gusted @zeripath @6543 @GiteaBot