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

Allow options to disable user ssh keys configuration from the interface on app.ini #29447

Merged
merged 9 commits into from
Mar 4, 2024
Merged

Allow options to disable user ssh keys configuration from the interface on app.ini #29447

merged 9 commits into from
Mar 4, 2024

Conversation

lunny
Copy link
Member

@lunny lunny commented Feb 27, 2024

Follow #29275
Extract from #20549
Fix #24716

@lunny lunny added the type/enhancement An improvement of existing functionality label Feb 27, 2024
@lunny lunny added this to the 1.22.0 milestone Feb 27, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 27, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 27, 2024
delvh
delvh reviewed Feb 27, 2024
View reviewed changes
custom/conf/app.example.ini Outdated Show resolved Hide resolved
docs/content/administration/config-cheat-sheet.en-us.md Outdated Show resolved Hide resolved
@github-actions github-actions bot added the modifies/api This PR adds API routes or modifies them label Feb 27, 2024
delvh
delvh reviewed Feb 27, 2024
View reviewed changes
routers/api/v1/user/key.go Outdated Show resolved Hide resolved
routers/api/v1/user/key.go Show resolved Hide resolved
@inferenceus inferenceus mentioned this pull request Feb 27, 2024
Closed
@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 Feb 27, 2024
@lunny lunny mentioned this pull request Feb 29, 2024
Merged
lafriks pushed a commit that referenced this pull request Mar 2, 2024
@lunny
Allow options to disable user gpg keys configuration from the interfa…
9de5e39 
…ce on app.ini (#29486)

Follow #29447
Fix #29454 
Extract from #20549
@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 Mar 4, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 4, 2024
@lunny lunny enabled auto-merge (squash) March 4, 2024 07:24
@lunny lunny merged commit 8e12ba3 into go-gitea:main Mar 4, 2024
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 4, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 4, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
65964a4 
* giteaofficial/main:
  Allow options to disable user ssh keys configuration from the interface on app.ini (go-gitea#29447)
  Inline the `css-variables-parser` dependency (go-gitea#29571)
@panangam panangam mentioned this pull request Mar 4, 2024
Closed
@lunny lunny deleted the lunny/disable_ssh_keys branch March 5, 2024 08:07
@jackHay22
Copy link
Contributor

@lunny I opened a PR to add an additional setting that disables user features for external logins: #29615

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jolheiser jolheiser jolheiser left review comments

@a1012112796 a1012112796 a1012112796 left review comments

@delvh delvh delvh approved these changes

@wolfogre wolfogre wolfogre approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them modifies/docs size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Allow disabling users from adding SSH keys
7 participants
@lunny @jackHay22 @wolfogre @a1012112796 @jolheiser @delvh @GiteaBot