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

Update to rails 4.2.0.beta4

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-11-21 15:03:00 +01:00
parent 8837037b05
commit a73ceb0df2
6 changed files with 98 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile
+1 -1
View File
@@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '4.2.0.beta1' gem 'rails', '4.2.0.beta4'
gem 'rack-cors', :require => 'rack/cors' gem 'rack-cors', :require => 'rack/cors'
# Bundle edge Rails instead: # Bundle edge Rails instead:
Gemfile.lock
+85 -81
View File
@@ -1,6 +1,6 @@
GIT GIT
remote: git://github.com/bterkuile/cmtool.git remote: git://github.com/bterkuile/cmtool.git
revision: 6afc9bdae9bf909b76f9a2de0846c84134292d5f revision: b5a24fd34697160e80394e74fdb1ea15c8f1f864
specs: specs:
cmtool (1.0.0) cmtool (1.0.0)
bourbon bourbon
@@ -28,7 +28,7 @@ GIT
GIT GIT
remote: git://github.com/bterkuile/simply_stored.git remote: git://github.com/bterkuile/simply_stored.git
revision: 354fde89a88c1384ccc9d82989e3f05ac6977bd1 revision: 8f00644f7a8e82dba057c01f86dbb8bc3154d5d8
specs: specs:
simply_stored (1.0.0) simply_stored (1.0.0)
activesupport activesupport
@@ -51,52 +51,54 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.2.0.beta1) actionmailer (4.2.0.beta4)
actionpack (= 4.2.0.beta1) actionpack (= 4.2.0.beta4)
actionview (= 4.2.0.beta1) actionview (= 4.2.0.beta4)
activejob (= 4.2.0.beta4)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.2) rails-dom-testing (~> 1.0, >= 1.0.4)
actionpack (4.2.0.beta1) actionpack (4.2.0.beta4)
actionview (= 4.2.0.beta1) actionview (= 4.2.0.beta4)
activesupport (= 4.2.0.beta1) activesupport (= 4.2.0.beta4)
rack (~> 1.6.0.beta) rack (~> 1.6.0.beta)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
rails-deprecated_sanitizer (~> 1.0, >= 1.0.2) rails-dom-testing (~> 1.0, >= 1.0.4)
rails-dom-testing (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0.beta1) actionview (4.2.0.beta4)
activesupport (= 4.2.0.beta1) activesupport (= 4.2.0.beta4)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rails-deprecated_sanitizer (~> 1.0, >= 1.0.2) rails-dom-testing (~> 1.0, >= 1.0.4)
rails-dom-testing (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.1)
active_decorator (0.3.4) active_decorator (0.3.4)
active_model_serializers (0.9.0) active_model_serializers (0.9.0)
activemodel (>= 3.2) activemodel (>= 3.2)
activejob (4.2.0.beta1) activejob (4.2.0.beta4)
globalid (>= 0.2.3) activesupport (= 4.2.0.beta4)
activemodel (4.2.0.beta1) globalid (>= 0.3.0)
activesupport (= 4.2.0.beta1) activemodel (4.2.0.beta4)
activesupport (= 4.2.0.beta4)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.2.0.beta1) activerecord (4.2.0.beta4)
activemodel (= 4.2.0.beta1) activemodel (= 4.2.0.beta4)
activesupport (= 4.2.0.beta1) activesupport (= 4.2.0.beta4)
arel (>= 6.0.0.beta1, < 6.1) arel (>= 6.0.0.beta2, < 6.1)
activesupport (4.2.0.beta1) activesupport (4.2.0.beta4)
i18n (>= 0.7.0.beta1, < 0.8) i18n (>= 0.7.0.beta1, < 0.8)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
addressable (2.3.6) addressable (2.3.6)
arel (6.0.0.beta1) arel (6.0.0.beta2)
barber (0.4.2) barber (0.5.0)
ember-source ember-source
execjs execjs
handlebars-source handlebars-source (>= 1.0.0.rc.4)
barber-emblem (0.1.1) barber-emblem (0.1.1)
barber (>= 0.4.1) barber (>= 0.4.1)
emblem-source emblem-source
bcrypt (3.1.7) bcrypt (3.1.9)
binding_of_caller (0.7.3.pre1) binding_of_caller (0.7.3.pre1)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bootstrap-sass (2.3.2.2) bootstrap-sass (2.3.2.2)
@@ -115,16 +117,16 @@ GEM
capistrano-rails (1.1.2) capistrano-rails (1.1.2)
capistrano (~> 3.1) capistrano (~> 3.1)
capistrano-bundler (~> 1.1) capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.1) capistrano-rvm (0.1.2)
capistrano (~> 3.0) capistrano (~> 3.0)
sshkit (~> 1.2) sshkit (~> 1.2)
capybara (2.4.3) capybara (2.4.4)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
capybara-webkit (1.3.0) capybara-webkit (1.3.1)
capybara (>= 2.0.2, < 2.5.0) capybara (>= 2.0.2, < 2.5.0)
json json
climate_control (0.0.3) climate_control (0.0.3)
@@ -132,7 +134,7 @@ GEM
cocaine (0.5.4) cocaine (0.5.4)
climate_control (>= 0.0.3, < 1.0) climate_control (>= 0.0.3, < 1.0)
coderay (1.1.0) coderay (1.1.0)
coffee-rails (4.0.1) coffee-rails (4.1.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0) coffee-script (2.3.0)
@@ -162,7 +164,7 @@ GEM
eventmachine (>= 1.0.0.beta.4) eventmachine (>= 1.0.0.beta.4)
email_validator (1.4.0) email_validator (1.4.0)
activemodel activemodel
ember-data-source (1.0.0.beta.10) ember-data-source (1.0.0.beta.11)
ember-source ember-source
ember-rails (0.15.0) ember-rails (0.15.0)
active_model_serializers active_model_serializers
@@ -173,7 +175,7 @@ GEM
handlebars-source (> 1.0.0) handlebars-source (> 1.0.0)
jquery-rails (>= 1.0.17) jquery-rails (>= 1.0.17)
railties (>= 3.1) railties (>= 3.1)
ember-source (1.7.0) ember-source (1.8.1)
handlebars-source (~> 1.0) handlebars-source (~> 1.0)
emblem-rails (0.2.1) emblem-rails (0.2.1)
barber-emblem (~> 0.1.1) barber-emblem (~> 0.1.1)
@@ -181,11 +183,11 @@ GEM
emblem-source (0.3.17) emblem-source (0.3.17)
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.3) eventmachine (1.0.3)
execjs (2.2.1) execjs (2.2.2)
factory_girl (4.4.0) factory_girl (4.5.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
factory_girl_rails (4.4.1) factory_girl_rails (4.5.0)
factory_girl (~> 4.4.0) factory_girl (~> 4.5.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.9.0) faraday (0.9.0)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
@@ -197,9 +199,9 @@ GEM
multi_json (>= 1.0.0) multi_json (>= 1.0.0)
rack (>= 1.0.0) rack (>= 1.0.0)
websocket-driver (>= 0.3.0) websocket-driver (>= 0.3.0)
faye-websocket (0.7.5) faye-websocket (0.8.0)
eventmachine (>= 0.12.0) eventmachine (>= 0.12.0)
websocket-driver (>= 0.3.5) websocket-driver (>= 0.4.0)
font-awesome-rails (4.2.0.0) font-awesome-rails (4.2.0.0)
railties (>= 3.2, < 5.0) railties (>= 3.2, < 5.0)
foreman (0.75.0) foreman (0.75.0)
@@ -227,11 +229,11 @@ GEM
hike (1.2.3) hike (1.2.3)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (0.7.0.beta1) i18n (0.7.0.beta1)
iso_country_codes (0.4.4) iso_country_codes (0.6.1)
jquery-rails (3.1.2) jquery-rails (3.1.2)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.0) jquery-ui-rails (5.0.2)
railties (>= 3.2.16) railties (>= 3.2.16)
js-routes (0.9.9) js-routes (0.9.9)
railties (>= 3.2) railties (>= 3.2)
@@ -241,26 +243,27 @@ GEM
kaminari (0.16.1) kaminari (0.16.1)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
launchy (2.4.2) launchy (2.4.3)
addressable (~> 2.3) addressable (~> 2.3)
letter_opener (1.2.0) letter_opener (1.2.0)
launchy (~> 2.2) launchy (~> 2.2)
mail (2.6.1) loofah (2.0.1)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (1.25.1)
mini_magick (3.8.1) mini_magick (4.0.0)
subexec (~> 0.2.1) mini_portile (0.6.1)
mini_portile (0.6.0) minitest (5.4.3)
minitest (5.4.2)
multi_json (1.10.1) multi_json (1.10.1)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (2.9.1) net-ssh (2.9.1)
nokogiri (1.6.3.1) nokogiri (1.6.4.1)
mini_portile (= 0.6.0) mini_portile (~> 0.6.0)
oauth2 (1.0.0) oauth2 (1.0.0)
faraday (>= 0.8, < 0.10) faraday (>= 0.8, < 0.10)
jwt (~> 1.0) jwt (~> 1.0)
@@ -295,32 +298,34 @@ GEM
rack-cors (0.2.9) rack-cors (0.2.9)
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.0.beta1) rails (4.2.0.beta4)
actionmailer (= 4.2.0.beta1) actionmailer (= 4.2.0.beta4)
actionpack (= 4.2.0.beta1) actionpack (= 4.2.0.beta4)
actionview (= 4.2.0.beta1) actionview (= 4.2.0.beta4)
activejob (= 4.2.0.beta1) activejob (= 4.2.0.beta4)
activemodel (= 4.2.0.beta1) activemodel (= 4.2.0.beta4)
activerecord (= 4.2.0.beta1) activerecord (= 4.2.0.beta4)
activesupport (= 4.2.0.beta1) activesupport (= 4.2.0.beta4)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.0.beta1) railties (= 4.2.0.beta4)
sprockets-rails (~> 3.0.0.beta1) sprockets-rails (~> 3.0.0.beta1)
rails-deprecated_sanitizer (1.0.3) rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha) activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.3) rails-dom-testing (1.0.4)
activesupport activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0) nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1) rails-deprecated_sanitizer (>= 1.0.1)
railties (4.2.0.beta1) rails-html-sanitizer (1.0.1)
actionpack (= 4.2.0.beta1) loofah (~> 2.0)
activesupport (= 4.2.0.beta1) railties (4.2.0.beta4)
actionpack (= 4.2.0.beta4)
activesupport (= 4.2.0.beta4)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.3.2) rake (10.3.2)
rdoc (4.1.2) rdoc (4.1.2)
json (~> 1.4) json (~> 1.4)
responders (2.0.0) responders (2.0.2)
railties (>= 4.2.0.alpha, < 5) railties (>= 4.2.0.alpha, < 5)
rest-client (1.6.8) rest-client (1.6.8)
mime-types (~> 1.16) mime-types (~> 1.16)
@@ -330,15 +335,15 @@ GEM
rspec-core (~> 3.1.0) rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0) rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0) rspec-mocks (~> 3.1.0)
rspec-core (3.1.5) rspec-core (3.1.7)
rspec-support (~> 3.1.0) rspec-support (~> 3.1.0)
rspec-expectations (3.1.2) rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0) rspec-support (~> 3.1.0)
rspec-its (1.0.1) rspec-its (1.1.0)
rspec-core (>= 2.99.0.beta1) rspec-core (>= 3.0.0)
rspec-expectations (>= 2.99.0.beta1) rspec-expectations (>= 3.0.0)
rspec-mocks (3.1.2) rspec-mocks (3.1.3)
rspec-support (~> 3.1.0) rspec-support (~> 3.1.0)
rspec-rails (3.1.0) rspec-rails (3.1.0)
actionpack (>= 3.0) actionpack (>= 3.0)
@@ -348,9 +353,9 @@ GEM
rspec-expectations (~> 3.1.0) rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0) rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0) rspec-support (~> 3.1.0)
rspec-support (3.1.1) rspec-support (3.1.2)
ruby-progressbar (1.6.0) ruby-progressbar (1.7.0)
sass (3.4.5) sass (3.4.8)
sass-rails (5.0.0.beta1) sass-rails (5.0.0.beta1)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.2) sass (~> 3.2)
@@ -364,8 +369,8 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
simplecov-html (~> 0.8.0) simplecov-html (~> 0.8.0)
simplecov-html (0.8.0) simplecov-html (0.8.0)
slim (2.0.3) slim (2.1.0)
temple (~> 0.6.6) temple (~> 0.6.9)
tilt (>= 1.3.3, < 2.1) tilt (>= 1.3.3, < 2.1)
slim-rails (2.1.5) slim-rails (2.1.5)
actionpack (>= 3.0, < 4.2) actionpack (>= 3.0, < 4.2)
@@ -376,7 +381,7 @@ GEM
spring (1.1.3) spring (1.1.3)
spring-commands-rspec (1.0.2) spring-commands-rspec (1.0.2)
spring (>= 0.9.1) spring (>= 0.9.1)
sprockets (2.12.2) sprockets (2.12.3)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
@@ -389,8 +394,7 @@ GEM
colorize colorize
net-scp (>= 1.1.2) net-scp (>= 1.1.2)
net-ssh (>= 2.8.0) net-ssh (>= 2.8.0)
subexec (0.2.3) temple (0.6.10)
temple (0.6.8)
thin (1.6.3) thin (1.6.3)
daemons (~> 1.0, >= 1.0.9) daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0) eventmachine (~> 1.0)
@@ -398,7 +402,7 @@ GEM
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.4) thread_safe (0.3.4)
tilt (1.4.1) tilt (1.4.1)
tinymce-rails (4.1.5) tinymce-rails (4.1.6)
railties (>= 3.1.1) railties (>= 3.1.1)
turnip (1.2.4) turnip (1.2.4)
gherkin (>= 2.5) gherkin (>= 2.5)
@@ -415,7 +419,7 @@ GEM
binding_of_caller (= 0.7.3.pre1) binding_of_caller (= 0.7.3.pre1)
railties (~> 4.0) railties (~> 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
websocket-driver (0.3.5) websocket-driver (0.4.0)
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
@@ -458,7 +462,7 @@ DEPENDENCIES
pry-rails pry-rails
quiet_assets quiet_assets
rack-cors rack-cors
rails (= 4.2.0.beta1) rails (= 4.2.0.beta4)
rqrcode rqrcode
rspec-its rspec-its
rspec-rails rspec-rails
app/controllers/application_controller.rb
+10
View File
@@ -36,6 +36,16 @@ private
def set_locale def set_locale
I18n.locale = (params[:locale].presence || I18n.default_locale).to_sym I18n.locale = (params[:locale].presence || I18n.default_locale).to_sym
end end
def _render_with_renderer_json(resource, options)
serializer = build_json_serializer(resource, options)
if serializer
super(serializer, options)
else
super
end
end
def layout_by_resource(*args) def layout_by_resource(*args)
#if devise_controller? #if devise_controller?
app/controllers/suppliers/sections_controller.rb
-1
View File
@@ -17,7 +17,6 @@ module Suppliers
# end # end
# end # end
# end # end
render json: @sections, each_serializer: SupplierExtendedSectionSerializer render json: @sections, each_serializer: SupplierExtendedSectionSerializer
end end
config/version
+1 -1
View File
@@ -1 +1 @@
0.9.5 0.9.6
wip.md
+1
View File
@@ -84,6 +84,7 @@ User
- Subscribe to general faye channels [':version', 'mozo'] - Subscribe to general faye channels [':version', 'mozo']
- Post order on Facebook - Post order on Facebook
- Split bill by user - Split bill by user
- request list closing
Integrations Integrations
------------ ------------