diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-05-06 13:35:55 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-05-09 17:32:08 -0400 |
| commit | 6369d23d581ad36e7507d355a69237b90a912697 (patch) | |
| tree | 6ed41a9cf55a3b6a61de64b372d06054159ae8af | |
| parent | c891ef93371c3eeeb56b246d8d02a9e2dd5d350e (diff) | |
| download | gitlab-ce-6369d23d581ad36e7507d355a69237b90a912697.tar.gz | |
Fix nav and layout for TwoFactorAuthsController
| -rw-r--r-- | app/controllers/profiles/two_factor_auths_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_profile.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb index 5c51706c3d4..60f8ec5cf30 100644 --- a/app/controllers/profiles/two_factor_auths_controller.rb +++ b/app/controllers/profiles/two_factor_auths_controller.rb @@ -1,4 +1,4 @@ -class Profiles::TwoFactorAuthsController < ApplicationController +class Profiles::TwoFactorAuthsController < Profiles::ApplicationController def new unless current_user.otp_secret current_user.otp_secret = User.generate_otp_secret diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml index 31d8ed3ed86..ac37fd4c1c1 100644 --- a/app/views/layouts/nav/_profile.html.haml +++ b/app/views/layouts/nav/_profile.html.haml @@ -4,7 +4,7 @@ = icon('user fw') %span Profile - = nav_link(controller: :accounts) do + = nav_link(controller: [:accounts, :two_factor_auths]) do = link_to profile_account_path, title: 'Account', data: {placement: 'right'} do = icon('gear fw') %span |