From d660624740ab30042e24d53d5dbae3fde68bd873 Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Tue, 24 Apr 2018 09:41:53 -0500 Subject: [PATCH] Rails 5.1 --- Gemfile | 4 +- Gemfile.lock | 134 +++++++++++++++++++++--------------------- config/application.rb | 2 +- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/Gemfile b/Gemfile index 906d29d4c..e2c610395 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '5.0.0.1' +gem 'rails', '5.1' gem 'sass' @@ -13,7 +13,7 @@ gem 'uglifier' gem 'rack-cors', :require => 'rack/cors' -gem 'dotenv-rails', '~> 2.1.1' +gem 'dotenv-rails' gem 'bower-rails', '~> 0.10.0' diff --git a/Gemfile.lock b/Gemfile.lock index d70ec701e..646ddf9df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,52 +1,52 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.0.0.1) - actionpack (= 5.0.0.1) - nio4r (~> 1.2) + actioncable (5.1.0) + actionpack (= 5.1.0) + nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.0.1) - actionpack (= 5.0.0.1) - actionview (= 5.0.0.1) - activejob (= 5.0.0.1) + actionmailer (5.1.0) + actionpack (= 5.1.0) + actionview (= 5.1.0) + activejob (= 5.1.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.0.1) - actionview (= 5.0.0.1) - activesupport (= 5.0.0.1) + actionpack (5.1.0) + actionview (= 5.1.0) + activesupport (= 5.1.0) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.1) - activesupport (= 5.0.0.1) + actionview (5.1.0) + activesupport (= 5.1.0) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0.1) - activesupport (= 5.0.0.1) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.0) + activesupport (= 5.1.0) globalid (>= 0.3.6) - activemodel (5.0.0.1) - activesupport (= 5.0.0.1) - activerecord (5.0.0.1) - activemodel (= 5.0.0.1) - activesupport (= 5.0.0.1) - arel (~> 7.0) - activesupport (5.0.0.1) + activemodel (5.1.0) + activesupport (= 5.1.0) + activerecord (5.1.0) + activemodel (= 5.1.0) + activesupport (= 5.1.0) + arel (~> 8.0) + activesupport (5.1.0) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) airbrussh (1.3.0) sshkit (>= 1.6.1, != 1.7.0) - arel (7.1.4) + arel (8.0.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) bower-rails (0.10.0) builder (3.2.3) - byebug (10.0.0) - capistrano (3.10.1) + byebug (10.0.2) + capistrano (3.10.2) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -64,29 +64,29 @@ GEM capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capistrano-sidekiq (1.0.0) + capistrano-sidekiq (1.0.2) capistrano (>= 3.9.0) sidekiq (>= 3.4) concurrent-ruby (1.0.5) connection_pool (2.2.1) - crass (1.0.3) + crass (1.0.4) debug_inspector (0.0.3) - dotenv (2.1.2) - dotenv-rails (2.1.2) - dotenv (= 2.1.2) - railties (>= 3.2, < 5.1) - erubis (2.7.0) + dotenv (2.4.0) + dotenv-rails (2.4.0) + dotenv (= 2.4.0) + railties (>= 3.2, < 6.0) + erubi (1.7.1) execjs (2.7.0) - ffi (1.9.18) + ffi (1.9.23) globalid (0.4.1) activesupport (>= 4.2.0) haml (5.0.4) temple (>= 0.8.0) tilt - i18n (0.9.3) + i18n (0.9.5) concurrent-ruby (~> 1.0) json (1.8.6) - loofah (2.1.1) + loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -98,43 +98,43 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (4.2.0) - nio4r (1.2.1) + nio4r (2.3.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) non-stupid-digest-assets (1.0.9) sprockets (>= 2.0) - puma (3.11.2) - rack (2.0.3) + puma (3.11.4) + rack (2.0.5) rack-cors (1.0.2) - rack-protection (2.0.0) + rack-protection (2.0.1) rack rack-test (0.6.3) rack (>= 1.0) - rails (5.0.0.1) - actioncable (= 5.0.0.1) - actionmailer (= 5.0.0.1) - actionpack (= 5.0.0.1) - actionview (= 5.0.0.1) - activejob (= 5.0.0.1) - activemodel (= 5.0.0.1) - activerecord (= 5.0.0.1) - activesupport (= 5.0.0.1) + rails (5.1.0) + actioncable (= 5.1.0) + actionmailer (= 5.1.0) + actionpack (= 5.1.0) + actionview (= 5.1.0) + activejob (= 5.1.0) + activemodel (= 5.1.0) + activerecord (= 5.1.0) + activesupport (= 5.1.0) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.1) + railties (= 5.1.0) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.0.0.1) - actionpack (= 5.0.0.1) - activesupport (= 5.0.0.1) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.1.0) + actionpack (= 5.1.0) + activesupport (= 5.1.0) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.0) - rb-fsevent (0.10.2) + rake (12.3.1) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rdoc (4.3.0) @@ -142,7 +142,7 @@ GEM responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) - sass (3.5.5) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -150,13 +150,13 @@ GEM sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - secure_headers (5.0.4) + secure_headers (5.0.5) useragent (>= 0.15.0) - sidekiq (5.0.5) + sidekiq (5.1.3) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) - redis (>= 3.3.4, < 5) + redis (>= 3.3.5, < 5) spring (2.0.2) activesupport (>= 4.2) sprockets (3.7.1) @@ -166,18 +166,18 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.15.1) + sshkit (1.16.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) temple (0.8.0) thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.5) + uglifier (4.1.10) execjs (>= 0.3.0, < 3) - useragent (0.16.9) + useragent (0.16.10) web-console (2.3.0) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) @@ -200,12 +200,12 @@ DEPENDENCIES capistrano-rails capistrano-rvm capistrano-sidekiq - dotenv-rails (~> 2.1.1) + dotenv-rails haml non-stupid-digest-assets puma rack-cors - rails (= 5.0.0.1) + rails (= 5.1) responders (~> 2.0) sass sdoc (~> 0.4.0) diff --git a/config/application.rb b/config/application.rb index 079f7d013..d1156765f 100644 --- a/config/application.rb +++ b/config/application.rb @@ -32,7 +32,7 @@ module Neeto # config.active_record.raise_in_transactional_callbacks = true # Cross-Origin Resource Sharing (CORS) for Rack compatible web applications. - config.middleware.insert_before 0, "Rack::Cors" do + config.middleware.insert_before 0, Rack::Cors do allow do origins '*' resource '*', :headers => :any, :methods => [:get, :post, :put, :patch, :delete, :options], :expose => ['Access-Token', 'Client', 'UID']