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

Respect SSH.KeygenPath option when calculating ssh key fingerprints #27536

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Respect SSH.KeygenPath option when calculating ssh key fingerprints #27536

merged 2 commits into from
Oct 10, 2023

Conversation

picsel2
Copy link
Contributor

@picsel2 picsel2 commented Oct 9, 2023

Fixes #27535

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 9, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 9, 2023
@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 Oct 9, 2023
@silverwind silverwind added the backport/v1.21 This PR should be backported to Gitea 1.21 label Oct 9, 2023
@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 Oct 9, 2023
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 9, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) October 9, 2023 23:18
@techknowlogick techknowlogick merged commit 3c13130 into go-gitea:main Oct 10, 2023
25 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Oct 10, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Oct 10, 2023
@picsel2 @GiteaBot
Respect SSH.KeygenPath option when calculating ssh key fingerprints (g…
5d5f96c 
…o-gitea#27536)

Fixes go-gitea#27535
@GiteaBot GiteaBot mentioned this pull request Oct 10, 2023
Merged
@GiteaBot 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 Oct 10, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Oct 10, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
087dfb1 
* giteaofficial/main:
  Respect SSH.KeygenPath option when calculating ssh key fingerprints (go-gitea#27536)
  Remove max-width and add hide text overflow (go-gitea#27359)
  Fix `environment-to-ini` inherited key bug (go-gitea#27543)
  Improve docs about register/run as a service (go-gitea#27461)
  api: GetPullRequestCommits: return file list (go-gitea#27483)
  switch to using official AWS step in release nightly (go-gitea#27532)
  Improve file history UI and fix URL escaping bug (go-gitea#27531)
  Improve dropdown's behavior when there is a search input in menu (go-gitea#27526)
  Simplify `contrib/backport` (go-gitea#27520)
  Add docs section for sub-paths with the container registry (go-gitea#27505)
  Document our new labeling strategy (go-gitea#27523)
  [skip ci] Updated translations via Crowdin
  Restore warning commit status (go-gitea#27504)
  Update labeler to match new labeling system (go-gitea#27525)
  Apply to become a maintainer (go-gitea#27522)
  Remove unnecessary desc for openssh key cron task (go-gitea#27515)
  Tweak labeler config (go-gitea#27502)
  Add hover background to wiki list page (go-gitea#27507)
  [FIX] missing ctx in new_form (go-gitea#27514)
silverwind pushed a commit that referenced this pull request Oct 10, 2023
@GiteaBot @picsel2
Respect SSH.KeygenPath option when calculating ssh key fingerprints (#…
63587a4 
…27536) (#27551)

Backport #27536 by @picsel2

Fixes #27535

Co-authored-by: Sebastian Grabowski <sebastian@grabel.de>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jan 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Adding Deploy key fails on Rootless Docker image
4 participants
@picsel2 @silverwind @techknowlogick @GiteaBot