consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #628 from AyuntamientoMadrid/update-dependencies

Browse Source 
Update dependencies
This commit is contained in:
Raimond Garcia
2015-10-21 16:36:31 +02:00
parent a8d98c5426 4fc738a42f
commit 257398f872
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@@ -47,7 +47,7 @@ gem 'rollbar', '~> 2.4.0'
gem 'delayed_job_active_record', '~> 4.1.0'
gem 'daemons'
gem 'devise-async'
gem 'newrelic_rpm', '~> 3.13.2'
gem 'newrelic_rpm', '~> 3.14'
gem 'whenever', require: false
gem 'ahoy_matey', '~> 1.2.1'
@@ -72,7 +72,7 @@ group :development, :test do
gem 'i18n-tasks'
gem 'capistrano', '3.4.0', require: false
gem "capistrano-bundler", '1.1.4', require: false
gem "capistrano-rails", '1.1.4', require: false
gem "capistrano-rails", '1.1.5', require: false
gem "capistrano-rvm", require: false
gem 'capistrano3-delayed-job', '~> 1.0'
gem "bullet"

12
Gemfile.lock
View File

@@ -82,7 +82,7 @@ GEM
capistrano-bundler (1.1.4)
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-rails (1.1.4)
capistrano-rails (1.1.5)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.2)
@@ -121,7 +121,7 @@ GEM
thor (~> 0.19.1)
daemons (1.2.3)
dalli (2.7.4)
database_cleaner (1.5.0)
database_cleaner (1.5.1)
debug_inspector (0.0.2)
delayed_job (4.1.1)
activesupport (>= 3.0, < 5.0)
@@ -228,7 +228,7 @@ GEM
net-ssh (>= 2.6.5)
net-ssh (3.0.1)
netrc (0.10.3)
newrelic_rpm (3.13.2.302)
newrelic_rpm (3.14.0.305)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
nori (2.6.0)
@@ -253,7 +253,7 @@ GEM
omniauth-oauth (1.1.0)
oauth
omniauth (~> 1.0)
omniauth-oauth2 (1.3.1)
omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
omniauth-twitter (1.2.1)
@@ -422,7 +422,7 @@ DEPENDENCIES
cancancan
capistrano (= 3.4.0)
capistrano-bundler (= 1.1.4)
capistrano-rails (= 1.1.4)
capistrano-rails (= 1.1.5)
capistrano-rvm
capistrano3-delayed-job (~> 1.0)
capybara
@@ -448,7 +448,7 @@ DEPENDENCIES
kaminari
launchy
letter_opener_web (~> 1.3.0)
newrelic_rpm (~> 3.13.2)
newrelic_rpm (~> 3.14)
omniauth
omniauth-facebook
omniauth-google-oauth2 (~> 0.2.7)