Skip to content

Commit

Permalink
Switching back to clever cloud
Browse files Browse the repository at this point in the history
  • Loading branch information
Francismb committed Nov 18, 2015
1 parent 8e3d929 commit 23288e6
Show file tree
Hide file tree
Showing 9 changed files with 1,293 additions and 13 deletions.
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,5 @@ end

# Production gems
group :production do
gem 'viaduct_rails_helpers' # Assists viaduct in serving assets
gem 'puma' # Use puma as the production rails web server
gem 'pg' # Postgresql as the production database
end
8 changes: 0 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ GEM
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
pg (0.18.3)
puma (2.13.4)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -80,8 +79,6 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.4)
railties (4.2.1)
actionpack (= 4.2.1)
activesupport (= 4.2.1)
Expand All @@ -99,20 +96,15 @@ GEM
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
viaduct_rails_helpers (1.0.0)
rails_serve_static_assets
rails_stdout_logging

PLATFORMS
ruby

DEPENDENCIES
jquery-rails
pg
puma
rails (= 4.2.1)
sqlite3
viaduct_rails_helpers

BUNDLED WITH
1.10.6
10 changes: 8 additions & 2 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ class Application < Rails::Application

# Do not swallow errors in after_commit/after_rollback callbacks.
config.active_record.raise_in_transactional_callbacks = true
config.assets.precompile += [/.*\.png/,/.*\.jpg/,/.*\.jpeg/,/.*\.gif/]
config.assets.precompile += [/.*\.js/, /.*\.css/]
config.assets.precompile += [
/.*\.js/,
/.*\.css/,
/.*\.png/,
/.*\.jpg/,
/.*\.jpeg/,
/.*\.gif/
]
end
end

Large diffs are not rendered by default.

Loading

0 comments on commit 23288e6

Please sign in to comment.