diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-23 16:52:43 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-23 16:52:43 -0500 |
| commit | af978cd5bcf54bece70a8bf2634172bb8133cc67 (patch) | |
| tree | 0c2a1bca300acc5d1afd010815bafe02bd45e1d9 /app/models/user.rb | |
| parent | 0701b70c9c47e90a96100cefe5b93ec5954f9ec1 (diff) | |
| parent | 9f80118e05e68743d95a83742a1d0a06bba3039c (diff) | |
| download | gitlab-ce-af978cd5bcf54bece70a8bf2634172bb8133cc67.tar.gz | |
Merge branch 'master' into avatar-cropping
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index cd6e4332a76..f6e932ff73c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -143,7 +143,7 @@ class User < ActiveRecord::Base has_one :abuse_report, dependent: :destroy has_many :spam_logs, dependent: :destroy has_many :builds, dependent: :nullify, class_name: 'Ci::Build' - + has_many :todos, dependent: :destroy # # Validations |