summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Kramarz <jakub.kramarz@freshmail.pl>2017-03-21 16:15:27 +0000
committerJonas Kalderstam <jonas@kalderstam.se>2017-06-11 17:00:48 +0200
commitf22d7680270c60edb572cf73a4ec39d4fe70ceb1 (patch)
tree971ae902d42e4bfb50c2247599c97f9d6ea41618
parent288e8c7c42bd9507725637dcf7e5b8e0eaa5229c (diff)
downloadgitlab-ce-f22d7680270c60edb572cf73a4ec39d4fe70ceb1.tar.gz
Enable FIDO U2F on Opera browser, see http://caniuse.com/#feat=u2f
-rw-r--r--app/helpers/u2f_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/u2f_helper.rb b/app/helpers/u2f_helper.rb
index 143b4ca6b51..81bfe5d4eeb 100644
--- a/app/helpers/u2f_helper.rb
+++ b/app/helpers/u2f_helper.rb
@@ -1,5 +1,5 @@
module U2fHelper
def inject_u2f_api?
- browser.chrome? && browser.version.to_i >= 41 && !browser.device.mobile?
+ ((browser.chrome? && browser.version.to_i >= 41) || (browser.opera? && browser.version.to_i >= 40)) && !browser.device.mobile?
end
end