diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-18 21:46:20 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-18 16:47:30 -0500 |
| commit | 449ec2bb0e22892c064468f0746b24f6a9bd50ee (patch) | |
| tree | 57d8046fc9af574ee91db46127aa72790c6c4f52 /Gemfile | |
| parent | 6d5581743aa45aef3a6e0b612fcc585772471549 (diff) | |
| download | gitlab-ce-449ec2bb0e22892c064468f0746b24f6a9bd50ee.tar.gz | |
Merge branch 'update-devise' into 'master'
Update devise to version 3.5.4
Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2642
See merge request !2490
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' |