Merge pull request #3 from beatriceo/action-cable

Action cable
This commit is contained in:
Beatrice Olivera 2018-08-28 10:57:24 +01:00 committed by GitHub
commit 62aba9332c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions

View File

@ -7,7 +7,7 @@ gem 'jbuilder', '~> 2.0'
gem 'pg', '~> 0.21' gem 'pg', '~> 0.21'
gem 'puma' gem 'puma'
gem 'rails', '5.2.1' gem 'rails', '5.2.1'
gem 'redis' gem 'redis', '~> 3.0'
gem 'autoprefixer-rails' gem 'autoprefixer-rails'
gem 'bootstrap-sass', '~> 3.3' gem 'bootstrap-sass', '~> 3.3'

View File

@ -143,7 +143,7 @@ GEM
rb-fsevent (0.10.3) rb-fsevent (0.10.3)
rb-inotify (0.9.10) rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2) ffi (>= 0.5.0, < 2)
redis (4.0.2) redis (3.3.5)
responders (2.4.0) responders (2.4.0)
actionpack (>= 4.2.0, < 5.3) actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3)
@ -215,7 +215,7 @@ DEPENDENCIES
pry-rails pry-rails
puma puma
rails (= 5.2.1) rails (= 5.2.1)
redis redis (~> 3.0)
sass-rails sass-rails
simple_form simple_form
spring spring

View File

@ -6,5 +6,5 @@ test:
production: production:
adapter: redis adapter: redis
url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> url: ${REDISTOGO_URL}
channel_prefix: polyglot_production channel_prefix: polyglot_production

View File

@ -46,8 +46,8 @@ Rails.application.configure do
# Mount Action Cable outside main process or domain # Mount Action Cable outside main process or domain
# config.action_cable.mount_path = nil # config.action_cable.mount_path = nil
# config.action_cable.url = 'wss://example.com/cable' config.action_cable.url = 'wss://polyglot-173.herokuapp.com/cable'
# config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] config.action_cable.allowed_request_origins = [ '*' ]
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
# config.force_ssl = true # config.force_ssl = true
@ -94,4 +94,7 @@ Rails.application.configure do
# Do not dump schema after migrations. # Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false config.active_record.dump_schema_after_migration = false
# Backwards compatibility
config.assets.js_compressor = Uglifier.new(harmony: true)
end end