summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-05-09 18:06:20 +0200
committerJames Lopez <james@jameslopez.es>2016-05-09 18:06:20 +0200
commit6fe8b5da1fcb3df22f23e2f250650b608c492463 (patch)
treed94a5279a70660e147530e030990c7f86730c03c /Gemfile
parent7750764acdf3829e9754216acb5d1043e55852a1 (diff)
parent47cd14b560e67c6d3641828ac36b1e0cb9285c6e (diff)
downloadgitlab-ce-6fe8b5da1fcb3df22f23e2f250650b608c492463.tar.gz
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 001f436f537..52fe0fb6706 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,6 +20,7 @@ gem "pg", '~> 0.18.2', group: :postgres
# Authentication libraries
gem 'devise', '~> 3.5.4'
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'
@@ -269,7 +270,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'
@@ -319,7 +320,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'