Commit 93e161a1 authored by Andreas Brandl's avatar Andreas Brandl

Deprecate InternalId concern and rename.

parent fbfc6c0b
module InternalId module NonatomicInternalId
extend ActiveSupport::Concern extend ActiveSupport::Concern
included do included do
......
class Deployment < ActiveRecord::Base class Deployment < ActiveRecord::Base
include InternalId include NonatomicInternalId
belongs_to :project, required: true belongs_to :project, required: true
belongs_to :environment, required: true belongs_to :environment, required: true
......
...@@ -4,7 +4,7 @@ class Issue < ActiveRecord::Base ...@@ -4,7 +4,7 @@ class Issue < ActiveRecord::Base
prepend EE::Issue prepend EE::Issue
prepend EE::RelativePositioning prepend EE::RelativePositioning
include InternalId include NonatomicInternalId
include Issuable include Issuable
include Noteable include Noteable
include Referable include Referable
......
class MergeRequest < ActiveRecord::Base class MergeRequest < ActiveRecord::Base
include InternalId include NonatomicInternalId
include Issuable include Issuable
include Noteable include Noteable
include Referable include Referable
......
...@@ -8,7 +8,7 @@ class Milestone < ActiveRecord::Base ...@@ -8,7 +8,7 @@ class Milestone < ActiveRecord::Base
Started = MilestoneStruct.new('Started', '#started', -3) Started = MilestoneStruct.new('Started', '#started', -3)
include CacheMarkdownField include CacheMarkdownField
include InternalId include NonatomicInternalId
include Sortable include Sortable
include Referable include Referable
include StripAttribute include StripAttribute
......
...@@ -17,7 +17,7 @@ describe MergeRequest do ...@@ -17,7 +17,7 @@ describe MergeRequest do
describe 'modules' do describe 'modules' do
subject { described_class } subject { described_class }
it { is_expected.to include_module(InternalId) } it { is_expected.to include_module(NonatomicInternalId) }
it { is_expected.to include_module(Issuable) } it { is_expected.to include_module(Issuable) }
it { is_expected.to include_module(Referable) } it { is_expected.to include_module(Referable) }
it { is_expected.to include_module(Sortable) } it { is_expected.to include_module(Sortable) }
......
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