Skip to content
Snippets Groups Projects

Profile settings

Closed Phil Hughes requested to merge profile-settings into master

Updates the UI for all profile settings pages

Closes #13853 (closed)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
1 1 class Profiles::AccountsController < Profiles::ApplicationController
2 2 def show
3 unless current_user.otp_secret
4 current_user.otp_secret = User.generate_otp_secret(32)
5 end
6
7 unless current_user.otp_grace_period_started_at && two_factor_grace_period
8 current_user.otp_grace_period_started_at = Time.current
9 end
10
11 # current_user.save! if current_user.changed?
12
  • 48 49 $filename.text($filename.data('label'))
    49 50
    50 51 $('.js-upload-user-avatar').on 'click', ->
    51 $('.edit_user').submit()
    52 $('.edit-user').submit()
  • 143 143 }
    144 144 }
    145 145
    146 .btn-transparent {
    147 color: #8F8F8F;
  • @jschatz1 now when I see how huge changes are I put veto on merging it in one request. Its 800 lines added and 600 lines removed. Nobody would be able to efficiently review it

  • @iamphill You are going to have to split this into multiple MR's.

  • Phil Hughes Added 75 commits:

    Added 75 commits:

  • Author Maintainer

    Closing in favour of single merge requests

  • Phil Hughes Status changed to closed

    Status changed to closed

  • Please register or sign in to reply
    Loading