summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorJeroen Nijhof <jeroen@jeroennijhof.nl>2016-01-20 09:07:10 +0100
committerJeroen Nijhof <jeroen@jeroennijhof.nl>2016-01-20 09:07:10 +0100
commit7658a6446976b8fdb451ce53c8e1f0963ff1a8ec (patch)
treeccda74169dbb75eec7c034ed495db8fde29d92c4 /Gemfile
parent85e0fce9eee4f20c6c627209828f7351ab0aedae (diff)
parenta382ad99efd4c792f70705d386b2be688b667f24 (diff)
downloadgitlab-ce-7658a6446976b8fdb451ce53c8e1f0963ff1a8ec.tar.gz
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into sentry-integration
Conflicts: db/schema.rb
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 2363f483fc0..e8fa75e0974 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem "mysql2", '~> 0.3.16', group: :mysql
gem "pg", '~> 0.18.2', group: :postgres
# Authentication libraries
-gem 'devise', '~> 3.5.3'
+gem 'devise', '~> 3.5.4'
gem 'devise-async', '~> 0.9.0'
gem 'doorkeeper', '~> 2.2.0'
gem 'omniauth', '~> 1.2.2'