Skip to content

Commit

Permalink
Updated application to Rails 4.2
Browse files Browse the repository at this point in the history
Updated gems to Rails 4.2.0 compatibility

Fixed jq-tabs asset_path references

Updated tests to new naming conventions

Updated/added files for Rails 4.2

Updated app code for Rails 4.2
  • Loading branch information
emachnic committed Jan 9, 2015
1 parent cd5542f commit 271e647
Show file tree
Hide file tree
Showing 128 changed files with 424 additions and 372 deletions.
49 changes: 24 additions & 25 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,30 @@ end

source 'https://rubygems.org'

gem 'rails', '~> 3.2.12'
gem 'rails', '~> 4.2.0'

gem 'ey_config', '0.0.6'
gem 'jquery-rails', '~> 3.0'
gem 'rails_autolink', '~> 1.1'
gem 'simple_form', '~> 2.1'
gem 'ey_config'
gem 'rails_autolink'
gem 'simple_form'

group :assets do
gem 'sass-rails', '~> 3.2'
gem 'coffee-rails', '~> 3.2'
gem 'uglifier', '~> 2.3'
end
# Assets
gem 'jquery-rails'
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'

platform :ruby do
gem 'mysql2', '~> 0.3'
gem 'pg', '~> 0.17'
gem 'sqlite3', '1.3.8' # 1.3.9 broken on rbx

gem 'newrelic_rpm', '~> 3.6'
gem 'unicorn', '~> 4.7'
gem 'puma', '~> 2.6'
gem 'json', '~> 1.8'
gem 'minitest', '~> 4.7'
gem 'psych', '~> 2.0'
gem 'racc', '~> 1.4'
gem 'mysql2'
gem 'pg'
gem 'sqlite3'

gem 'newrelic_rpm'
gem 'unicorn'
gem 'puma'
gem 'json'
gem 'minitest'
gem 'psych'
gem 'racc'
end

platforms :jruby do
Expand All @@ -42,13 +41,13 @@ platforms :jruby do
gem 'jdbc-sqlite3', :require => false
gem 'jdbc-postgres', :require => false

gem 'jruby-openssl', '~> 0.9'
gem 'trinidad', '~> 1.4'
gem 'jruby-openssl'
gem 'trinidad'
end

platform :rbx do
gem 'rubysl', '~> 2.0'
gem 'rubysl-test-unit', '~> 2.0', :require => false
gem 'rubysl'
gem 'rubysl-test-unit', :require => false
end

# Bundle gems for the local environment. Make sure to
Expand Down
Loading

0 comments on commit 271e647

Please sign in to comment.