diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-19 11:18:57 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-19 11:18:57 +0100 |
| commit | b4d61ac46babc04f67bb191c477dddc88e10ad45 (patch) | |
| tree | 5c956996de67438678ba59d5e02e3627713b2e2f /Gemfile | |
| parent | 1ede975cde6d32a74b2d4d523e5c0e242c89d50d (diff) | |
| parent | 2becc6fae9b82479b644c0ca10b758cf8447bc19 (diff) | |
| download | gitlab-ce-doc_refactor_commits_api.tar.gz | |
Merge branch 'master' into doc_refactor_commits_apidoc_refactor_commits_api
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' |