Permalink
Browse files

just getting set up on rails 1.9.2 (involved some other upgrades

  • Loading branch information...
1 parent 81e12cc commit dcb296dacd342c014e36aa3e977eb70f732fd8b6 @metasoarous committed Jul 10, 2011
Showing with 89 additions and 74 deletions.
  1. +6 −5 Gemfile
  2. +80 −68 Gemfile.lock
  3. +1 −1 config/boot.rb
  4. +2 −0 config/routes.rb
View
11 Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.0'
+gem 'rails', '3.0.8'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -29,18 +29,18 @@ gem 'sqlite3-ruby', :require => 'sqlite3'
# gem 'webrat'
# end
-gem "hamltastic"
-gem "RedCloth"
+
+gem "RedCloth", ">= 4.2.7"
gem "will_paginate"
gem "sass-on-heroku"
# gem "contentable"
gem "formtastic"
-gem "haml"
+gem "haml", ">= 3.1.2"
gem "simple_form"
-gem "ruby-debug"
gem "meta_where"
group :test, :development do
+ gem "hamltastic", :git => "https://metasoarous@github.com/metasoarous/hamltastic.git"
gem "pickle", ">= 0.4.0"
gem "factory_girl_rails", ">= 1.0.0"
gem "factory_girl_generator", ">= 0.0.1"
@@ -50,5 +50,6 @@ group :test, :development do
gem 'cucumber'
gem 'rspec-rails', ">= 2.0.0"
gem 'launchy'
+ gem "ruby-debug19"
end
View
@@ -1,36 +1,47 @@
+GIT
+ remote: https://metasoarous@github.com/metasoarous/hamltastic.git
+ revision: 57f0cd42e3c49539847e5c1f6cb9525dcf8f7700
+ specs:
+ hamltastic (0.3.1)
+ actionpack (>= 3.0.0)
+ activesupport (>= 3.0.0)
+ formtastic (>= 1.0.0)
+ haml (>= 3.0.18)
+ railties (>= 3.0.0)
+
GEM
remote: http://rubygems.org/
specs:
- RedCloth (4.2.3)
+ RedCloth (4.2.7)
abstract (1.0.0)
- actionmailer (3.0.0)
- actionpack (= 3.0.0)
- mail (~> 2.2.5)
- actionpack (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.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.4.1)
+ i18n (~> 0.5.0)
rack (~> 1.2.1)
- rack-mount (~> 0.6.12)
- rack-test (~> 0.5.4)
+ rack-mount (~> 0.6.14)
+ rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.0)
- activesupport (= 3.0.0)
+ activemodel (3.0.8)
+ activesupport (= 3.0.8)
builder (~> 2.1.2)
- i18n (~> 0.4.1)
- activerecord (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
- arel (~> 1.0.0)
+ 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.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
- activesupport (3.0.0)
- arel (1.0.1)
- activesupport (~> 3.0.0)
+ activeresource (3.0.8)
+ activemodel (= 3.0.8)
+ activesupport (= 3.0.8)
+ activesupport (3.0.8)
+ archive-tar-minitar (0.5.2)
+ arel (2.0.10)
builder (2.1.2)
capybara (0.4.0)
celerity (>= 0.7.9)
@@ -44,7 +55,7 @@ GEM
celerity (0.8.2)
childprocess (0.1.3)
ffi (~> 0.6.3)
- columnize (0.3.1)
+ columnize (0.3.4)
configuration (1.1.0)
cucumber (0.9.2)
builder (~> 2.1.2)
@@ -73,28 +84,24 @@ GEM
gherkin (2.2.9)
json (~> 1.4.6)
term-ansicolor (~> 1.0.5)
- haml (3.0.21)
- hamltastic (0.3.1)
- actionpack (>= 3.0.0)
- activesupport (>= 3.0.0)
- formtastic (>= 1.0.0)
- haml (>= 3.0.18)
- railties (>= 3.0.0)
- i18n (0.4.1)
+ haml (3.1.2)
+ i18n (0.5.0)
json (1.4.6)
json_pure (1.4.6)
launchy (0.3.7)
configuration (>= 0.0.5)
rake (>= 0.8.1)
- linecache (0.43)
- mail (2.2.7)
+ linecache19 (0.5.12)
+ ruby_core_source (>= 0.1.4)
+ mail (2.2.19)
activesupport (>= 2.3.6)
- mime-types
- treetop (>= 1.4.5)
- meta_where (0.9.6)
+ i18n (>= 0.4.0)
+ mime-types (~> 1.16)
+ treetop (~> 1.4.8)
+ meta_where (1.0.4)
activerecord (~> 3.0.0)
activesupport (~> 3.0.0)
- arel (~> 1.0.1)
+ arel (~> 2.0.7)
mime-types (1.16)
nokogiri (1.4.3.1)
pickle (0.4.2)
@@ -103,25 +110,25 @@ GEM
rspec (>= 1.3)
yard
polyglot (0.3.1)
- rack (1.2.1)
- rack-mount (0.6.13)
+ rack (1.2.3)
+ rack-mount (0.6.14)
rack (>= 1.0.0)
- rack-test (0.5.6)
+ rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.0)
- actionmailer (= 3.0.0)
- actionpack (= 3.0.0)
- activerecord (= 3.0.0)
- activeresource (= 3.0.0)
- activesupport (= 3.0.0)
- bundler (~> 1.0.0)
- railties (= 3.0.0)
- railties (3.0.0)
- actionpack (= 3.0.0)
- activesupport (= 3.0.0)
- rake (>= 0.8.4)
- thor (~> 0.14.0)
- rake (0.8.7)
+ 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 (0.9.2)
rspec (2.0.0)
rspec-core (= 2.0.0)
rspec-expectations (= 2.0.0)
@@ -134,11 +141,16 @@ GEM
rspec-expectations (= 2.0.0)
rspec-rails (2.0.1)
rspec (~> 2.0.0)
- ruby-debug (0.10.3)
- columnize (>= 0.1)
- ruby-debug-base (~> 0.10.3.0)
- ruby-debug-base (0.10.3)
- linecache (>= 0.3)
+ ruby-debug-base19 (0.11.25)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby_core_source (>= 0.1.4)
+ ruby-debug19 (0.11.6)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby-debug-base19 (>= 0.11.19)
+ ruby_core_source (0.1.5)
+ archive-tar-minitar (>= 0.5.2)
rubyzip (0.9.4)
sass-on-heroku (0.9.0)
selenium-webdriver (0.0.29)
@@ -149,10 +161,10 @@ GEM
simple_form (1.2.2)
sqlite3-ruby (1.3.1)
term-ansicolor (1.0.5)
- thor (0.14.3)
- treetop (1.4.8)
+ thor (0.14.6)
+ treetop (1.4.9)
polyglot (>= 0.3.1)
- tzinfo (0.3.23)
+ tzinfo (0.3.29)
will_paginate (2.3.15)
xpath (0.1.2)
nokogiri (~> 1.3)
@@ -162,22 +174,22 @@ PLATFORMS
ruby
DEPENDENCIES
- RedCloth
+ RedCloth (>= 4.2.7)
capybara (>= 0.4.0)
cucumber
cucumber-rails
database_cleaner
factory_girl_generator (>= 0.0.1)
factory_girl_rails (>= 1.0.0)
formtastic
- haml
- hamltastic
+ haml (>= 3.1.2)
+ hamltastic!
launchy
meta_where
pickle (>= 0.4.0)
- rails (= 3.0.0)
+ rails (= 3.0.8)
rspec-rails (>= 2.0.0)
- ruby-debug
+ ruby-debug19
sass-on-heroku
simple_form
sqlite3-ruby
View
@@ -1,6 +1,6 @@
require 'rubygems'
-require "lib/string_extensions"
+require './lib/string_extensions'
# Set up gems listed in the Gemfile.
gemfile = File.expand_path('../../Gemfile', __FILE__)
View
@@ -1,4 +1,6 @@
MembershipDatabase::Application.routes.draw do
+ get "sessions/toggle_membership_view"
+
resources :volunteer_categories
resources :renewals

0 comments on commit dcb296d

Please sign in to comment.