diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-07 18:22:32 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-07 18:22:32 +0000 |
| commit | 3c93e588e9a829bb805aab9ccafb94383f44ed57 (patch) | |
| tree | 4be926dba7feed1280e445e8a0317fe979c296b2 /app/models/merge_request.rb | |
| parent | aacda0823e1667ff633dda25fb52e28cfaa956f9 (diff) | |
| parent | 79c0e7212af0a6b0243bc0512a75eb936fb8d862 (diff) | |
| download | gitlab-ce-3c93e588e9a829bb805aab9ccafb94383f44ed57.tar.gz | |
Merge branch 'annotate-models-20160105' into 'master'
Annotate models
Time to refresh the comments via `annotate`.
See merge request !2311
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 30d0c2b5961..5723ff36e02 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -2,28 +2,28 @@ # # Table name: merge_requests # -# id :integer not null, primary key -# target_branch :string(255) not null -# source_branch :string(255) not null -# source_project_id :integer not null -# author_id :integer -# assignee_id :integer -# title :string(255) -# created_at :datetime -# updated_at :datetime -# milestone_id :integer -# state :string(255) -# merge_status :string(255) -# target_project_id :integer not null -# iid :integer -# description :text -# position :integer default(0) -# locked_at :datetime -# updated_by_id :integer -# merge_error :string(255) -# merge_params :text (serialized to hash) -# merge_when_build_succeeds :boolean default(false), not null -# merge_user_id :integer +# id :integer not null, primary key +# target_branch :string(255) not null +# source_branch :string(255) not null +# source_project_id :integer not null +# author_id :integer +# assignee_id :integer +# title :string(255) +# created_at :datetime +# updated_at :datetime +# milestone_id :integer +# state :string(255) +# merge_status :string(255) +# target_project_id :integer not null +# iid :integer +# description :text +# position :integer default(0) +# locked_at :datetime +# updated_by_id :integer +# merge_error :string(255) +# merge_params :text +# merge_when_build_succeeds :boolean default(FALSE), not null +# merge_user_id :integer # require Rails.root.join("app/models/commit") |