From bd311ef38e48b25ccaf78af82393327d2bed9975 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 30 Nov 2016 14:18:12 +0100 Subject: [PATCH 1/6] update --- Gemfile | 6 +- Gemfile.lock | 285 +++++++++++++++++++++++++-------------------------- 2 files changed, 140 insertions(+), 151 deletions(-) diff --git a/Gemfile b/Gemfile index e36d4dbd..9b02172b 100644 --- a/Gemfile +++ b/Gemfile @@ -32,8 +32,8 @@ group :assets do gem 'uglifier', '>= 1.0.3' - gem 'ember-source', '~> 2.5.1' - gem 'ember-data-source', '~> 2.5.3' + #gem 'ember-source', '~> 2.5.1' + #gem 'ember-data-source', '~> 2.5.3' gem 'ember-rails' gem 'ember-validations-rails' @@ -54,7 +54,7 @@ end # gem 'couchbase-docstore' # gem 'couchbase-structures', github: 'bterkuile/couchbase-structures' -gem 'couch_potato', '~> 1.4.0' #, github: 'bterkuile/couch_potato' +#gem 'couch_potato', '~> 1.4.0' #, github: 'bterkuile/couch_potato' #gem 'simply_stored', path: '~/development/rails/components/simply_stored' #, github: 'bterkuile/simply_stored' gem 'simply_stored', github: 'bterkuile/simply_stored' #gem 'orm_adapter', github: 'bterkuile/orm_adapter' diff --git a/Gemfile.lock b/Gemfile.lock index b6608a21..7eca81e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,33 +30,32 @@ GIT GIT remote: git://github.com/bterkuile/simply_stored.git - revision: 95e045e1ed073090505596d74c6f1d3f39ef4729 + revision: 7633d88a62972cee6aea49d7d2a175bf07906236 specs: simply_stored (1.0.0) activesupport - couch_potato (>= 1.4.0) - rest-client (>= 1.4.2) + couch_potato (>= 1.7.0) GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - ace-rails-ap (4.0.2) - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) + ace-rails-ap (4.1.1) + actionmailer (4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) + actionpack (4.2.7.1) + actionview (= 4.2.7.1) + activesupport (= 4.2.7.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) + actionview (4.2.7.1) + activesupport (= 4.2.7.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) @@ -67,35 +66,36 @@ GEM activemodel (>= 3.0.2, < 5.1) activesupport (>= 3.0.2, < 5.1) active_decorator (0.7.1) - active_model_serializers (0.10.0) - actionpack (>= 4.0) - activemodel (>= 4.0) - railties (>= 4.0) - activejob (4.2.6) - activesupport (= 4.2.6) + active_model_serializers (0.10.3) + actionpack (>= 4.1, < 6) + activemodel (>= 4.1, < 6) + jsonapi (= 0.1.1.beta2) + activejob (4.2.7.1) + activesupport (= 4.2.7.1) globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) + activemodel (4.2.7.1) + activesupport (= 4.2.7.1) builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) + activerecord (4.2.7.1) + activemodel (= 4.2.7.1) + activesupport (= 4.2.7.1) arel (~> 6.0) - activesupport (4.2.6) + activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.4.0) - airbrussh (1.0.2) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) + airbrussh (1.1.1) sshkit (>= 1.6.1, != 1.7.0) arel (6.0.3) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - barber (0.11.1) + barber (0.11.2) ember-source (>= 1.0, < 3) execjs (>= 1.2, < 3) bcrypt (3.1.11) @@ -104,17 +104,17 @@ GEM thor (~> 0.19) builder (3.2.2) cancancan (1.15.0) - capistrano (3.5.0) + capistrano (3.6.1) airbrussh (>= 1.0.0) capistrano-harrow i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.1.4) + capistrano-bundler (1.2.0) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-harrow (0.5.1) - capistrano-rails (1.1.7) + capistrano-harrow (0.5.3) + capistrano-rails (1.2.0) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rvm (0.1.2) @@ -123,54 +123,52 @@ GEM capistrano3-puma (1.2.1) capistrano (~> 3.0) puma (>= 2.6) - capybara (2.7.1) + capybara (2.10.1) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.13) + capybara-screenshot (1.0.14) capybara (>= 1.0, < 3) launchy - chunky_png (1.3.5) + chunky_png (1.3.8) climate_control (0.0.3) activesupport (>= 3.0) cliver (0.3.2) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.1) - coffee-rails (4.1.1) + coffee-rails (4.2.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) + railties (>= 4.0.0, < 5.2.x) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.11.1) concurrent-ruby (1.0.2) cookiejar (0.3.3) - couch_potato (1.4.0) - activemodel - couchrest (~> 1.2.0) + couch_potato (1.7.0) + activemodel (~> 4.0) + couchrest (~> 2.0.0.rc3) json (~> 1.6) - couchrest (1.2.1) + couchrest (2.0.0) + httpclient (~> 2.8) mime-types (>= 1.15) - multi_json (~> 1.7, ~> 1.0) - rest-client (~> 1.8.0) + multi_json (~> 1.7) crack (0.4.3) safe_yaml (~> 1.0.0) - devise (4.1.1) + devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) responders warden (~> 1.2.3) - devise-i18n (1.1.0) + devise-i18n (1.1.1) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.20160310) - unf (>= 0.0.5, < 1.0.0) - em-http-request (1.1.4) + em-http-request (1.1.5) addressable (>= 2.3.4) cookiejar (!= 0.3.1) em-socksify (>= 0.3) @@ -180,8 +178,8 @@ GEM eventmachine (>= 1.0.0.beta.4) email_validator (1.6.0) activemodel - ember-cli-assets (0.0.32) - ember-data-source (2.5.3) + ember-cli-assets (0.0.35) + ember-data-source (2.10.0) ember-source (>= 2, < 3.0) ember-emblem-template (0.4.0) ember-handlebars-template (~> 0.7.0) @@ -202,14 +200,14 @@ GEM ember-source (>= 1.8.0) jquery-rails (>= 1.0.17) railties (>= 3.1) - ember-source (2.5.1) + ember-source (2.10.0) ember-validations-rails (1.0.0) railties erubis (2.7.0) - eventmachine (1.2.0.1) - exception_notification (4.1.4) - actionmailer (~> 4.0) - activesupport (~> 4.0) + eventmachine (1.2.1) + exception_notification (4.2.1) + actionmailer (>= 4.0, < 6) + activesupport (>= 4.0, < 6) execjs (2.7.0) factory_girl (4.7.0) activesupport (>= 3.0.0) @@ -218,7 +216,7 @@ GEM railties (>= 3.0.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - faye (1.1.2) + faye (1.2.3) cookiejar (>= 0.3.0) em-http-request (>= 0.3.0) eventmachine (>= 0.12.0) @@ -226,41 +224,42 @@ GEM multi_json (>= 1.0.0) rack (>= 1.0.0) websocket-driver (>= 0.5.1) - faye-websocket (0.10.4) + faye-websocket (0.10.5) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) - font-awesome-rails (4.6.3.1) + font-awesome-rails (4.7.0.0) railties (>= 3.2, < 5.1) foreman (0.82.0) thor (~> 0.19.1) foundation-rails (5.5.3.2) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) - fuubar (2.0.0) - rspec (~> 3.0) + fuubar (2.2.0) + rspec-core (~> 3.0) ruby-progressbar (~> 1.4) gherkin (2.12.2) multi_json (~> 1.3) - globalid (0.3.6) + globalid (0.3.7) activesupport (>= 4.1.0) - hashdiff (0.3.0) - hashie (3.4.4) - http-cookie (1.0.2) - domain_name (~> 0.5) + hashdiff (0.3.1) + hashie (3.4.6) http_parser.rb (0.6.0) + httpclient (2.8.2.4) i18n (0.7.0) iso_country_codes (0.7.5) - jquery-rails (4.1.1) + jquery-rails (4.2.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) + jquery-ui-rails (6.0.0) railties (>= 3.2.16) - js-routes (1.2.6) + js-routes (1.3.1) railties (>= 3.2) sprockets-rails json (1.8.3) - jwt (1.5.1) + jsonapi (0.1.1.beta2) + json (~> 1.8) + jwt (1.5.6) kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -268,38 +267,38 @@ GEM addressable (~> 2.3) letter_opener (1.4.1) launchy (~> 2.2) - libv8 (3.16.14.15) + libv8 (3.16.14.17) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.4) mime-types (>= 1.16, < 4) method_source (0.8.2) - mime-types (2.99.2) - mimemagic (0.3.1) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mimemagic (0.3.2) mini_magick (4.5.1) mini_portile2 (2.1.0) - minitest (5.9.0) + minitest (5.9.1) multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) naught (1.1.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.1.1) - netrc (0.11.0) - nokogiri (1.6.8) + net-ssh (3.2.0) + nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - oauth2 (1.1.0) + oauth2 (1.2.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0, < 1.5.2) + jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-facebook (3.0.0) + omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) omniauth-instagram (1.0.2) omniauth (~> 1) @@ -308,7 +307,7 @@ GEM oauth2 (~> 1.0) omniauth (~> 1.2) orm_adapter (0.5.0) - paperclip (5.0.0) + paperclip (5.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) cocaine (~> 0.5.5) @@ -316,41 +315,40 @@ GEM mimemagic (~> 0.3.0) pickadate-rails (3.5.6.0) railties (>= 3.1.0) - pkg-config (1.1.7) - poltergeist (1.9.0) + poltergeist (1.11.0) capybara (~> 2.1) cliver (~> 0.3.1) - multi_json (~> 1.0) websocket-driver (>= 0.2.0) - pry (0.10.3) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-doc (0.8.0) + pry-doc (0.9.0) pry (~> 0.9) yard (~> 0.8) pry-rails (0.3.4) pry (>= 0.9.10) - puma (3.4.0) + public_suffix (2.0.4) + puma (3.6.2) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.4) + rack (1.6.5) rack-cors (0.4.0) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) + rails (4.2.7.1) + actionmailer (= 4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) + activemodel (= 4.2.7.1) + activerecord (= 4.2.7.1) + activesupport (= 4.2.7.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) + railties (= 4.2.7.1) sprockets-rails - rails-assets-ember-qunit (0.4.20) - rails-assets-qunit (1.23.1) + rails-assets-ember-qunit (1.0.0) + rails-assets-qunit (2.0.1) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.7) @@ -359,104 +357,98 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + railties (4.2.7.1) + actionpack (= 4.2.7.1) + activesupport (= 4.2.7.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.2.2) + rake (11.3.0) ref (2.0.0) - responders (2.2.0) + responders (2.3.0) railties (>= 4.2.0, < 5.1) - rest-client (1.8.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) rqrcode (0.10.1) chunky_png (~> 1.0) - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) + rspec-support (~> 3.5.0) rspec-its (1.2.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.4.1) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-rails (3.4.2) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) ruby-progressbar (1.8.1) safe_yaml (1.0.4) sass (3.4.22) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - simplecov (0.11.2) + simplecov (0.12.0) docile (~> 1.1.0) - json (~> 1.8) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slim (3.0.7) temple (~> 0.7.6) tilt (>= 1.3.3, < 2.1) - slim-rails (3.1.0) + slim-rails (3.1.1) actionpack (>= 3.1) railties (>= 3.1) slim (~> 3.0) slop (3.6.0) - spring (1.7.1) + spring (2.0.0) + activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.6.0) + sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sshkit (1.11.0) + sshkit (1.11.4) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) sucker_punch (2.0.2) concurrent-ruby (~> 1.0.0) temple (0.7.7) - test_squad (0.1.2) + test_squad (0.1.3) rails therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref - thor (0.19.1) + thor (0.19.4) thread_safe (0.3.5) tilt (2.0.5) timecop (0.8.1) - tinymce-rails (4.4.0) + tinymce-rails (4.5.0) railties (>= 3.1.1) turnip (2.1.1) gherkin (~> 2.5) rspec (>= 3.0, < 4.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.0) + uglifier (3.0.3) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.2) warden (1.2.6) rack (>= 1.0) webmock (2.1.0) @@ -468,7 +460,7 @@ GEM websocket-extensions (0.1.2) xpath (2.0.0) nokogiri (~> 1.3) - yard (0.8.7.6) + yard (0.9.5) PLATFORMS ruby @@ -488,15 +480,12 @@ DEPENDENCIES capybara-screenshot cmtool! coffee-rails - couch_potato (~> 1.4.0) devise devise-i18n devise_simply_stored! - ember-data-source (~> 2.5.3) ember-emblem-template ember-handlebars-template ember-rails - ember-source (~> 2.5.1) ember-validations-rails exception_notification factory_girl_rails @@ -546,4 +535,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.12.3 + 1.13.1 From 910a0aadfb9e44388e14fbc2243a15bb18722dcf Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 30 Nov 2016 14:49:46 +0100 Subject: [PATCH 2/6] use assets group on deploy --- config/deploy.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/deploy.rb b/config/deploy.rb index a59f717a..1fe4906c 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -94,9 +94,9 @@ namespace :deploy do on roles(fetch(:assets_roles)) do run_locally do with rails_env: fetch(:stage) do - execute "RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:precompile" - execute "RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:dedigest" - execute "RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:gzip" + execute "RAILS_GROUPS=assets RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:precompile" + execute "RAILS_GROUPS=assets RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:dedigest" + execute "RAILS_GROUPS=assets RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:gzip" end end From fbf4fe10311a0474f94232f205e4cc6726271718 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 30 Nov 2016 15:42:06 +0100 Subject: [PATCH 3/6] emergency shallow tested fixes for server down --- Gemfile | 9 +++++---- Gemfile.lock | 15 +++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 9b02172b..41574625 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '~> 4.2.3' +gem 'rails', '~> 4.2.6' gem 'rack-cors', require: 'rack/cors' # Bundle edge Rails instead: @@ -15,7 +15,7 @@ gem 'slim-rails' gem 'jsonapi-serializers', github: 'bterkuile/jsonapi-serializers' group :assets do gem 'jquery-rails' - gem 'jquery-ui-rails' + gem 'jquery-ui-rails', '~> 5.0.5' # https://github.com/joliss/jquery-ui-rails/issues/108 gem 'sass-rails' #, '~> 5.0.0' gem 'coffee-rails' #, '~> 3.2.1' #gem 'twitter-bootstrap-rails' @@ -32,8 +32,9 @@ group :assets do gem 'uglifier', '>= 1.0.3' - #gem 'ember-source', '~> 2.5.1' - #gem 'ember-data-source', '~> 2.5.3' + gem 'ember-source', '~> 2.5.1' + gem 'ember-data-source', '~> 2.5.3' + gem "barber", "0.11.1" gem 'ember-rails' gem 'ember-validations-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 7eca81e7..dad249f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - barber (0.11.2) + barber (0.11.1) ember-source (>= 1.0, < 3) execjs (>= 1.2, < 3) bcrypt (3.1.11) @@ -179,7 +179,7 @@ GEM email_validator (1.6.0) activemodel ember-cli-assets (0.0.35) - ember-data-source (2.10.0) + ember-data-source (2.5.5) ember-source (>= 2, < 3.0) ember-emblem-template (0.4.0) ember-handlebars-template (~> 0.7.0) @@ -200,7 +200,7 @@ GEM ember-source (>= 1.8.0) jquery-rails (>= 1.0.17) railties (>= 3.1) - ember-source (2.10.0) + ember-source (2.5.1) ember-validations-rails (1.0.0) railties erubis (2.7.0) @@ -251,7 +251,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (6.0.0) + jquery-ui-rails (5.0.5) railties (>= 3.2.16) js-routes (1.3.1) railties (>= 3.2) @@ -470,6 +470,7 @@ DEPENDENCIES active_attr active_decorator airbrussh + barber (= 0.11.1) bourbon cancancan capistrano @@ -483,9 +484,11 @@ DEPENDENCIES devise devise-i18n devise_simply_stored! + ember-data-source (~> 2.5.3) ember-emblem-template ember-handlebars-template ember-rails + ember-source (~> 2.5.1) ember-validations-rails exception_notification factory_girl_rails @@ -496,7 +499,7 @@ DEPENDENCIES fuubar iso_country_codes jquery-rails - jquery-ui-rails + jquery-ui-rails (~> 5.0.5) js-routes jsonapi-serializers! kaminari @@ -514,7 +517,7 @@ DEPENDENCIES puma quiet_assets rack-cors - rails (~> 4.2.3) + rails (~> 4.2.6) rails-assets-ember-qunit! rails-assets-qunit! rqrcode From 6e89bacafec14337828c81ae45b6029945975c14 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Thu, 12 Jan 2017 10:43:39 +0100 Subject: [PATCH 4/6] indent fix --- .../app/components/form/file-upload.js.coffee | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/supplier/app/components/form/file-upload.js.coffee b/app/assets/javascripts/supplier/app/components/form/file-upload.js.coffee index a38298b9..2b3f0716 100644 --- a/app/assets/javascripts/supplier/app/components/form/file-upload.js.coffee +++ b/app/assets/javascripts/supplier/app/components/form/file-upload.js.coffee @@ -4,9 +4,9 @@ App.FormFileUploadComponent = Ember.TextField.extend type: 'file' file: null, change: (e)-> - reader = new FileReader() - that = this - reader.onload = (el)-> - fileToUpload = el.target.result - Ember.run -> that.set('file', fileToUpload) - reader.readAsDataURL(e.target.files[0]) + reader = new FileReader() + that = this + reader.onload = (el)-> + fileToUpload = el.target.result + Ember.run -> that.set('file', fileToUpload) + reader.readAsDataURL(e.target.files[0]) From 46c6f90df2b6a47601a8ce33e264f85d05c60fa7 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Thu, 12 Jan 2017 11:15:01 +0100 Subject: [PATCH 5/6] update oauth --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index dad249f2..d78c522e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -214,7 +214,7 @@ GEM factory_girl_rails (4.7.0) factory_girl (~> 4.7.0) railties (>= 3.0.0) - faraday (0.9.2) + faraday (0.10.1) multipart-post (>= 1.2, < 3) faye (1.2.3) cookiejar (>= 0.3.0) @@ -281,7 +281,7 @@ GEM mini_portile2 (2.1.0) minitest (5.9.1) multi_json (1.12.1) - multi_xml (0.5.5) + multi_xml (0.6.0) multipart-post (2.0.0) naught (1.1.0) net-scp (1.2.1) @@ -289,8 +289,8 @@ GEM net-ssh (3.2.0) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - oauth2 (1.2.0) - faraday (>= 0.8, < 0.10) + oauth2 (1.3.0) + faraday (>= 0.8, < 0.11) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) From 22675eb813795f4ea4968a2d8c7188e426e285a6 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Thu, 12 Jan 2017 11:31:09 +0100 Subject: [PATCH 6/6] fix user redirection issue --- app/controllers/user_controller.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 5d9c8bb4..c42f03a5 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -13,7 +13,14 @@ class UserController < Users::ApplicationController end def obtain_token - redirect_to user_omniauth_authorize_path(params[:provider].presence || 'facebook') and return unless current_user.present? + if current_user.blank? + case params[:provider] + when 'instagram' then redirect_to user_instagram_omniauth_authorize_path + else redirect_to user_facebook_omniauth_authorize_path + end + return + end + #redirect_to user_omniauth_authorize_path(params[:provider].presence || 'facebook') and return unless current_user.present? respond_to do |format| format.html { render layout: 'user/obtain_token' } format.json do