Skip to content

Commit

Permalink
Update gem versions
Browse files Browse the repository at this point in the history
  • Loading branch information
grant-olson committed Nov 23, 2013
1 parent 3c6a3d4 commit 21c988b
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 42 deletions.
4 changes: 2 additions & 2 deletions Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
ruby "1.9.3"
ruby "2.0.0"

gem 'rails', '~> 3.2.13'
gem 'rails', '~> 3.2.15'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
Expand Down
79 changes: 39 additions & 40 deletions Gemfile.lock
@@ -1,34 +1,34 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.13)
actionpack (= 3.2.13)
mail (~> 2.5.3)
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
actionmailer (3.2.15)
actionpack (= 3.2.15)
mail (~> 2.5.4)
actionpack (3.2.15)
activemodel (= 3.2.15)
activesupport (= 3.2.15)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.13)
activesupport (= 3.2.13)
activemodel (3.2.15)
activesupport (= 3.2.15)
builder (~> 3.0.0)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activerecord (3.2.15)
activemodel (= 3.2.15)
activesupport (= 3.2.15)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activesupport (3.2.13)
i18n (= 0.6.1)
activeresource (3.2.15)
activemodel (= 3.2.15)
activesupport (= 3.2.15)
activesupport (3.2.15)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
arel (3.0.2)
arel (3.0.3)
bcrypt-ruby (3.0.1)
bloggy (0.2.1)
jekyll
Expand Down Expand Up @@ -58,8 +58,8 @@ GEM
multi_json (~> 1.0)
fast-stemmer (1.0.2)
haml (3.1.7)
hike (1.2.1)
i18n (0.6.1)
hike (1.2.3)
i18n (0.6.5)
jekyll (0.12.1)
classifier (~> 1.3)
directory_watcher (~> 1.1)
Expand All @@ -71,18 +71,17 @@ GEM
jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.7)
json (1.8.1)
kramdown (0.14.2)
libv8 (3.11.8.17)
liquid (2.4.1)
mail (2.5.3)
i18n (>= 0.4.0)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
maruku (0.6.1)
syntax (>= 1.0.0)
mime-types (1.21)
multi_json (1.7.1)
mime-types (1.25)
multi_json (1.8.2)
orm_adapter (0.4.0)
pg (0.14.1)
polyglot (0.3.3)
Expand All @@ -99,22 +98,22 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.13)
actionmailer (= 3.2.13)
actionpack (= 3.2.13)
activerecord (= 3.2.13)
activeresource (= 3.2.13)
activesupport (= 3.2.13)
rails (3.2.15)
actionmailer (= 3.2.15)
actionpack (= 3.2.15)
activerecord (= 3.2.15)
activeresource (= 3.2.15)
activesupport (= 3.2.15)
bundler (~> 1.0)
railties (= 3.2.13)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
railties (= 3.2.15)
railties (3.2.15)
actionpack (= 3.2.15)
activesupport (= 3.2.15)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rake (10.1.0)
rdiscount (2.0.7)
rdoc (3.12.2)
json (~> 1.4)
Expand All @@ -137,12 +136,12 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.17.0)
tilt (1.3.6)
treetop (1.4.12)
thor (0.18.1)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
tzinfo (0.3.38)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand All @@ -160,7 +159,7 @@ DEPENDENCIES
haml (~> 3.1.7)
jquery-rails
pg (~> 0.14.1)
rails (~> 3.2.13)
rails (~> 3.2.15)
sass-rails (~> 3.2.3)
therubyracer
thin (~> 1.5.0)
Expand Down

0 comments on commit 21c988b

Please sign in to comment.