diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-02 12:53:08 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-02 12:53:08 -0700 |
| commit | b8433cb886abfdc7eae86c1789c0f1c5ff56204d (patch) | |
| tree | 329c810b96390946942dd49cabc9f5588a00cc86 /app/models/user.rb | |
| parent | 688ee3e4cb531de37e776513847b0404b85134cf (diff) | |
| parent | ef707ebfacec3782c5a6270b784a069df384feb9 (diff) | |
| download | gitlab-ce-b8433cb886abfdc7eae86c1789c0f1c5ff56204d.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
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 4a10520b209..2beefb1d614 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -57,6 +57,7 @@ # otp_backup_codes :text # public_email :string(255) default(""), not null # dashboard :integer default(0) +# project_view :integer default(0) # require 'carrierwave/orm/activerecord' |