-
-
Notifications
You must be signed in to change notification settings - Fork 5.4k
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
Show OAuth2 errors to end users #25261
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Jun 14, 2023
pull-request-size
bot
added
the
size/M
Denotes a PR that changes 30-99 lines, ignoring generated files.
label
Jun 14, 2023
wxiaoguang
force-pushed
the
show-oauth2-err
branch
from
June 14, 2023 17:13
247849c
to
8e9f5e1
Compare
silverwind
reviewed
Jun 14, 2023
|
||
<h5>{{.locale.Tr "admin.auths.tips.oauth2.general"}}:</h5> | ||
<p>{{.locale.Tr "admin.auths.tips.oauth2.general.tip"}}</p> | ||
</div> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Screenshot of this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
silverwind
approved these changes
Jun 14, 2023
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
Jun 14, 2023
wxiaoguang
force-pushed
the
show-oauth2-err
branch
from
June 14, 2023 18:00
da28a28
to
ea3e5ae
Compare
wxiaoguang
force-pushed
the
show-oauth2-err
branch
from
June 14, 2023 18:01
ea3e5ae
to
8afc31b
Compare
lunny
approved these changes
Jun 15, 2023
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 15, 2023
lunny
added
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Jun 15, 2023
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Jun 15, 2023
Partially fix go-gitea#23936 ![image](https://github.com/go-gitea/gitea/assets/2114189/8aa7f3ad-a5f0-42ce-a478-289a03bd08a3) ![image](https://github.com/go-gitea/gitea/assets/2114189/bb901e7d-485a-47a5-b68d-9ebe7013a6b2) ![image](https://github.com/go-gitea/gitea/assets/2114189/9a1ce0f3-f011-4baf-8e2f-cc6304bc9703)
GiteaBot
added
backport/done
All backports for this PR have been created
and removed
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
labels
Jun 15, 2023
silverwind
pushed a commit
that referenced
this pull request
Jun 15, 2023
Backport #25261 by @wxiaoguang Partially fix #23936 ![image](https://github.com/go-gitea/gitea/assets/2114189/8aa7f3ad-a5f0-42ce-a478-289a03bd08a3) ![image](https://github.com/go-gitea/gitea/assets/2114189/bb901e7d-485a-47a5-b68d-9ebe7013a6b2) ![image](https://github.com/go-gitea/gitea/assets/2114189/9a1ce0f3-f011-4baf-8e2f-cc6304bc9703) Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Jun 15, 2023
* upstream/main: (31 commits) Show OAuth2 errors to end users (go-gitea#25261) [skip ci] Updated translations via Crowdin Fix index generation parallelly failure (go-gitea#25235) Fix variable in template (go-gitea#25267) Add template linting via djlint (go-gitea#25212) Fix edit OAuth application width (go-gitea#25262) Use flex to align SVG and text (go-gitea#25163) GitHub Actions enhancements for frontend (go-gitea#25150) Add missing `v` in migrations.go (go-gitea#25252) Change form actions to fetch for submit review box (go-gitea#25219) Fix panic when migrating a repo from GitHub with issues (go-gitea#25246) Fix description of drop custom_labels migration (go-gitea#25243) Fix all possible setting error related storages and added some tests (go-gitea#23911) [skip ci] Updated translations via Crowdin Revert overflow: overlay (revert go-gitea#21850) (go-gitea#25231) Support changing labels of Actions runner without re-registration (go-gitea#24806) Improve AJAX link and modal confirm dialog (go-gitea#25210) Use inline SVG for built-in OAuth providers (go-gitea#25171) Disable `Create column` button while the column name is empty (go-gitea#25192) Fix profile render when the README.md size is larger than 1024 bytes (go-gitea#25131) ...
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
backport/v1.20
This PR should be backported to Gitea 1.20
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
size/M
Denotes a PR that changes 30-99 lines, ignoring generated files.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Partially fix #23936