Skip to content

Commit

Permalink
upgrade rails to 4.1.8; remove version lock on sass-rails
Browse files Browse the repository at this point in the history
  • Loading branch information
andey committed Dec 27, 2014
1 parent ae42487 commit fc294d6
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 46 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ source 'https://rubygems.org'

ruby '2.1.5'

gem 'rails', '4.1.4'
gem 'rails', '4.1.8'
gem 'pg'
gem 'unicorn' # puma was leaking memory
gem 'jquery-rails'
gem 'sass-rails', '4.0.3'
gem 'sass-rails'
gem 'coffee-rails'
gem 'slim-rails'
gem 'slim', '2.0.2'
Expand Down
84 changes: 40 additions & 44 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.2.8)
actionmailer (4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
mail (~> 2.5.4)
actionpack (4.1.4)
actionview (= 4.1.4)
activesupport (= 4.1.4)
actionmailer (4.1.8)
actionpack (= 4.1.8)
actionview (= 4.1.8)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.8)
actionview (= 4.1.8)
activesupport (= 4.1.8)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.4)
activesupport (= 4.1.4)
actionview (4.1.8)
activesupport (= 4.1.8)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.4)
activesupport (= 4.1.4)
activemodel (4.1.8)
activesupport (= 4.1.8)
builder (~> 3.1)
activerecord (4.1.4)
activemodel (= 4.1.4)
activesupport (= 4.1.4)
activerecord (4.1.8)
activemodel (= 4.1.8)
activesupport (= 4.1.8)
arel (~> 5.0.0)
activesupport (4.1.4)
activesupport (4.1.8)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -66,8 +66,8 @@ GEM
bcrypt (3.1.9)
bootstrap-will_paginate (0.0.10)
will_paginate
bourbon (3.2.3)
sass (~> 3.2)
bourbon (4.0.2)
sass (~> 3.3)
thor
builder (3.2.2)
capybara (2.4.4)
Expand Down Expand Up @@ -218,12 +218,11 @@ GEM
activesupport (>= 3.0.0)
kgio (2.9.2)
libv8 (3.16.14.7)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mail (2.6.3)
mime-types (>= 1.16, < 3)
meta-tags (2.0.0)
actionpack (>= 3.0.0)
mime-types (1.25.1)
mime-types (2.4.3)
mini_portile (0.6.1)
minitest (5.5.0)
multi_json (1.10.1)
Expand All @@ -247,28 +246,27 @@ GEM
pg (0.17.1)
polyamorous (1.1.0)
activerecord (>= 3.0)
polyglot (0.3.5)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.4)
actionmailer (= 4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
activemodel (= 4.1.4)
activerecord (= 4.1.4)
activesupport (= 4.1.4)
rails (4.1.8)
actionmailer (= 4.1.8)
actionpack (= 4.1.8)
actionview (= 4.1.8)
activemodel (= 4.1.8)
activerecord (= 4.1.8)
activesupport (= 4.1.8)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.4)
railties (= 4.1.8)
sprockets-rails (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.3)
rails_stdout_logging (0.0.3)
railties (4.1.4)
actionpack (= 4.1.4)
activesupport (= 4.1.4)
railties (4.1.8)
actionpack (= 4.1.8)
activesupport (= 4.1.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
Expand Down Expand Up @@ -303,12 +301,13 @@ GEM
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
sass (3.2.19)
sass-rails (4.0.3)
sass (3.4.9)
sass-rails (5.0.0)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
simplecov (0.9.1)
docile (~> 1.1.0)
multi_json (~> 1.0)
Expand All @@ -324,7 +323,7 @@ GEM
activesupport (>= 3.0, < 4.2)
railties (>= 3.0, < 4.2)
slim (~> 2.0)
sprockets (2.11.0)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand All @@ -343,9 +342,6 @@ GEM
thread_safe (0.3.4)
tilt (1.4.1)
tins (1.3.3)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.6.0)
Expand Down Expand Up @@ -393,11 +389,11 @@ DEPENDENCIES
paper_trail (= 3.0.5)
paperclip (= 3.5.4)
pg
rails (= 4.1.4)
rails (= 4.1.8)
rails_12factor
rdoc
rspec-rails
sass-rails (= 4.0.3)
sass-rails
sitemap_generator
slim (= 2.0.2)
slim-rails
Expand Down

0 comments on commit fc294d6

Please sign in to comment.