diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-04-11 20:01:39 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-04-11 20:01:39 +0000 |
| commit | 40991fc3ce55bbfa87b6ed56515dcceb1e0e8dae (patch) | |
| tree | fdcaa7a99418411f3ef333106bd2d77879e007d7 /app/models/user.rb | |
| parent | 85cfde8332d9d5d3280fcb0b9de8d56de2d29ed4 (diff) | |
| parent | 069c54a7d7a1d1d6ec1dc48c4212139eff6735df (diff) | |
| download | gitlab-ce-docs-topic-auth.tar.gz | |
fix conflictdocs-topic-auth
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 31e975b8e53..457ba05fb04 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -587,10 +587,6 @@ class User < ActiveRecord::Base name.split.first unless name.blank? end - def cared_merge_requests - MergeRequest.cared(self) - end - def projects_limit_left projects_limit - personal_projects.count end |