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
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so
*.pyc

# Logs and databases #
######################
*.log

# OS generated files #
######################
.DS_Store*
ehthumbs.db
Icon?
Thumbs.db
2 changes: 1 addition & 1 deletion datamapper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def self.source_root
protected

# Datamapper does not care if migrations have the same name as long as
# they have different ids.
# they have different ids.
#
def migration_exists?(dirname, file_name) #:nodoc:
false
Expand Down
2 changes: 1 addition & 1 deletion datamapper/migration/templates/migration.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
migration <%= migration_number.to_i %>, :<%= migration_file_name %> do
migration <%= migration_number.to_i %>, :<%= migration_file_name %> do
up do
<% unless attributes.empty? -%>
modify_table :<%= table_name %> do
Expand Down
2 changes: 1 addition & 1 deletion factory_girl/model/model_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module Generators
class ModelGenerator < Base
argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
class_option :dir, :type => :string, :default => "test/factories", :desc => "The directory where the factories should go"

def create_fixture_file
template 'fixtures.rb', File.join(options[:dir], "#{table_name}.rb")
end
Expand Down
2 changes: 1 addition & 1 deletion haml/scaffold/scaffold_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module Haml
module Generators
class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
extend TemplatePath

def copy_layout_file
return unless options[:layout]
template "layout.haml.erb",
Expand Down
2 changes: 1 addition & 1 deletion haml/scaffold/templates/layout.haml.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!!!
!!!
%html
%head
%title= "<%= controller_class_name %>:#{controller.action_name}"
Expand Down