github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-03-13 02:57:44 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

[PR #2695] [MERGED] Merge password and 2fa page on user settings #16540

New Issue
Closed
opened 2025-11-02 12:13:00 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-02 12:13:00 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/go-gitea/gitea/pull/2695
Author: @lunny
Created: 10/13/2017
Status: ✅ Merged
Merged: 10/16/2017
Merged by: @bkcsoft

Base: master ← Head: lunny/user_setting_security

📝 Commits (4)

  • ca4e138 merge password and 2fa page on user settings
  • d0d732b fix tests
  • 054b559 fix tests
  • 3ac2abe Merge branch 'master' into lunny/user_setting_security

📊 Changes

7 files changed (+117 additions, -89 deletions)

View changed files

📝 integrations/links_test.go (+2 -2)
📝 options/locale/locale_en-US.ini (+1 -0)
📝 routers/routes/routes.go (+3 -4)
📝 routers/user/setting.go (+30 -37)
📝 templates/user/settings/navbar.tmpl (+2 -5)
➖ templates/user/settings/password.tmpl (+0 -41)
➕ templates/user/settings/security.tmpl (+79 -0)

📄 Description

Will be part of #2271

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/go-gitea/gitea/pull/2695 **Author:** [@lunny](https://github.com/lunny) **Created:** 10/13/2017 **Status:** ✅ Merged **Merged:** 10/16/2017 **Merged by:** [@bkcsoft](https://github.com/bkcsoft) **Base:** `master` ← **Head:** `lunny/user_setting_security` --- ### 📝 Commits (4) - [`ca4e138`](https://github.com/go-gitea/gitea/commit/ca4e138ec60195fba7dc1239671ad341ebc0a4ab) merge password and 2fa page on user settings - [`d0d732b`](https://github.com/go-gitea/gitea/commit/d0d732b1abc0b51f8e98fc50d8a26ce321ef6238) fix tests - [`054b559`](https://github.com/go-gitea/gitea/commit/054b5597721575a37cad9d5718daed3205eb6df8) fix tests - [`3ac2abe`](https://github.com/go-gitea/gitea/commit/3ac2abea449f38196a03131d7c33bdba7e530b9e) Merge branch 'master' into lunny/user_setting_security ### 📊 Changes **7 files changed** (+117 additions, -89 deletions) <details> <summary>View changed files</summary> 📝 `integrations/links_test.go` (+2 -2) 📝 `options/locale/locale_en-US.ini` (+1 -0) 📝 `routers/routes/routes.go` (+3 -4) 📝 `routers/user/setting.go` (+30 -37) 📝 `templates/user/settings/navbar.tmpl` (+2 -5) ➖ `templates/user/settings/password.tmpl` (+0 -41) ➕ `templates/user/settings/security.tmpl` (+79 -0) </details> ### 📄 Description Will be part of #2271 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-02 12:13:00 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#16540
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?