summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/u2f/util.js.coffee.erb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-07-18 10:40:22 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-07-18 10:40:22 +0200
commitffea9c46000ade225852ee32e90cb8ad0f4f8316 (patch)
treec798d483a2ccab175d2341fc6e4828a5b5859d66 /app/assets/javascripts/u2f/util.js.coffee.erb
parent22c2814b09960255d9ece0c620858500719858cb (diff)
parentf1083ba1f6e4ff0c01d5e08b2a6c0b1f9b5a9b9a (diff)
downloadgitlab-ce-store-variables-and-when-in-builds-table.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into store-variables-and-when-in-builds-tablestore-variables-and-when-in-builds-table
# Conflicts: # db/schema.rb
Diffstat (limited to 'app/assets/javascripts/u2f/util.js.coffee.erb')
-rw-r--r--app/assets/javascripts/u2f/util.js.coffee.erb15
1 files changed, 0 insertions, 15 deletions
diff --git a/app/assets/javascripts/u2f/util.js.coffee.erb b/app/assets/javascripts/u2f/util.js.coffee.erb
deleted file mode 100644
index d59341c38b9..00000000000
--- a/app/assets/javascripts/u2f/util.js.coffee.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Helper class for U2F (universal 2nd factor) device registration and authentication.
-
-class @U2FUtil
- @isU2FSupported: ->
- if @testMode
- true
- else
- gon.u2f.browser_supports_u2f
-
- @enableTestMode: ->
- @testMode = true
-
-<% if Rails.env.test? %>
-U2FUtil.enableTestMode();
-<% end %>