diff options
| author | Jeroen Nijhof <jeroen@jeroennijhof.nl> | 2016-01-20 11:07:10 +0300 |
|---|---|---|
| committer | Jeroen Nijhof <jeroen@jeroennijhof.nl> | 2016-01-20 11:07:10 +0300 |
| commit | 7658a6446976b8fdb451ce53c8e1f0963ff1a8ec (patch) | |
| tree | ccda74169dbb75eec7c034ed495db8fde29d92c4 /Gemfile | |
| parent | 85e0fce9eee4f20c6c627209828f7351ab0aedae (diff) | |
| parent | a382ad99efd4c792f70705d386b2be688b667f24 (diff) | |
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-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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' |