diff options
Diffstat (limited to 'lib/puppet/rails')
| -rw-r--r-- | lib/puppet/rails/external/tagging/README (renamed from lib/puppet/rails/lib/README) | 0 | ||||
| -rw-r--r-- | lib/puppet/rails/external/tagging/acts_as_taggable.rb (renamed from lib/puppet/rails/lib/acts_as_taggable.rb) | 0 | ||||
| -rw-r--r-- | lib/puppet/rails/external/tagging/init.rb | 5 | ||||
| -rw-r--r-- | lib/puppet/rails/external/tagging/tag.rb (renamed from lib/puppet/rails/lib/tag.rb) | 0 | ||||
| -rw-r--r-- | lib/puppet/rails/external/tagging/tagging.rb (renamed from lib/puppet/rails/lib/tagging.rb) | 0 | ||||
| -rw-r--r-- | lib/puppet/rails/lib/init.rb | 5 | ||||
| -rw-r--r-- | lib/puppet/rails/resource.rb | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/lib/puppet/rails/lib/README b/lib/puppet/rails/external/tagging/README index 8d2f90822..8d2f90822 100644 --- a/lib/puppet/rails/lib/README +++ b/lib/puppet/rails/external/tagging/README diff --git a/lib/puppet/rails/lib/acts_as_taggable.rb b/lib/puppet/rails/external/tagging/acts_as_taggable.rb index 137a1c2a8..137a1c2a8 100644 --- a/lib/puppet/rails/lib/acts_as_taggable.rb +++ b/lib/puppet/rails/external/tagging/acts_as_taggable.rb diff --git a/lib/puppet/rails/external/tagging/init.rb b/lib/puppet/rails/external/tagging/init.rb new file mode 100644 index 000000000..5069d8040 --- /dev/null +++ b/lib/puppet/rails/external/tagging/init.rb @@ -0,0 +1,5 @@ +require 'puppet/rails/external/tagging/acts_as_taggable' +ActiveRecord::Base.send(:include, ActiveRecord::Acts::Taggable) + +require 'puppet/rails/external/tagging/tagging' +require 'puppet/rails/external/tagging/tag' diff --git a/lib/puppet/rails/lib/tag.rb b/lib/puppet/rails/external/tagging/tag.rb index 191abb08c..191abb08c 100644 --- a/lib/puppet/rails/lib/tag.rb +++ b/lib/puppet/rails/external/tagging/tag.rb diff --git a/lib/puppet/rails/lib/tagging.rb b/lib/puppet/rails/external/tagging/tagging.rb index e06e88a14..e06e88a14 100644 --- a/lib/puppet/rails/lib/tagging.rb +++ b/lib/puppet/rails/external/tagging/tagging.rb diff --git a/lib/puppet/rails/lib/init.rb b/lib/puppet/rails/lib/init.rb deleted file mode 100644 index 0a07e5c8e..000000000 --- a/lib/puppet/rails/lib/init.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'puppet/rails/lib/acts_as_taggable' -ActiveRecord::Base.send(:include, ActiveRecord::Acts::Taggable) - -require 'puppet/rails/lib/tagging' -require 'puppet/rails/lib/tag' diff --git a/lib/puppet/rails/resource.rb b/lib/puppet/rails/resource.rb index 43d7bbf4b..2608daef1 100644 --- a/lib/puppet/rails/resource.rb +++ b/lib/puppet/rails/resource.rb @@ -1,5 +1,5 @@ require 'puppet' -require 'puppet/rails/lib/init' +require 'puppet/rails/external/tagging/init' require 'puppet/rails/param_name' require 'puppet/util/rails/collection_merger' |