diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-06 12:16:36 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-06 12:16:36 +0200 |
| commit | 4f24eb2aa670877faeef0f486af00d74e007ad01 (patch) | |
| tree | 3b8c9ccbe779050db829565910e8652392af4dcf /app/models/user.rb | |
| parent | c6799b0e1ecd1b7373f0ea23195e18c7ad5c199d (diff) | |
| parent | fff36a8b8965e4bddd8020caf5072e79bf131a74 (diff) | |
| download | gitlab-ce-merge-notifs.tar.gz | |
Merge branch 'master' into merge-notifsmerge-notifs
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 4a10520b209..57145cc6b6e 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' @@ -618,7 +619,7 @@ class User < ActiveRecord::Base end def all_ssh_keys - keys.map(&:key) + keys.map(&:publishable_key) end def temp_oauth_email? |