Commit d686723e
Changed files (2)
Gemfile
@@ -39,8 +39,8 @@ gem 'ejs', '~> 1.1.1'
gem 'js-routes', '~> 0.9.8'
group :development do
- gem 'capistrano'
- gem 'capistrano-ext'
+ gem 'capistrano', '~> 2.15.5'
+ gem 'capistrano-ext', '~> 1.2.1'
gem 'bullet'
gem 'better_errors'
gem 'lol_dba'
Gemfile.lock
@@ -47,9 +47,9 @@ GEM
sass (~> 3.2)
buftok (0.2.0)
builder (3.1.4)
- bullet (4.9.0)
- activesupport
- uniform_notifier (~> 1.6.0)
+ bullet (4.11.3)
+ activesupport (>= 3.0.0)
+ uniform_notifier (>= 1.6.0)
capistrano (2.15.5)
highline
net-scp (>= 1.0.0)
@@ -80,10 +80,10 @@ GEM
execjs
coffee-script-source (1.7.0)
daemons (1.1.9)
- dalli (2.7.1)
- database_cleaner (1.2.0)
+ dalli (2.7.2)
+ database_cleaner (1.3.0)
debug_inspector (0.0.2)
- delayed_job (4.0.1)
+ delayed_job (4.0.2)
activesupport (>= 3.0, < 4.2)
delayed_job_active_record (4.0.1)
activerecord (>= 3.0, < 4.2)
@@ -94,7 +94,7 @@ GEM
railties (>= 3.2.6, < 5)
warden (~> 1.2.3)
diff-lcs (1.2.5)
- docile (1.1.3)
+ docile (1.1.5)
dotenv (0.11.1)
dotenv-deployment (~> 0.0.2)
dotenv-deployment (0.0.2)
@@ -106,8 +106,8 @@ GEM
exception_notification (4.0.1)
actionmailer (>= 3.0.4)
activesupport (>= 3.0.4)
- excon (0.33.0)
- execjs (2.0.2)
+ excon (0.37.0)
+ execjs (2.2.1)
exifr (1.1.3)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
@@ -118,14 +118,16 @@ GEM
multipart-post (>= 1.2, < 3)
ffaker (1.24.0)
ffi (1.9.3)
- fog (1.22.0)
+ fog (1.22.1)
fog-brightbox
- fog-core (~> 1.21, >= 1.21.1)
+ fog-core (~> 1.22)
fog-json
+ ipaddress (~> 0.5)
nokogiri (~> 1.5, >= 1.5.11)
- fog-brightbox (0.0.2)
- fog-core
+ fog-brightbox (0.1.1)
+ fog-core (~> 1.22)
fog-json
+ inflecto
fog-core (1.22.0)
builder
excon (~> 0.33)
@@ -135,11 +137,11 @@ GEM
net-ssh (>= 2.1.3)
fog-json (1.0.0)
multi_json (~> 1.0)
- foreman (0.63.0)
- dotenv (>= 0.7)
- thor (>= 0.13.6)
- formatador (0.2.4)
- gibbon (1.1.2)
+ foreman (0.74.0)
+ dotenv (~> 0.11.1)
+ thor (~> 0.19.1)
+ formatador (0.2.5)
+ gibbon (1.1.3)
httparty
multi_json (>= 1.3.4)
highline (1.6.21)
@@ -151,13 +153,15 @@ GEM
json (~> 1.8)
multi_xml (>= 0.5.2)
i18n (0.6.9)
+ inflecto (0.0.2)
+ ipaddress (0.8.0)
jbuilder (1.5.3)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
jquery-fileupload-rails (0.4.1)
actionpack (>= 3.1)
railties (>= 3.1)
- jquery-rails (3.1.0)
+ jquery-rails (3.1.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.0.5)
@@ -182,7 +186,7 @@ GEM
mime-types (1.25.1)
mini_magick (3.7.0)
subexec (~> 0.2.1)
- mini_portile (0.5.3)
+ mini_portile (0.6.0)
minitest (4.7.5)
multi_json (1.10.1)
multi_xml (0.5.5)
@@ -192,15 +196,15 @@ GEM
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (2.9.0)
+ net-ssh (2.9.1)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- newrelic_rpm (3.8.0.218)
- nokogiri (1.6.1)
- mini_portile (~> 0.5.0)
+ newrelic_rpm (3.9.0.229)
+ nokogiri (1.6.2.1)
+ mini_portile (= 0.6.0)
orm_adapter (0.5.0)
pg (0.17.1)
- poltergeist (1.5.0)
+ poltergeist (1.5.1)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
@@ -227,12 +231,12 @@ GEM
rdoc (4.1.1)
json (~> 1.4)
rmagick (2.13.2)
- rspec-core (3.0.0)
+ rspec-core (3.0.2)
rspec-support (~> 3.0.0)
- rspec-expectations (3.0.0)
+ rspec-expectations (3.0.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
- rspec-mocks (3.0.1)
+ rspec-mocks (3.0.2)
rspec-support (~> 3.0.0)
rspec-rails (3.0.1)
actionpack (>= 3.0)
@@ -242,8 +246,8 @@ GEM
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
- rspec-support (3.0.0)
- rubyzip (1.1.3)
+ rspec-support (3.0.2)
+ rubyzip (1.1.6)
sass (3.2.19)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
@@ -253,7 +257,7 @@ GEM
sdoc (0.4.0)
json (~> 1.8)
rdoc (~> 4.0, < 5.0)
- selenium-webdriver (2.41.0)
+ selenium-webdriver (2.42.0)
childprocess (>= 0.5.0)
multi_json (~> 1.0)
rubyzip (~> 1.0)
@@ -296,7 +300,7 @@ GEM
naught (~> 1.0)
simple_oauth (~> 0.2.0)
tzinfo (0.3.39)
- uglifier (2.5.0)
+ uglifier (2.5.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4)
@@ -306,7 +310,7 @@ GEM
kgio (~> 2.6)
rack
raindrops (~> 0.7)
- uniform_notifier (1.6.1)
+ uniform_notifier (1.6.2)
warden (1.2.3)
rack (>= 1.0)
websocket (1.0.7)
@@ -325,8 +329,8 @@ DEPENDENCIES
binding_of_caller
bootstrap-sass (~> 2.3.0)
bullet
- capistrano
- capistrano-ext
+ capistrano (~> 2.15.5)
+ capistrano-ext (~> 1.2.1)
capybara
carrierwave (~> 0.9.0)
coffee-rails (~> 4.0)