diff options
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 6 | ||||
| -rw-r--r-- | config/application.rb | 6 | ||||
| -rw-r--r-- | config/environments/production.rb | 7 |
5 files changed, 15 insertions, 11 deletions
@@ -1,4 +1,5 @@ source 'https://rubygems.org' +ruby '2.0.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index d093fa3..c501fd9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -126,6 +126,11 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.0.0) sprockets-rails (~> 2.0.0) + rails_12factor (0.0.2) + rails_serve_static_assets + rails_stdout_logging + rails_serve_static_assets (0.0.1) + rails_stdout_logging (0.0.1) railties (4.0.0) actionpack (= 4.0.0) activesupport (= 4.0.0) @@ -223,6 +228,7 @@ DEPENDENCIES jquery-rails pg rails (= 4.0.0) + rails_12factor rspec-fakes rspec-rails rvm-capistrano diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index eb6f552..836917b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,9 +7,9 @@ <meta name="description" content=""> <meta name="author" content=""> <%= favicon_link_tag 'favicon.ico' %> - <link rel="apple-touch-icon" href="touch-icon-iphone.png" /> - <link rel="apple-touch-icon" sizes="72x72" href="touch-icon-ipad.png" /> - <link rel="apple-touch-icon" sizes="114x114" href="touch-icon-iphone4.png" /> + <link rel="apple-touch-icon" href="/assets/touch-icon-iphone.png" /> + <link rel="apple-touch-icon" sizes="72x72" href="/assets/touch-icon-ipad.png" /> + <link rel="apple-touch-icon" sizes="114x114" href="/assets/touch-icon-iphone4.png" /> <%= stylesheet_link_tag "application", :media => "all" %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> diff --git a/config/application.rb b/config/application.rb index 881bd15..bb9d987 100644 --- a/config/application.rb +++ b/config/application.rb @@ -24,11 +24,5 @@ module Parley # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de - - # Enable the asset pipeline - config.assets.enabled = true - - # Disabled for heroku - config.assets.initialize_on_precompile = false end end diff --git a/config/environments/production.rb b/config/environments/production.rb index 3fa1b86..4d43431 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -20,14 +20,17 @@ Parley::Application.configure do # config.action_dispatch.rack_cache = true # Disable Rails's static asset server (Apache or nginx will already do this). - config.serve_static_assets = false + config.serve_static_assets = true + + # Enable the asset pipeline + config.assets.enabled = true # Compress JavaScripts and CSS. config.assets.js_compressor = :uglifier # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false + config.assets.compile = true # Generate digests for assets URLs. config.assets.digest = true |