Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

following guides + suggestions to upgrade from 3.0 to 3.1

  • Loading branch information...
commit ebda0d4ffa4528e89ed0b53e32d1ecc5647c1972 1 parent 639cc72
Dr Nic Williams drnic authored
10 Gemfile
View
@@ -3,14 +3,20 @@ source 'http://rubygems.org'
gem "rails", "~> 3.2.8"
gem 'simple_form'
-gem 'jquery-rails', '1.0.14'
+gem 'jquery-rails'
gem 'rails_autolink'
+group :assets do
+ gem 'sass-rails'
+ gem 'coffee-rails'
+ gem 'uglifier'
+end
+
platform :ruby do
gem 'pg'
gem 'sqlite3'
- gem 'mysql2', '~> 0.3.7'
+ gem 'mysql2'
gem 'unicorn'
end
28 Gemfile.lock
View
@@ -30,12 +30,21 @@ GEM
multi_json (~> 1.0)
arel (3.0.2)
builder (3.0.3)
+ coffee-rails (3.2.2)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.2.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.3.3)
erubis (2.7.0)
+ execjs (1.4.0)
+ multi_json (~> 1.0)
hike (1.2.1)
i18n (0.6.1)
journey (1.0.4)
- jquery-rails (1.0.14)
- railties (~> 3.0)
+ jquery-rails (2.1.2)
+ railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
kgio (2.7.4)
@@ -78,6 +87,11 @@ GEM
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
+ sass (3.2.1)
+ sass-rails (3.2.5)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
simple_form (2.0.2)
actionpack (~> 3.0)
activemodel (~> 3.0)
@@ -92,6 +106,9 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
+ uglifier (1.3.0)
+ execjs (>= 0.3.0)
+ multi_json (~> 1.0, >= 1.0.2)
unicorn (4.3.1)
kgio (~> 2.6)
rack
@@ -103,18 +120,21 @@ PLATFORMS
DEPENDENCIES
activerecord-jdbc-adapter
activerecord-jdbcpostgresql-adapter
+ coffee-rails
jdbc-mysql
jdbc-postgres
jdbc-sqlite3
- jquery-rails (= 1.0.14)
+ jquery-rails
jruby-openssl
- mysql2 (~> 0.3.7)
+ mysql2
pg
puma
rails (~> 3.2.8)
rails_autolink
+ sass-rails
simple_form
sqlite3
thor
trinidad
+ uglifier
unicorn
4 config/application.rb
View
@@ -38,5 +38,9 @@ class Application < Rails::Application
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password]
+
+ config.assets.enabled = true
+ config.assets.version = '1.0'
+
end
end
2  config/database.yml
View
@@ -1,6 +1,6 @@
# SQLite version 3.x
# gem install sqlite3
-test:
+development:
adapter: sqlite3
database: db/development.sqlite3
pool: 5
6 config/environments/development.rb
View
@@ -22,5 +22,11 @@
# Only use best-standards-support built into browsers
config.action_dispatch.best_standards_support = :builtin
+
+ # Do not compress assets
+ config.assets.compress = false
+
+ # Expands the lines which load the assets
+ config.assets.debug = true
end
18 config/environments/production.rb
View
@@ -46,4 +46,22 @@
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
+
+ # Compress JavaScripts and CSS
+ config.assets.compress = true
+
+ # Don't fallback to assets pipeline if a precompiled asset is missed
+ config.assets.compile = false
+
+ # Generate digests for assets URLs
+ config.assets.digest = true
+
+ # Defaults to Rails.root.join("public/assets")
+ # config.assets.manifest = YOUR_PATH
+
+ # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+ # config.assets.precompile += %w( search.js )
+
+ # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+ # config.force_ssl = true
end
4 config/environments/test.rb
View
@@ -32,4 +32,8 @@
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
+
+ # Configure static asset server for tests with Cache-Control for performance
+ config.serve_static_assets = true
+ config.static_cache_control = "public, max-age=3600"
end
2  config/initializers/session_store.rb
View
@@ -1,6 +1,6 @@
# Be sure to restart your server when you modify this file.
-Listr::Application.config.session_store :cookie_store, :key => '_listr_session'
+Listr::Application.config.session_store :cookie_store, :key => '_listr_session_rails32'
# Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information
Please sign in to comment.
Something went wrong with that request. Please try again.