Skip to content

Commit

Permalink
Upgrade ruby, rails, and CMS
Browse files Browse the repository at this point in the history
I had to make a lot of changes to deal with the CMS upgrade I'm
afraid.  Also removed some spurious/unwanted/breaking tests that Rails
had helpfully autogenerated for us.
  • Loading branch information
Skud committed Nov 7, 2014
1 parent e7e28a4 commit 6a39be9
Show file tree
Hide file tree
Showing 24 changed files with 336 additions and 389 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
2.1.2
9 changes: 4 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
source 'https://rubygems.org'
ruby '2.0.0'
gem 'rails', '4.0.0'
gem 'sass-rails', '~> 4.0.0'
ruby '2.1.2'
gem 'rails', '4.1.7'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'jquery-rails'
gem 'turbolinks'
gem 'jbuilder', '~> 1.2'
Expand Down Expand Up @@ -31,7 +29,8 @@ gem 'bluecloth' # markdown formatting
# more info.
gem 'non-stupid-digest-assets'

gem 'comfortable_mexican_sofa', '~> 1.9.0'
# CMS
gem 'comfortable_mexican_sofa', '~> 1.12.0'

group :travis, :staging, :production do
gem 'pg'
Expand Down
Loading

0 comments on commit 6a39be9

Please sign in to comment.