Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump rails from 3.2.2 to 3.2.17 #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source "http://rubygems.org"
# Example:
# gem "activesupport", ">= 2.3.5"

gem 'rails', "~> 3.2.2"
gem 'rails', "~> 3.2.17"
gem 'php_serialize'

# Add dependencies to develop your gem here.
Expand Down
108 changes: 55 additions & 53 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,35 +1,36 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.2)
actionpack (= 3.2.2)
mail (~> 2.4.0)
actionpack (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
actionmailer (3.2.17)
actionpack (= 3.2.17)
mail (~> 2.5.4)
actionpack (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.1)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
activemodel (3.2.2)
activesupport (= 3.2.2)
sprockets (~> 2.2.1)
activemodel (3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
activerecord (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
activerecord (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
activesupport (3.2.2)
i18n (~> 0.6)
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)
arel (3.0.2)
builder (3.0.0)
arel (3.0.3)
builder (3.0.4)
concurrent-ruby (1.1.5)
erubis (2.7.0)
factory_girl (2.0.2)
git (1.2.5)
Expand All @@ -38,61 +39,62 @@ GEM
guard-test (0.3.0)
guard (>= 0.2.2)
test-unit (~> 2.2)
hike (1.2.1)
i18n (0.6.0)
hike (1.2.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jeweler (1.6.4)
bundler (~> 1.0)
git (>= 1.2.5)
rake
journey (1.0.3)
json (1.6.5)
mail (2.4.1)
i18n (>= 0.4.0)
journey (1.0.4)
json (1.8.6)
mail (2.5.5)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
multi_json (1.1.0)
mime-types (1.25.1)
multi_json (1.14.1)
php_serialize (1.2)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.1)
polyglot (0.3.5)
rack (1.4.7)
rack-cache (1.9.0)
rack (>= 0.4)
rack-ssl (1.3.2)
rack-ssl (1.3.4)
rack
rack-test (0.6.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.2)
actionmailer (= 3.2.2)
actionpack (= 3.2.2)
activerecord (= 3.2.2)
activeresource (= 3.2.2)
activesupport (= 3.2.2)
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.2)
railties (3.2.2)
actionpack (= 3.2.2)
activesupport (= 3.2.2)
railties (= 3.2.17)
railties (3.2.17)
actionpack (= 3.2.17)
activesupport (= 3.2.17)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
rdoc (3.12)
thor (>= 0.14.6, < 2.0)
rake (13.0.0)
rdoc (3.12.2)
json (~> 1.4)
rr (1.0.3)
shoulda (2.11.3)
sprockets (2.1.2)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
test-unit (2.3.0)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.31)
tzinfo (0.3.55)

PLATFORMS
ruby
Expand All @@ -103,7 +105,7 @@ DEPENDENCIES
guard-test
jeweler (~> 1.6.4)
php_serialize
rails (~> 3.2.2)
rails (~> 3.2.17)
rr
shoulda
sqlite3
Expand Down