diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb
index ac14d5ca75beb55c36715a0caace5889e77f0e8d..9b4070a76f7eb4558f950727707c7bd94cc9c61d 100644
--- a/app/controllers/profiles/two_factor_auths_controller.rb
+++ b/app/controllers/profiles/two_factor_auths_controller.rb
@@ -11,7 +11,6 @@ class Profiles::TwoFactorAuthsController < ApplicationController
   def create
     if current_user.valid_otp?(params[:pin_code])
       current_user.otp_required_for_login = true
-      #current_user.otp_secret = User.generate_otp_secret
       current_user.save!
 
       redirect_to profile_account_path
diff --git a/app/models/user.rb b/app/models/user.rb
index b9e289001870cbdab127e6068a61285252b188c4..befbcbf1a16a8e304066daa3d9472868bebb5f4b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -58,7 +58,7 @@ require 'file_size_validator'
 
 class User < ActiveRecord::Base
   devise :two_factor_authenticatable,
-         :otp_secret_encryption_key => File.read(Rails.root.join('.secret')).chomp
+         otp_secret_encryption_key: File.read(Rails.root.join('.secret')).chomp
 
   include Sortable
   include Gitlab::ConfigHelper
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 956bb048b2a3477c0ed1679afb6fac7261e1474b..c003a7102a5d13587a7380e55e108bd772eebcc1 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -2,7 +2,7 @@
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
   config.warden do |manager|
-    manager.default_strategies(:scope => :user).unshift :two_factor_authenticatable
+    manager.default_strategies(scope: :user).unshift :two_factor_authenticatable
   end
 
   # ==> Mailer Configuration