added haml generators and inherited resources

dominic · dominic · commit 09ea5951de3f · 2011-08-29T21:10:35.000-04:00
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '3.1.0.rc6'
 gem 'sqlite3'
 gem 'json'
 
-gem 'haml'
+gem 'haml-rails'
 gem 'jquery-rails'
 gem 'mongo_mapper'
 gem 'bson_ext'
@@ -21,6 +21,7 @@ gem 'jnunemaker-validatable', '>= 1.8.4' # Required by mm-devise
 gem 'devise',                 '>= 1.2'
 gem 'mm-devise',              '>= 1.2'
 
+gem 'inherited_resources'
 gem "semantic_menu", :git => "git://github.com/michaek/semantic_menu.git"
 
 # Use unicorn as the web server
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -80,8 +80,17 @@ GEM
     gherkin (2.4.16)
       json (>= 1.4.6)
     haml (3.1.2)
+    haml-rails (0.3.4)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      haml (~> 3.0)
+      railties (~> 3.0)
+    has_scope (0.5.1)
     hike (1.2.1)
     i18n (0.6.0)
+    inherited_resources (1.2.2)
+      has_scope (~> 0.5.0)
+      responders (~> 0.6.0)
     jnunemaker-validatable (1.8.4)
       activesupport (>= 2.3.4)
     jquery-rails (1.0.13)
@@ -137,6 +146,7 @@ GEM
     raindrops (0.7.0)
     rake (0.9.2)
     rdoc (3.9.4)
+    responders (0.6.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -194,7 +204,8 @@ DEPENDENCIES
   cucumber-rails
   devise (>= 1.2)
   fabrication
-  haml
+  haml-rails
+  inherited_resources
   jnunemaker-validatable (>= 1.8.4)
   jquery-rails
   json
