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

Merge password and 2fa page on user settings #2695

Merged
merged 4 commits into from
Oct 16, 2017
Merged

Merge password and 2fa page on user settings #2695

merged 4 commits into from
Oct 16, 2017

Conversation

lunny
Copy link
Member

@lunny lunny commented Oct 13, 2017

Will be part of #2271

@lunny lunny added type/enhancement An improvement of existing functionality topic/ui Change the appearance of the Gitea UI labels Oct 13, 2017
@lunny lunny added this to the 1.3.0 milestone Oct 13, 2017
@lunny lunny force-pushed the lunny/user_setting_security branch from bf18785 to b13443a Compare October 14, 2017 14:56
@lafriks
Copy link
Member

lafriks commented Oct 15, 2017

@lunny tests still fail (login enroll)

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 15, 2017
@lunny lunny force-pushed the lunny/user_setting_security branch from b13443a to 054b559 Compare October 15, 2017 03:01
@codecov-io
Copy link

codecov-io commented Oct 15, 2017 •
edited
Loading

Codecov Report

Merging #2695 into master will increase coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2695      +/-   ##
==========================================
+ Coverage   26.95%   26.96%   +<.01%     
==========================================
  Files          87       87              
  Lines       17301    17297       -4     
==========================================
  Hits         4664     4664              
+ Misses      11957    11953       -4     
  Partials      680      680
Impacted Files Coverage Δ
routers/user/setting.go 0% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c1b0c9e...3ac2abe. Read the comment docs.

@lunny
Copy link
Member Author

lunny commented Oct 15, 2017

@lafriks fixed and rebased.

@bkcsoft
Copy link
Member

bkcsoft commented Oct 15, 2017

LGTM

@tboerger tboerger 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 15, 2017
@lafriks
Copy link
Member

lafriks commented Oct 16, 2017

LGTM

@tboerger tboerger 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 16, 2017
@bkcsoft bkcsoft merged commit 9e865ce into go-gitea:master Oct 16, 2017
@daviian daviian mentioned this pull request Oct 16, 2017
Closed
@lunny lunny deleted the lunny/user_setting_security branch October 26, 2017 15:19
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.3.0
Development

Successfully merging this pull request may close these issues.
5 participants
@lunny @lafriks @codecov-io @bkcsoft @tboerger