Deprecate InternalId concern and rename.
This commit is contained in:
parent
79aa003210
commit
a0abb90478
|
@ -1,4 +1,4 @@
|
||||||
module InternalId
|
module NonatomicInternalId
|
||||||
extend ActiveSupport::Concern
|
extend ActiveSupport::Concern
|
||||||
|
|
||||||
included do
|
included do
|
|
@ -1,5 +1,5 @@
|
||||||
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
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
require 'carrierwave/orm/activerecord'
|
require 'carrierwave/orm/activerecord'
|
||||||
|
|
||||||
class Issue < ActiveRecord::Base
|
class Issue < ActiveRecord::Base
|
||||||
include InternalId
|
include NonatomicInternalId
|
||||||
include Issuable
|
include Issuable
|
||||||
include Noteable
|
include Noteable
|
||||||
include Referable
|
include Referable
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
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
|
||||||
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
|
||||||
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) }
|
||||||
|
|
Loading…
Reference in New Issue