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.

Sign up for GitHub

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 2.3.15 to 3.0.8 #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump rails from 2.3.15 to 3.0.8 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source :rubygems
gem 'rails', '2.3.15' # or should it be 2.3.16?
gem 'rails', '3.0.8' # or should it be 2.3.16?
gem 'fastercsv', '1.5.5'
gem 'GeoRuby', '1.3.3' # not sure if we need this. it was in vendor/gems but comment out in environment.rb
gem 'spatial_adapter', '1.3.1'
Expand Down
85 changes: 64 additions & 21 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,55 @@ GEM
remote: http://rubygems.org/
specs:
GeoRuby (1.3.3)
actionmailer (2.3.15)
actionpack (= 2.3.15)
actionpack (2.3.15)
activesupport (= 2.3.15)
rack (~> 1.1.3)
activerecord (2.3.15)
activesupport (= 2.3.15)
activeresource (2.3.15)
activesupport (= 2.3.15)
activesupport (2.3.15)
abstract (1.0.0)
actionmailer (3.0.8)
actionpack (= 3.0.8)
mail (~> 2.2.19)
actionpack (3.0.8)
activemodel (= 3.0.8)
activesupport (= 3.0.8)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.1)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activemodel (3.0.8)
activesupport (= 3.0.8)
builder (~> 2.1.2)
i18n (~> 0.5.0)
activerecord (3.0.8)
activemodel (= 3.0.8)
activesupport (= 3.0.8)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
activeresource (3.0.8)
activemodel (= 3.0.8)
activesupport (= 3.0.8)
activesupport (3.0.8)
arel (2.0.10)
builder (2.1.2)
capistrano (2.14.2)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
daemon_controller (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
fastercsv (1.5.5)
fastthread (1.0.7)
highline (1.6.16)
i18n (0.5.4)
json (1.7.7)
mail (2.2.20)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
net-scp (1.1.0)
net-ssh (>= 2.6.5)
net-sftp (2.1.1)
Expand All @@ -35,16 +63,27 @@ GEM
fastthread (>= 1.0.1)
rack
rake (>= 0.8.1)
polyglot (0.3.5)
postgres (0.7.9.2008.01.28)
rack (1.1.6)
rails (2.3.15)
actionmailer (= 2.3.15)
actionpack (= 2.3.15)
activerecord (= 2.3.15)
activeresource (= 2.3.15)
activesupport (= 2.3.15)
rake (>= 0.8.3)
rake (10.0.3)
rack (1.2.8)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
rails (3.0.8)
actionmailer (= 3.0.8)
actionpack (= 3.0.8)
activerecord (= 3.0.8)
activeresource (= 3.0.8)
activesupport (= 3.0.8)
bundler (~> 1.0)
railties (= 3.0.8)
railties (3.0.8)
actionpack (= 3.0.8)
activesupport (= 3.0.8)
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (13.0.6)
rdoc (4.0.0)
json (~> 1.4)
rspec (1.3.1)
Expand All @@ -54,7 +93,11 @@ GEM
spatial_adapter (1.3.1)
GeoRuby (>= 1.3.0)
activerecord (>= 2.2.2, < 3.1.0)
activerecord (>= 2.2.2, < 3.1.0)
thor (0.14.6)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.60)

PLATFORMS
ruby
Expand All @@ -65,7 +108,7 @@ DEPENDENCIES
fastercsv (= 1.5.5)
passenger (= 3.0.19)
postgres (= 0.7.9.2008.01.28)
rails (= 2.3.15)
rails (= 3.0.8)
rdoc
rspec (= 1.3.1)
rspec-rails (= 1.3.3)
Expand Down