bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to rails 4.2

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-09-08 16:53:37 +02:00
parent 3fc6e61a7b
commit 2c234e8f17
7 changed files with 136 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile.lock
+115 -95
View File
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/bterkuile/cmtool.git
revision: f709443e4c5be0f31358074785856ed933646668
revision: 683791730638cda48ed326b7812396da04b7990f
specs:
cmtool (1.0.0)
bourbon
@@ -12,7 +12,7 @@ GIT
GIT
remote: git://github.com/bterkuile/couch_potato.git
revision: 6fbcb3edcaf3edec63230308f123c1e03417967d
revision: 8929326ee855e964a441a8ede941b52c0ee88a16
specs:
couch_potato (0.7.1)
activemodel
@@ -35,40 +35,60 @@ GIT
couch_potato (>= 0.2.15)
rest-client (>= 1.4.2)
GIT
remote: git://github.com/plataformatec/devise.git
revision: c25312e78ec413f2edb0f50bc03e3472c328d862
branch: lm-rails-4-2
specs:
devise (3.3.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
mail (~> 2.5.4)
actionpack (4.1.4)
actionview (= 4.1.4)
activesupport (= 4.1.4)
rack (~> 1.5.2)
actionmailer (4.2.0.beta1)
actionpack (= 4.2.0.beta1)
actionview (= 4.2.0.beta1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.2)
actionpack (4.2.0.beta1)
actionview (= 4.2.0.beta1)
activesupport (= 4.2.0.beta1)
rack (~> 1.6.0.beta)
rack-test (~> 0.6.2)
actionview (4.1.4)
activesupport (= 4.1.4)
rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
rails-dom-testing (~> 1.0, >= 1.0.2)
actionview (4.2.0.beta1)
activesupport (= 4.2.0.beta1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
rails-dom-testing (~> 1.0, >= 1.0.2)
active_decorator (0.3.4)
active_model_serializers (0.8.1)
activemodel (>= 3.0)
activemodel (4.1.4)
activesupport (= 4.1.4)
active_model_serializers (0.9.0)
activemodel (>= 3.2)
activejob (4.2.0.beta1)
globalid (>= 0.2.3)
activemodel (4.2.0.beta1)
activesupport (= 4.2.0.beta1)
builder (~> 3.1)
activerecord (4.1.4)
activemodel (= 4.1.4)
activesupport (= 4.1.4)
arel (~> 5.0.0)
activesupport (4.1.4)
i18n (~> 0.6, >= 0.6.9)
activerecord (4.2.0.beta1)
activemodel (= 4.2.0.beta1)
activesupport (= 4.2.0.beta1)
arel (>= 6.0.0.beta1, < 6.1)
activesupport (4.2.0.beta1)
i18n (>= 0.7.0.beta1, < 0.8)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
addressable (2.3.6)
arel (5.0.1.20140414130214)
arel (6.0.0.beta1)
barber (0.4.2)
ember-source
execjs
@@ -79,8 +99,8 @@ GEM
bcrypt (3.1.7)
bootstrap-sass (2.3.2.2)
sass (~> 3.2)
bourbon (3.2.3)
sass (~> 3.2)
bourbon (4.0.2)
sass (~> 3.3)
thor
builder (3.2.2)
capistrano (3.2.1)
@@ -90,20 +110,20 @@ GEM
capistrano-bundler (1.1.3)
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-rails (1.1.1)
capistrano-rails (1.1.2)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.1)
capistrano (~> 3.0)
sshkit (~> 1.2)
capybara (2.3.0)
capybara (2.4.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-webkit (1.2.0)
capybara (>= 2.0.2, < 2.4.0)
capybara-webkit (1.3.0)
capybara (>= 2.0.2, < 2.5.0)
json
climate_control (0.0.3)
activesupport (>= 3.0)
@@ -116,7 +136,7 @@ GEM
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.7.1)
coffee-script-source (1.8.0)
colorize (0.7.3)
cookiejar (0.3.2)
couchrest (1.2.0)
@@ -124,12 +144,6 @@ GEM
multi_json (~> 1.0)
rest-client (~> 1.6.1)
daemons (1.1.9)
devise (3.2.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.2.5)
docile (1.1.5)
em-http-request (1.1.2)
@@ -142,7 +156,7 @@ GEM
eventmachine (>= 1.0.0.beta.4)
email_validator (1.4.0)
activemodel
ember-data-source (1.0.0.beta.8)
ember-data-source (1.0.0.beta.9)
ember-source
ember-rails (0.15.0)
active_model_serializers
@@ -153,7 +167,7 @@ GEM
handlebars-source (> 1.0.0)
jquery-rails (>= 1.0.17)
railties (>= 3.1)
ember-source (1.6.1)
ember-source (1.7.0)
handlebars-source (~> 1.0)
emblem-rails (0.2.1)
barber-emblem (~> 0.1.1)
@@ -180,9 +194,9 @@ GEM
faye-websocket (0.7.4)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.3.1)
font-awesome-rails (4.1.0.0)
font-awesome-rails (4.2.0.0)
railties (>= 3.2, < 5.0)
foundation-rails (5.3.3.0)
foundation-rails (5.4.3.0)
railties (>= 3.1.0)
sass (>= 3.2.0)
fuubar (2.0.0)
@@ -190,6 +204,8 @@ GEM
ruby-progressbar (~> 1.4)
gherkin (2.12.2)
multi_json (~> 1.3)
globalid (0.2.3)
activesupport (>= 4.1.0)
haml (4.0.5)
tilt
haml-rails (0.5.3)
@@ -198,17 +214,17 @@ GEM
haml (>= 3.1, < 5.0)
railties (>= 4.0.1)
handlebars-source (1.3.0)
hashie (3.2.0)
hashie (3.3.1)
hike (1.2.3)
http_parser.rb (0.6.0)
i18n (0.6.11)
i18n (0.7.0.beta1)
iso_country_codes (0.4.4)
jquery-rails (3.1.1)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.0)
railties (>= 3.2.16)
js-routes (0.9.8)
js-routes (0.9.9)
railties (>= 3.2)
sprockets-rails
json (1.8.1)
@@ -220,15 +236,14 @@ GEM
addressable (~> 2.3)
letter_opener (1.2.0)
launchy (~> 2.2)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mail (2.6.1)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (1.25.1)
mini_magick (3.8.0)
subexec (~> 0.2.1)
mini_portile (0.6.0)
minitest (5.4.0)
minitest (5.4.1)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
@@ -259,8 +274,7 @@ GEM
activesupport (>= 3.0.0)
cocaine (~> 0.5.3)
mime-types
polyglot (0.3.5)
pry (0.10.0)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
@@ -268,62 +282,71 @@ GEM
pry (>= 0.9.10)
quiet_assets (1.0.3)
railties (>= 3.1, < 5.0)
rack (1.5.2)
rack (1.6.0.beta)
rack-cors (0.2.9)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.4)
actionmailer (= 4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
activemodel (= 4.1.4)
activerecord (= 4.1.4)
activesupport (= 4.1.4)
rails (4.2.0.beta1)
actionmailer (= 4.2.0.beta1)
actionpack (= 4.2.0.beta1)
actionview (= 4.2.0.beta1)
activejob (= 4.2.0.beta1)
activemodel (= 4.2.0.beta1)
activerecord (= 4.2.0.beta1)
activesupport (= 4.2.0.beta1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.4)
sprockets-rails (~> 2.0)
railties (4.1.4)
actionpack (= 4.1.4)
activesupport (= 4.1.4)
railties (= 4.2.0.beta1)
sprockets-rails (~> 3.0.0.beta1)
rails-deprecated_sanitizer (1.0.2)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.2)
activesupport
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
railties (4.2.0.beta1)
actionpack (= 4.2.0.beta1)
activesupport (= 4.2.0.beta1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
rdoc (4.1.1)
json (~> 1.4)
responders (2.0.0)
railties (>= 4.2.0.alpha, < 5)
rest-client (1.6.8)
mime-types (~> 1.16)
rdoc (>= 2.4.2)
rqrcode (0.4.2)
rspec (3.0.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-core (3.0.3)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.3)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-core (3.1.1)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-support (~> 3.1.0)
rspec-its (1.0.1)
rspec-core (>= 2.99.0.beta1)
rspec-expectations (>= 2.99.0.beta1)
rspec-mocks (3.0.3)
rspec-support (~> 3.0.0)
rspec-rails (3.0.2)
rspec-mocks (3.1.0)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.3)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.0)
ruby-progressbar (1.5.1)
sass (3.2.19)
sass-rails (4.0.3)
sass (3.4.3)
sass-rails (5.0.0.beta1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
sass (~> 3.2)
sprockets (~> 2.12)
sprockets-rails (>= 2.0, < 4.0)
simple_form (3.0.2)
actionpack (~> 4.0)
activemodel (~> 4.0)
@@ -344,14 +367,14 @@ GEM
spring (1.1.3)
spring-commands-rspec (1.0.2)
spring (>= 0.9.1)
sprockets (2.11.0)
sprockets (2.12.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets-rails (3.0.0.beta1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (~> 2.8)
sshkit (1.5.1)
colorize
@@ -366,11 +389,8 @@ GEM
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
tinymce-rails (4.1.3)
tinymce-rails (4.1.4)
railties (>= 3.1.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turnip (1.2.2)
gherkin (>= 2.5)
rspec (>= 2.0, < 4.0)
@@ -400,7 +420,7 @@ DEPENDENCIES
cmtool!
coffee-rails
couch_potato!
devise
devise!
devise_simply_stored!
ember-rails
ember-source
@@ -423,11 +443,11 @@ DEPENDENCIES
pry-rails
quiet_assets
rack-cors
rails (= 4.1.4)
rails (= 4.2.0.beta1)
rqrcode
rspec-its
rspec-rails
sass-rails (~> 4.0.2)
sass-rails (= 5.0.0.beta1)
simple_form
simplecov
simply_stored!