Commit ba2fc26a
Changed files (2)
Gemfile
@@ -1,9 +1,9 @@
source 'https://rubygems.org'
-gem 'rails', '~> 4.0.0'
-gem 'sass-rails', '~> 4.0.0'
+gem 'rails', '~> 4.0'
+gem 'sass-rails', '~> 4.0'
gem 'uglifier', '>= 1.3.0'
-gem 'coffee-rails', '~> 4.0.0'
+gem 'coffee-rails', '~> 4.0'
gem 'jquery-rails'
gem 'jbuilder', '~> 1.2'
group :doc do
Gemfile.lock
@@ -1,41 +1,43 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.0.2)
- actionpack (= 4.0.2)
+ actionmailer (4.0.4)
+ actionpack (= 4.0.4)
mail (~> 2.5.4)
- actionpack (4.0.2)
- activesupport (= 4.0.2)
+ actionpack (4.0.4)
+ activesupport (= 4.0.4)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- activemodel (4.0.2)
- activesupport (= 4.0.2)
+ activemodel (4.0.4)
+ activesupport (= 4.0.4)
builder (~> 3.1.0)
- activerecord (4.0.2)
- activemodel (= 4.0.2)
+ activerecord (4.0.4)
+ activemodel (= 4.0.4)
activerecord-deprecated_finders (~> 1.0.2)
- activesupport (= 4.0.2)
+ activesupport (= 4.0.4)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
- activesupport (4.0.2)
- i18n (~> 0.6, >= 0.6.4)
+ activesupport (4.0.4)
+ i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
acts-as-taggable-on (2.4.1)
rails (>= 3, < 5)
- airbrake (3.1.14)
+ airbrake (3.1.16)
builder
- json
- arel (4.0.1)
+ multi_json
+ arel (4.0.2)
asset_sync (1.0.0)
activemodel
fog (>= 1.8.0)
- atomic (1.1.14)
- bcrypt-ruby (3.1.2)
+ atomic (1.1.16)
+ bcrypt (3.1.7)
+ bcrypt-ruby (3.1.5)
+ bcrypt (>= 3.1.3)
better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
@@ -44,7 +46,7 @@ GEM
bootstrap-sass (2.3.2.2)
sass (~> 3.2)
builder (3.1.4)
- bullet (4.7.1)
+ bullet (4.8.0)
activesupport
uniform_notifier (>= 1.4.0)
capistrano (2.15.5)
@@ -55,7 +57,7 @@ GEM
net-ssh-gateway (>= 1.1.0)
capistrano-ext (1.2.1)
capistrano (>= 1.0.0)
- capybara (2.2.0)
+ capybara (2.2.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@@ -67,7 +69,7 @@ GEM
json (>= 1.7)
carrierwave_backgrounder (0.3.0)
carrierwave (~> 0.5)
- childprocess (0.3.9)
+ childprocess (0.5.2)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
coderay (1.1.0)
@@ -77,9 +79,9 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.6.3)
+ coffee-script-source (1.7.0)
daemons (1.1.9)
- dalli (2.6.4)
+ dalli (2.7.0)
database_cleaner (1.2.0)
debug_inspector (0.0.2)
delayed_job (4.0.0)
@@ -93,41 +95,48 @@ GEM
railties (>= 3.2.6, < 5)
warden (~> 1.2.3)
diff-lcs (1.2.5)
- docile (1.1.1)
- dotenv (0.9.0)
- dotenv-rails (0.9.0)
- dotenv (= 0.9.0)
+ docile (1.1.3)
+ dotenv (0.10.0)
+ dotenv-rails (0.10.0)
+ dotenv (= 0.10.0)
erubis (2.7.0)
- excon (0.31.0)
+ excon (0.32.1)
execjs (2.0.2)
- factory_girl (4.3.0)
+ factory_girl (4.4.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.3.0)
- factory_girl (~> 4.3.0)
+ factory_girl_rails (4.4.1)
+ factory_girl (~> 4.4.0)
railties (>= 3.0.0)
fakes (1.1.4)
fakes-rspec (1.0.5)
fakes
rspec
- ffaker (1.22.1)
+ ffaker (1.23.0)
ffi (1.9.3)
- fog (1.19.0)
+ fog (1.21.0)
+ fog-brightbox
+ fog-core (~> 1.21, >= 1.21.1)
+ fog-json
+ nokogiri (~> 1.5, >= 1.5.11)
+ fog-brightbox (0.0.1)
+ fog-core
+ fog-json
+ fog-core (1.21.1)
builder
- excon (~> 0.31.0)
+ excon (~> 0.32)
formatador (~> 0.2.0)
mime-types
- multi_json (~> 1.0)
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
- nokogiri (~> 1.5)
- ruby-hmac
+ fog-json (1.0.0)
+ multi_json (~> 1.0)
foreman (0.63.0)
dotenv (>= 0.7)
thor (>= 0.13.6)
formatador (0.2.4)
geocoder (1.1.9)
- geoip (1.3.5)
- highline (1.6.20)
+ geoip (1.4.0)
+ highline (1.6.21)
hike (1.2.3)
i18n (0.6.9)
jbuilder (1.5.3)
@@ -136,16 +145,16 @@ GEM
jquery-fileupload-rails (0.4.1)
actionpack (>= 3.1)
railties (>= 3.1)
- jquery-rails (3.0.4)
+ jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.0.5)
railties (>= 3.1.0)
json (1.8.1)
- kaminari (0.15.0)
+ kaminari (0.15.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- kgio (2.8.1)
+ kgio (2.9.2)
lol_dba (1.6.0)
actionpack (>= 3.0)
activerecord (>= 3.0)
@@ -154,78 +163,78 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
- mini_portile (0.5.2)
+ mini_portile (0.5.3)
minitest (4.7.5)
- multi_json (1.8.2)
+ multi_json (1.9.2)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (2.7.0)
+ net-ssh (2.8.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- newrelic_rpm (3.7.1.180)
+ newrelic_rpm (3.7.3.204)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
orm_adapter (0.5.0)
pg (0.17.1)
- phantomjs (1.9.2.1)
poltergeist (1.5.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
- polyglot (0.3.3)
+ polyglot (0.3.4)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
- rails (4.0.2)
- actionmailer (= 4.0.2)
- actionpack (= 4.0.2)
- activerecord (= 4.0.2)
- activesupport (= 4.0.2)
+ rails (4.0.4)
+ actionmailer (= 4.0.4)
+ actionpack (= 4.0.4)
+ activerecord (= 4.0.4)
+ activesupport (= 4.0.4)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.0.2)
+ railties (= 4.0.4)
sprockets-rails (~> 2.0.0)
- railties (4.0.2)
- actionpack (= 4.0.2)
- activesupport (= 4.0.2)
+ railties (4.0.4)
+ actionpack (= 4.0.4)
+ activesupport (= 4.0.4)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- raindrops (0.12.0)
- rake (10.1.1)
- rdoc (3.12.2)
+ raindrops (0.13.0)
+ rake (10.2.2)
+ rdoc (4.1.1)
json (~> 1.4)
rmagick (2.13.2)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
- rspec-core (2.14.7)
- rspec-expectations (2.14.4)
+ rspec-core (2.14.8)
+ rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
- rspec-mocks (2.14.4)
- rspec-rails (2.14.0)
+ rspec-mocks (2.14.6)
+ rspec-rails (2.14.2)
actionpack (>= 3.0)
+ activemodel (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
- ruby-hmac (0.4.0)
- rubyzip (1.1.0)
+ rubyzip (1.1.2)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
- sass (3.2.13)
- sass-rails (4.0.1)
+ sass (3.2.18)
+ sass-rails (4.0.2)
railties (>= 4.0.0, < 5.0)
- sass (>= 3.1.10)
+ sass (~> 3.2.0)
+ sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0.0)
- sdoc (0.3.20)
- json (>= 1.1.3)
- rdoc (~> 3.10)
- selenium-webdriver (2.39.0)
- childprocess (>= 0.2.5)
+ sdoc (0.4.0)
+ json (~> 1.8)
+ rdoc (~> 4.0, < 5.0)
+ selenium-webdriver (2.41.0)
+ childprocess (>= 0.5.0)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0.4)
@@ -234,7 +243,7 @@ GEM
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
- sprockets (2.10.1)
+ sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@@ -243,25 +252,24 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
- sqlite3 (1.3.8)
- teaspoon (0.7.8)
- phantomjs (>= 1.8.1.1)
+ sqlite3 (1.3.9)
+ teaspoon (0.7.9)
railties (>= 3.2.5, < 5)
- thor (0.18.1)
- thread_safe (0.1.3)
- atomic
+ thor (0.19.1)
+ thread_safe (0.3.1)
+ atomic (>= 1.1.7, < 2)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.38)
- uglifier (2.4.0)
+ tzinfo (0.3.39)
+ uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.3)
unf_ext
unf_ext (0.0.6)
- unicorn (4.7.0)
+ unicorn (4.8.2)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
@@ -269,7 +277,7 @@ GEM
warden (1.2.3)
rack (>= 1.0)
websocket (1.0.7)
- websocket-driver (0.3.1)
+ websocket-driver (0.3.2)
xpath (2.0.0)
nokogiri (~> 1.3)
@@ -289,7 +297,7 @@ DEPENDENCIES
capybara
carrierwave (~> 0.9.0)
carrierwave_backgrounder (~> 0.3.0)
- coffee-rails (~> 4.0.0)
+ coffee-rails (~> 4.0)
daemons (~> 1.1.9)
dalli
database_cleaner
@@ -313,11 +321,11 @@ DEPENDENCIES
newrelic_rpm
pg
poltergeist
- rails (~> 4.0.0)
+ rails (~> 4.0)
rmagick (~> 2.13.0)
rspec-rails
rvm-capistrano
- sass-rails (~> 4.0.0)
+ sass-rails (~> 4.0)
sdoc
selenium-webdriver
simplecov