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 /app/models/user.rb | |
| 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 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 67fef1c1e6a..9ffadcf4468 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -54,6 +54,7 @@ # public_email :string(255) default(""), not null # dashboard :integer default(0) # project_view :integer default(0) +# consumed_timestep :integer # layout :integer default(0) # |