diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-07-31 10:23:50 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-07-31 10:23:50 +0200 |
| commit | 95f9d6d83bcb7a9f45601f828c34301e536fc195 (patch) | |
| tree | ed5447c85eb35ac9b7a363dd5a83514578c2fb3e /spec/models/award_emoji_spec.rb | |
| parent | c92881c394a482bdb6d3f0f0a5f3cc95d5eed1fc (diff) | |
| parent | 6fe736f2c927340ed8cf827080db781f7c8adcdf (diff) | |
| download | gitlab-ce-95f9d6d83bcb7a9f45601f828c34301e536fc195.tar.gz | |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# app/controllers/concerns/notes_actions.rb
# spec/features/task_lists_spec.rb
# spec/support/features/issuable_slash_commands_shared_examples.rb
Diffstat (limited to 'spec/models/award_emoji_spec.rb')
| -rw-r--r-- | spec/models/award_emoji_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/award_emoji_spec.rb b/spec/models/award_emoji_spec.rb index 2925fc1271c..b909e04dfc3 100644 --- a/spec/models/award_emoji_spec.rb +++ b/spec/models/award_emoji_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe AwardEmoji, models: true do +describe AwardEmoji do describe 'Associations' do it { is_expected.to belong_to(:awardable) } it { is_expected.to belong_to(:user) } |