Skip to content
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 @@ -4,7 +4,7 @@ source "http://rubygems.org"
gem "rails", "2.3.18"
gem 'will_paginate', "2.3.11"
#gem 'will_paginate', :require=>'will_paginate/data_mapper'
gem 'haml', "3.0.18"
gem 'haml', "5.0.0"
gem "jrails"
gem "mysql"
gem "riddle"
Expand Down
8 changes: 6 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ GEM
ar-extensions (0.9.5)
activerecord (~> 2.1)
fastercsv (1.5.5)
haml (3.0.18)
haml (5.0.0)
temple (>= 0.8.0)
tilt
jrails (0.6.0)
json (1.8.1)
mysql (2.9.1)
Expand All @@ -35,10 +37,12 @@ GEM
rdoc (4.0.1)
json (~> 1.4)
riddle (1.5.9)
temple (0.8.2)
thinking-sphinx (1.4.14)
activerecord (>= 1.15.6, < 3.0.0)
after_commit (>= 1.0.7)
riddle (>= 1.5.3)
tilt (2.0.10)
will_paginate (2.3.11)
wirble (0.1.3)

Expand All @@ -49,7 +53,7 @@ DEPENDENCIES
annotate
ar-extensions
fastercsv
haml (= 3.0.18)
haml (= 5.0.0)
jrails
mysql
rails (= 2.3.18)
Expand Down