diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-14 08:27:12 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-14 08:27:12 +0000 |
| commit | da8ca8b217d0c060ec509fd385842da29e4e4a86 (patch) | |
| tree | 4f73d3f6fcc05509392afa1e12e5bff64e899896 /spec/factories | |
| parent | eaf27c6295394562eb734d8a10918f9cac301dbd (diff) | |
| parent | a237999f000526b3db5b0b5a72a665adcff29522 (diff) | |
| download | gitlab-ce-da8ca8b217d0c060ec509fd385842da29e4e4a86.tar.gz | |
Merge branch 'annotate-models' into 'master'
Annotate models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1799
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/labels.rb | 1 | ||||
| -rw-r--r-- | spec/factories/merge_requests.rb | 1 | ||||
| -rw-r--r-- | spec/factories/releases.rb | 12 |
3 files changed, 14 insertions, 0 deletions
diff --git a/spec/factories/labels.rb b/spec/factories/labels.rb index 6829387c660..8b12ee11af5 100644 --- a/spec/factories/labels.rb +++ b/spec/factories/labels.rb @@ -8,6 +8,7 @@ # project_id :integer # created_at :datetime # updated_at :datetime +# template :boolean default(FALSE) # # Read about factories at https://github.com/thoughtbot/factory_girl diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index 6080d0ccdef..729a49c9f72 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -20,6 +20,7 @@ # position :integer default(0) # locked_at :datetime # updated_by_id :integer +# merge_error :string(255) # FactoryGirl.define do diff --git a/spec/factories/releases.rb b/spec/factories/releases.rb index 80d6bbee6c7..43d09b17534 100644 --- a/spec/factories/releases.rb +++ b/spec/factories/releases.rb @@ -1,3 +1,15 @@ +# == Schema Information +# +# Table name: releases +# +# id :integer not null, primary key +# tag :string(255) +# description :text +# project_id :integer +# created_at :datetime +# updated_at :datetime +# + # Read about factories at https://github.com/thoughtbot/factory_girl FactoryGirl.define do |