diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 20:21:02 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 20:21:02 +0300 |
| commit | 71da2e0b56a89fc87f2da3685bdebb333690593a (patch) | |
| tree | be6418658f118746ab158be162622fe8cb5f0b0e /Gemfile | |
| parent | 011a905a821e2ff0cd2d9885ef93764018eb8346 (diff) | |
| parent | 44501820152083d231459223fe09b9d9641b7c1e (diff) | |
| download | gitlab-ce-71da2e0b56a89fc87f2da3685bdebb333690593a.tar.gz | |
Merge remote-tracking branch 'origin/master' into docker-registry
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -19,7 +19,8 @@ gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries gem 'devise', '~> 3.5.4' -gem 'doorkeeper', '~> 2.2.0' +gem 'doorkeeper', '~> 3.1' +gem 'devise-async', '~> 0.9.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' @@ -271,7 +272,7 @@ group :development, :test do gem 'database_cleaner', '~> 1.4.0' gem 'factory_girl_rails', '~> 4.6.0' - gem 'rspec-rails', '~> 3.3.0' + gem 'rspec-rails', '~> 3.4.0' gem 'rspec-retry' gem 'spinach-rails', '~> 0.2.1' gem 'spinach-rerun-reporter', '~> 0.0.2' @@ -321,7 +322,7 @@ gem "newrelic_rpm", '~> 3.14' gem 'octokit', '~> 4.3.0' -gem "mail_room", "~> 0.6.1" +gem "mail_room", "~> 0.7" gem 'email_reply_parser', '~> 0.5.8' |