Skip to content

Commit

Permalink
bump rails and deps
Browse files Browse the repository at this point in the history
  • Loading branch information
Dennis Schubert committed Dec 11, 2014
1 parent 2f83378 commit 96ccc44
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '~> 4.1.1'
gem 'rails', '~> 4.1.8'

gem 'unicorn'

Expand Down
28 changes: 14 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ GEM
xpath (~> 2.0)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.4)
cocaine (0.5.5)
climate_control (>= 0.0.3, < 1.0)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
Expand All @@ -64,15 +64,15 @@ GEM
fuubar (2.0.0)
rspec (~> 3.0)
ruby-progressbar (~> 1.4)
haml (4.0.5)
haml (4.0.6)
tilt
hike (1.2.3)
http_accept_language (1.0.2)
i18n (0.6.11)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.2)
jquery-ui-rails (5.0.3)
railties (>= 3.2.16)
json (1.8.1)
kaminari (0.16.1)
Expand All @@ -87,10 +87,10 @@ GEM
multi_json (1.10.1)
mysql2 (0.3.17)
nested_form (0.3.2)
nokogiri (1.6.4.1)
nokogiri (1.6.5)
mini_portile (~> 0.6.0)
orm_adapter (0.5.0)
paperclip (4.2.0)
paperclip (4.2.1)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (~> 0.5.3)
Expand Down Expand Up @@ -134,8 +134,8 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
rake (10.3.2)
redcarpet (3.2.0)
rake (10.4.2)
redcarpet (3.2.1)
remotipart (1.2.1)
responders (1.1.2)
railties (>= 3.2, < 4.2)
Expand Down Expand Up @@ -164,28 +164,28 @@ GEM
ruby-progressbar (1.7.0)
safe_yaml (1.0.4)
sass (3.2.19)
sass-rails (4.0.4)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 2.12)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
sprockets (2.11.3)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.1)
sprockets-rails (2.2.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
turbolinks (2.5.2)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
uglifier (2.6.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.8.3)
Expand All @@ -209,7 +209,7 @@ DEPENDENCIES
jquery-rails
mysql2
paperclip (~> 4.1)
rails (~> 4.1.1)
rails (~> 4.1.8)
rails_admin
rails_locale_detection (~> 2.0.0.pre)
redcarpet (~> 3.2)
Expand Down

0 comments on commit 96ccc44

Please sign in to comment.