Merge branch 'rs-dev-issue-2373' into 'master'

Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org') https://dev.gitlab.org/gitlab/gitlabhq/issues/2373 See merge request !821

Merge branch 'rs-dev-issue-2373' into 'master'
de5c9b79 · Dmitriy Zaporozhets · b0821a13 · ad049a8e · de5c9b79
Commit de5c9b79 authored Jun 17, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

two_factor_auths_controller.rb app/controllers/profiles/two_factor_auths_controller.rb +5 -1

No files found.
--- a/app/controllers/profiles/two_factor_auths_controller.rb
+++ b/app/controllers/profiles/two_factor_auths_controller.rb
@@ -43,8 +43,12 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
  private

  def build_qr_code
-    issuer = "GitLab | #{current_user.email}"
+    issuer = "#{issuer_host} | #{current_user.email}"
    uri = current_user.otp_provisioning_uri(current_user.email, issuer: issuer)
    RQRCode::render_qrcode(uri, :svg, level: :m, unit: 3)
  end
+
+  def issuer_host
+    Gitlab.config.gitlab.host
+  end
 end