diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/note.rb | 2 | ||||
| -rw-r--r-- | app/models/todo.rb (renamed from app/models/task.rb) | 4 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 31606cf8222..d287e0f3c6d 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -37,7 +37,7 @@ class Note < ActiveRecord::Base belongs_to :author, class_name: "User" belongs_to :updated_by, class_name: "User" - has_many :tasks, dependent: :destroy + has_many :todos, dependent: :destroy delegate :name, to: :project, prefix: true delegate :name, :email, to: :author, prefix: true diff --git a/app/models/task.rb b/app/models/todo.rb index 0872743097c..7a9b0212f9f 100644 --- a/app/models/task.rb +++ b/app/models/todo.rb @@ -1,6 +1,6 @@ # == Schema Information # -# Table name: tasks +# Table name: todos # # id :integer not null, primary key # user_id :integer not null @@ -15,7 +15,7 @@ # updated_at :datetime # -class Task < ActiveRecord::Base +class Todo < ActiveRecord::Base ASSIGNED = 1 MENTIONED = 2 diff --git a/app/models/user.rb b/app/models/user.rb index d108ba78e4b..02ff2456f2b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -140,7 +140,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 :tasks, dependent: :destroy + has_many :todos, dependent: :destroy # # Validations |