Skip to content

Rails 4! Ruby 2.0! #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Rails 4! Ruby 2.0! #56

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1005a62
Migrate to Rails 4 and Ruby 2.0
arbales Mar 8, 2013
133f233
Use version-manager agnostic .ruby-version filename.
arbales Mar 8, 2013
ac5b3a7
Add Rails 4 provided initializers, and fixes per @nixme
arbales Mar 8, 2013
eaad1be
Update Jazz Hands for Rails 4
arbales Mar 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .rbenv-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.9.3-p194
2.0.0-p0
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename this file to .ruby-version

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

23 changes: 16 additions & 7 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
source 'http://rubygems.org'

gem 'rails', '3.2.8'
gem 'rails', github: 'rails/rails'
gem 'sass-rails', github: 'rails/sass-rails'

# TODO: Migrate to new mass-assignment approach
gem 'protected_attributes'

# Datastore adapters
gem 'pg' # PostgreSQL adapter
Expand All @@ -15,7 +19,7 @@ gem 'pandora_client' # Pandora Tuner API client
gem 'rdio-ruby', git: 'https://github.com/nixme/rdio-ruby.git'

# Full-text search
gem 'tire' # ElasticSearch adapter
gem 'tire', github: 'karmi/tire' # ElasticSearch adapter

# Async processing
gem 'sidekiq' # Threaded, Resque-compatible task queues
Expand All @@ -27,21 +31,26 @@ gem 'omniauth-facebook'
gem 'omniauth-rdio'

# Front-end asset helpers
gem 'haml', '3.2.0.beta.3' # HTML pre-processor
gem 'sass'
gem "haml", :github => "haml/haml", :branch => "stable"
gem 'sass-rails', github: 'rails/sass-rails'

# Front-end asset helpers not loaded in production
group :assets do
gem 'bourbon'
gem 'animation', '~> 0.1.alpha.3' # [TEMP] Sass CSS3 animation helpers. Remove after Compass 0.13 upgrade
gem 'sass-rails' # CSS pre-processor
gem 'compass-rails' # CSS helpers and mixins
gem 'coffee-rails' # CoffeeScript compiling
gem 'uglifier' # JavaScript minifer

gem 'sprockets-rails', github: 'rails/sprockets-rails'
gem 'coffee-rails', github: 'rails/coffee-rails'

# Vendor JavaScript libraries
gem 'jquery-rails'
gem 'rails-behaviors'
gem 'rails-backbone'
gem 'swfobject-rails'

# This fork adds supports for Rails 4
gem 'swfobject-rails', github: 'geraudmathe/swfobject-rails'
end

# Push server gems. Not loaded by main Rails app.
Expand Down
Loading