nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix require problem with the acts_as_taggable patches

Browse source
This commit is contained in:
Sarah Mei 2011-11-05 22:38:14 -07:00
parent ac065e1706
commit c2893a2e3d
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/tags_controller.rb
View file

@ -1,7 +1,7 @@
# Copyright (c) 2010-2011, Diaspora Inc. This file is # Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See # licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file. # the COPYRIGHT file.
require File.join(Rails.root, 'app', 'models', 'acts_as_taggable_on_tag') require File.join(Rails.root, 'app', 'models', 'acts_as_taggable_on', 'tag')
require File.join(Rails.root, 'lib', 'stream', 'tag') require File.join(Rails.root, 'lib', 'stream', 'tag')
class TagsController < ApplicationController class TagsController < ApplicationController

0
app/models/acts_as_taggable_on_tag.rb → app/models/acts_as_taggable_on/tag.rb
View file

2
lib/diaspora/taggable.rb
View file

@ -2,6 +2,8 @@
# licensed under the Affero General Public License version 3 or later. See # licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file. # the COPYRIGHT file.
require File.join(Rails.root, "app", "models", "acts_as_taggable_on", "tag")
module Diaspora module Diaspora
module Taggable module Taggable
def self.included(model) def self.included(model)