From eaada9d7066a20b5af815f723e09cde60a5c8c10 Mon Sep 17 00:00:00 2001 From: Mario de la Ossa Date: Fri, 2 Feb 2018 18:39:55 +0000 Subject: use Gitlab::UserSettings directly as a singleton instead of including/extending it --- spec/models/note_spec.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'spec/models/note_spec.rb') diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 3d030927036..00dda7c9c60 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -17,8 +17,6 @@ describe Note do it { is_expected.to include_module(Participable) } it { is_expected.to include_module(Mentionable) } it { is_expected.to include_module(Awardable) } - - it { is_expected.to include_module(Gitlab::CurrentSettings) } end describe 'validation' do -- cgit v1.2.1 From d07addbf6e3841ae31a7e62ecbb29523f4d8c859 Mon Sep 17 00:00:00 2001 From: Andreas Brandl Date: Mon, 5 Feb 2018 12:26:33 +0100 Subject: Add foreign keys to todos table. Fixes #32282. --- spec/models/note_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/models/note_spec.rb') diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 00dda7c9c60..c853f707e6d 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -8,7 +8,7 @@ describe Note do it { is_expected.to belong_to(:noteable).touch(false) } it { is_expected.to belong_to(:author).class_name('User') } - it { is_expected.to have_many(:todos).dependent(:destroy) } + it { is_expected.to have_many(:todos) } end describe 'modules' do -- cgit v1.2.1