diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2017-12-21 02:34:35 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-21 02:34:35 +0100 |
| commit | 8c449310e245083e72513ec3addd0d2355333127 (patch) | |
| tree | a9ca028f0f19cab55e9d3d8afeffd58cc85bf192 /spec/models/user_spec.rb | |
| parent | 52b4a74a73cbd0b13d46d0bcd9b063e36b520f05 (diff) | |
| parent | 5d8d72f18e9329978987fcb046467ceacd13c3ab (diff) | |
| download | gitlab-ce-refactor-cluster-show-page.tar.gz | |
Merge branch 'master' into refactor-cluster-show-pagerefactor-cluster-show-page
Diffstat (limited to 'spec/models/user_spec.rb')
| -rw-r--r-- | spec/models/user_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 4687d9dfa00..e58e7588df0 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -12,6 +12,7 @@ describe User do it { is_expected.to include_module(Referable) } it { is_expected.to include_module(Sortable) } it { is_expected.to include_module(TokenAuthenticatable) } + it { is_expected.to include_module(BlocksJsonSerialization) } end describe 'delegations' do |