summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorJob van der Voort <job@gitlab.com>2015-07-01 08:46:26 +0000
committerJob van der Voort <job@gitlab.com>2015-07-01 08:46:26 +0000
commitd18f1ce75d156c20aeb306a3021dad3674a667d3 (patch)
tree3bae79d3cdc015d89267cd0b6f84701c3650089d /Gemfile
parente934a62aeb67bbca565a77f8c5d19ebf1272a1bd (diff)
parent9e4a4667d9f9f423480c7361405f2abcf571e02a (diff)
downloadgitlab-ce-d18f1ce75d156c20aeb306a3021dad3674a667d3.tar.gz
Merge branch 'k-devise' into 'master'
added note about Devise Added note about the authentication gem used in GitLab Because of question in https://groups.google.com/forum/#!topic/gitlabhq/G2rToah19-Q See merge request !912
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index eb3917872f5..ec63c7eef84 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem "default_value_for", "~> 3.0.0"
gem "mysql2", group: :mysql
gem "pg", group: :postgres
-# Auth
+# Authentication libraries
gem "devise", '3.2.4'
gem "devise-async", '0.9.0'
gem 'omniauth', "~> 1.2.2"