diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-01-26 17:55:33 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-02 11:25:44 -0200 |
| commit | e38a1fc83ee7a9fb04fe370204f0094723890f00 (patch) | |
| tree | 0543265d12156fde82c69446e847d61981b470ba | |
| parent | 80d0a2a6d8dccbb9888f9cd4dc3c3e7e208817e6 (diff) | |
| download | gitlab-ce-e38a1fc83ee7a9fb04fe370204f0094723890f00.tar.gz | |
Fix typo on User model
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | spec/models/user_spec.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 63c895683f7..234c1cd89f9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -138,7 +138,7 @@ class User < ActiveRecord::Base has_many :assigned_merge_requests, dependent: :destroy, foreign_key: :assignee_id, class_name: "MergeRequest" has_many :oauth_applications, class_name: 'Doorkeeper::Application', as: :owner, dependent: :destroy has_one :abuse_report, dependent: :destroy - has_many :spam_log, dependent: :destroy + has_many :spam_logs, dependent: :destroy has_many :builds, dependent: :nullify, class_name: 'Ci::Build' diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 0bef68e2885..cee051f5732 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -91,6 +91,7 @@ describe User, models: true do it { is_expected.to have_many(:assigned_merge_requests).dependent(:destroy) } it { is_expected.to have_many(:identities).dependent(:destroy) } it { is_expected.to have_one(:abuse_report) } + it { is_expected.to have_many(:spam_logs).dependent(:destroy) } end describe 'validations' do |