Merge pull request #926 from opf/dev

Merge rails version update to 3.2.17
pull/935/head
sschu 11 years ago
commit 798eacf00c
  1. 2
      Gemfile
  2. 50
      Gemfile.lock

@ -44,7 +44,7 @@ end
source 'https://rubygems.org'
gem "rails", "~> 3.2.16"
gem "rails", "~> 3.2.17"
gem "coderay", "~> 1.0.5"
gem "rubytree", "~> 0.8.3"

@ -15,12 +15,12 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.16)
actionpack (= 3.2.16)
actionmailer (3.2.17)
actionpack (= 3.2.17)
mail (~> 2.5.4)
actionpack (3.2.16)
activemodel (= 3.2.16)
activesupport (= 3.2.16)
actionpack (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@ -28,20 +28,20 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.16)
activesupport (= 3.2.16)
activemodel (3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
activerecord (3.2.16)
activemodel (= 3.2.16)
activesupport (= 3.2.16)
activerecord (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activerecord-tableless (1.3.3)
activerecord (>= 2.3.0)
activeresource (3.2.16)
activemodel (= 3.2.16)
activesupport (= 3.2.16)
activesupport (3.2.16)
activeresource (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
activesupport (3.2.17)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
acts_as_list (0.2.0)
@ -230,22 +230,22 @@ GEM
rack_session_access (0.1.1)
builder (>= 2.0.0)
rack (>= 1.0.0)
rails (3.2.16)
actionmailer (= 3.2.16)
actionpack (= 3.2.16)
activerecord (= 3.2.16)
activeresource (= 3.2.16)
activesupport (= 3.2.16)
rails (3.2.17)
actionmailer (= 3.2.17)
actionpack (= 3.2.17)
activerecord (= 3.2.17)
activeresource (= 3.2.17)
activesupport (= 3.2.17)
bundler (~> 1.0)
railties (= 3.2.16)
railties (= 3.2.17)
rails-dev-tweaks (0.6.1)
actionpack (~> 3.1)
railties (~> 3.1)
rails_autolink (1.1.0)
rails (> 3.1)
railties (3.2.16)
actionpack (= 3.2.16)
activesupport (= 3.2.16)
railties (3.2.17)
actionpack (= 3.2.17)
activesupport (= 3.2.17)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@ -402,7 +402,7 @@ DEPENDENCIES
rabl (= 0.9.3)
rack-protection
rack_session_access
rails (~> 3.2.16)
rails (~> 3.2.17)
rails-dev-tweaks (~> 0.6.1)
rails_autolink
rb-fsevent

Loading…
Cancel
Save