Merge pull request #943 from sgmap/skylight

Skylight
This commit is contained in:
Mathieu Magnin 2017-11-16 18:18:14 +01:00 committed by GitHub
commit 8b80165872
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 0 deletions

View file

@ -90,6 +90,7 @@ gem 'browser'
gem 'simple_form' gem 'simple_form'
gem 'newrelic_rpm' gem 'newrelic_rpm'
gem 'skylight'
gem 'scenic' gem 'scenic'

View file

@ -581,6 +581,8 @@ GEM
rack (~> 2.0) rack (~> 2.0)
rack-protection (= 2.0.0) rack-protection (= 2.0.0)
tilt (~> 2.0) tilt (~> 2.0)
skylight (1.4.4)
activesupport (>= 3.0.0)
slop (3.6.0) slop (3.6.0)
smart_listing (1.2.0) smart_listing (1.2.0)
coffee-rails coffee-rails
@ -738,6 +740,7 @@ DEPENDENCIES
sentry-raven sentry-raven
shoulda-matchers shoulda-matchers
simple_form simple_form
skylight
smart_listing smart_listing
spreadsheet_architect spreadsheet_architect
spring spring

View file

@ -34,6 +34,8 @@ module TPS
URL = "http://localhost:3000/" URL = "http://localhost:3000/"
end end
config.skylight.environments += ["staging"]
config.active_job.queue_adapter = :delayed_job config.active_job.queue_adapter = :delayed_job
config.action_view.sanitized_allowed_tags = ActionView::Base.sanitized_allowed_tags + ['u'] config.action_view.sanitized_allowed_tags = ActionView::Base.sanitized_allowed_tags + ['u']

View file

@ -55,6 +55,7 @@ set :shared_paths, [
'public/uploads', 'public/uploads',
'config/database.yml', 'config/database.yml',
"config/newrelic.yml", "config/newrelic.yml",
"config/skylight.yml",
"config/fog_credentials.yml", "config/fog_credentials.yml",
'config/initializers/secret_token.rb', 'config/initializers/secret_token.rb',
'config/initializers/features.yml', 'config/initializers/features.yml',