Commit d6a5f930 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Fix module namespacing for mentionable concerns

This is needed when we switch to Zeitwerk. Module namespaces must
be consistent with the filesystem path.
parent b95a237b
...@@ -4,6 +4,7 @@ module Gitlab ...@@ -4,6 +4,7 @@ module Gitlab
module BackgroundMigration module BackgroundMigration
module UserMentions module UserMentions
module Models module Models
module Concerns
# == IsolatedMentionable concern # == IsolatedMentionable concern
# #
# Shortcutted for isolation version of Mentionable to be used in mentions migrations # Shortcutted for isolation version of Mentionable to be used in mentions migrations
...@@ -98,4 +99,5 @@ module Gitlab ...@@ -98,4 +99,5 @@ module Gitlab
end end
end end
end end
end
end end
...@@ -4,6 +4,7 @@ module Gitlab ...@@ -4,6 +4,7 @@ module Gitlab
module BackgroundMigration module BackgroundMigration
module UserMentions module UserMentions
module Models module Models
module Concerns
# Extract common no_quote_columns method used in determining the columns that do not need # Extract common no_quote_columns method used in determining the columns that do not need
# to be quoted for corresponding models # to be quoted for corresponding models
module MentionableMigrationMethods module MentionableMigrationMethods
...@@ -21,4 +22,5 @@ module Gitlab ...@@ -21,4 +22,5 @@ module Gitlab
end end
end end
end end
end
end end
...@@ -7,7 +7,7 @@ module Gitlab ...@@ -7,7 +7,7 @@ module Gitlab
module Models module Models
module DesignManagement module DesignManagement
class Design < ActiveRecord::Base class Design < ActiveRecord::Base
include MentionableMigrationMethods include Concerns::MentionableMigrationMethods
def self.user_mention_model def self.user_mention_model
Gitlab::BackgroundMigration::UserMentions::Models::DesignUserMention Gitlab::BackgroundMigration::UserMentions::Models::DesignUserMention
......
...@@ -6,9 +6,9 @@ module Gitlab ...@@ -6,9 +6,9 @@ module Gitlab
module UserMentions module UserMentions
module Models module Models
class Epic < ActiveRecord::Base class Epic < ActiveRecord::Base
include IsolatedMentionable include Concerns::IsolatedMentionable
include Concerns::MentionableMigrationMethods
include CacheMarkdownField include CacheMarkdownField
include MentionableMigrationMethods
attr_mentionable :title, pipeline: :single_line attr_mentionable :title, pipeline: :single_line
attr_mentionable :description attr_mentionable :description
......
...@@ -6,7 +6,7 @@ module Gitlab ...@@ -6,7 +6,7 @@ module Gitlab
module UserMentions module UserMentions
module Models module Models
class Note < ActiveRecord::Base class Note < ActiveRecord::Base
include IsolatedMentionable include Concerns::IsolatedMentionable
include CacheMarkdownField include CacheMarkdownField
self.table_name = 'notes' self.table_name = 'notes'
......
...@@ -6,9 +6,9 @@ module Gitlab ...@@ -6,9 +6,9 @@ module Gitlab
module UserMentions module UserMentions
module Models module Models
class Snippet < ActiveRecord::Base class Snippet < ActiveRecord::Base
include IsolatedMentionable include Concerns::IsolatedMentionable
include Concerns::MentionableMigrationMethods
include CacheMarkdownField include CacheMarkdownField
include MentionableMigrationMethods
attr_mentionable :title, pipeline: :single_line attr_mentionable :title, pipeline: :single_line
attr_mentionable :description attr_mentionable :description
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment