Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[merb-gen] Removed merb_orm :none from generated init.rb

[#1058 state:resolved]
  • Loading branch information...
commit b0bd28095274099f0caab548cd0e090a916219cb 1 parent 823e14f
@snusnu snusnu authored
View
3  merb-gen/lib/generators/templates/application/merb_core/config/init.rb
@@ -1,8 +1,7 @@
# Go to http://wiki.merbivore.com/pages/init-rb
# Specify your dependencies in the Gemfile
-
-<%= "# " unless orm != :none %> use_orm :<%= orm %>
+<%= "use_orm :#{orm}" unless orm == :none %>
use_test :<%= testing_framework %>
use_template_engine :<%= template_engine %>
View
2  merb-gen/lib/generators/templates/application/merb_flat/config/init.rb
@@ -1,6 +1,6 @@
# Go to http://wiki.merbivore.com/pages/init-rb
-<%= "# " unless orm != :none %> use_orm :<%= orm %>
+<%= "use_orm :#{orm}" unless orm == :none %>
use_test :<%= testing_framework %>
use_template_engine :<%= template_engine %>
Please sign in to comment.
Something went wrong with that request. Please try again.