diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-12-09 06:25:12 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-12-09 06:25:12 +0000 |
| commit | ee0ab46d327e278af68cbda49e00cd5188c709f3 (patch) | |
| tree | e9d89056ffb396f06059097c05dbde97b1c53c23 /spec/models | |
| parent | cbb9da3d656482f5a6e046ec791d49390fc23fd7 (diff) | |
| parent | 9dbc768db8304004c08957710d423c0b2b54510a (diff) | |
| download | gitlab-ce-ee0ab46d327e278af68cbda49e00cd5188c709f3.tar.gz | |
Merge branch 'annotate-models' into 'master'
Update annotations
See merge request !2033
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/note_spec.rb | 1 | ||||
| -rw-r--r-- | spec/models/project_spec.rb | 1 | ||||
| -rw-r--r-- | spec/models/user_spec.rb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index f347f537550..e7e8887baf2 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -16,6 +16,7 @@ # system :boolean default(FALSE), not null # st_diff :text # updated_by_id :integer +# is_award :boolean default(FALSE), not null # require 'spec_helper' diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 06a02c13bf1..dc703d8095c 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -28,6 +28,7 @@ # import_type :string(255) # import_source :string(255) # commit_count :integer default(0) +# import_error :text # require 'spec_helper' diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index a0f78d3b336..1aad37fa02e 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -56,6 +56,7 @@ # project_view :integer default(0) # consumed_timestep :integer # layout :integer default(0) +# hide_project_limit :boolean default(FALSE) # require 'spec_helper' |