Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/jgaskins/rstat.us in…
Browse files Browse the repository at this point in the history
…to development
  • Loading branch information
steveklabnik committed Sep 14, 2011
2 parents 57e345e + 256956e commit eaef855
Showing 5 changed files with 29 additions and 14 deletions.
12 changes: 7 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
source 'http://rubygems.org'

gem 'rails', '3.1.0'
gem 'sprockets', '2.0.0'

gem 'sqlite3'

gem 'backports', :platform => :rbx

# Asset template engines
gem 'sass'
gem 'sass-rails', '3.1.0'
gem 'compass', :git => "git://github.com/chriseppstein/compass.git", :branch => "rails31"
gem 'coffee-script'
gem 'uglifier'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', " ~> 3.1.0"
gem 'coffee-rails', "~> 3.1.0"
gem 'uglifier'
end

gem "haml-rails"
gem 'jquery-rails'
9 changes: 5 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -115,6 +115,9 @@ GEM
childprocess (0.2.1)
ffi (~> 1.0.6)
chunky_png (1.2.0)
coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
@@ -316,7 +319,7 @@ DEPENDENCIES
bcrypt-ruby
bson_ext
capybara
coffee-script
coffee-rails (~> 3.1.0)
compass!
database_cleaner
delayed_job!
@@ -345,11 +348,9 @@ DEPENDENCIES
rocco
rsa
ruby-stemmer
sass
sass-rails (= 3.1.0)
sass-rails (~> 3.1.0)
simplecov (~> 0.4.0)
sinatra
sprockets (= 2.0.0)
sqlite3
twitter
tzinfo
12 changes: 9 additions & 3 deletions config/application.rb
Original file line number Diff line number Diff line change
@@ -10,9 +10,12 @@
# We don't want test_unit or tasks like db:test:prepare, so we commented out
# require "rails/test_unit/railtie"

# If you have a Gemfile, require the gems listed there, including any gems
# you've limited to :test, :development, or :production.
Bundler.require(:default, Rails.env) if defined?(Bundler)
if defined?(Bundler)
# If you precompile assets before deploying to production, use this line
Bundler.require *Rails.groups(:assets => %w(development test))
# If you want your assets lazily compiled in production, use this line
# Bundler.require(:default, :assets, Rails.env)
end

module RstatUs
class Application < Rails::Application
@@ -47,6 +50,9 @@ class Application < Rails::Application
# Enable the asset pipeline
config.assets.enabled = true

# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'

config.generators do |g|
g.template_engine :haml
g.test_framework :mini_test, :spec => true
3 changes: 3 additions & 0 deletions config/environments/development.rb
Original file line number Diff line number Diff line change
@@ -24,4 +24,7 @@

# Do not compress assets
config.assets.compress = false

# Expands the lines which load the assets
config.assets.debug = true
end
7 changes: 5 additions & 2 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
@@ -15,8 +15,11 @@
config.assets.compress = true
config.assets.digest = true

# Specify the default JavaScript compressor
config.assets.js_compressor = :uglifier
# 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

# Specifies the header that your server uses for sending files
# (comment out if your front-end server doesn't support this)

0 comments on commit eaef855

Please sign in to comment.