diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-15 20:07:51 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-15 20:07:51 +0000 |
| commit | 27e4a95221539ccb6749b2de8a75a8c17427115f (patch) | |
| tree | 23f12cec60e1b8b724f6084949496f932da71735 /config | |
| parent | 89665649b01c8adef03e30d7f8e1ee633aa22e45 (diff) | |
| parent | 341d8bc3f7fbe3763250af1e89020b81dad34bb8 (diff) | |
| download | gitlab-ce-27e4a95221539ccb6749b2de8a75a8c17427115f.tar.gz | |
Merge branch '17341-firefox-u2f' into 'master'
Allow U2F devices to be used in Firefox
- Adds U2F support for Firefox
- Improve U2F feature detection logic
- Have authentication flow be closer to the spec (single challenge instead of a challenge for each `signRequest`)
- Closes #17341
- Related to #15337
See merge request !5177
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 21e7cc7b6e8..5f7b6a3c049 100644 --- a/config/application.rb +++ b/config/application.rb @@ -87,6 +87,7 @@ module Gitlab config.assets.precompile << "profile/application.js" config.assets.precompile << "lib/utils/*.js" config.assets.precompile << "lib/*.js" + config.assets.precompile << "u2f.js" # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' |