root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'remove-unused-code' into 'master' 

Remove unused code

See merge request !13657
This commit is contained in:
Rémy Coutable 2017-09-04 11:05:07 +00:00
parent dabce2c571 6be89f21b8
commit 25a443d652
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/project.rb
View File

@ -68,7 +68,6 @@ class Project < ActiveRecord::Base
acts_as_taggable acts_as_taggable
attr_accessor :new_default_branch
attr_accessor :old_path_with_namespace attr_accessor :old_path_with_namespace
attr_accessor :template_name attr_accessor :template_name
attr_writer :pipeline_status attr_writer :pipeline_status

9
app/models/user.rb
View File

@ -644,11 +644,6 @@ class User < ActiveRecord::Base
@personal_projects_count ||= personal_projects.count @personal_projects_count ||= personal_projects.count
end end
def projects_limit_percent
return 100 if projects_limit.zero?
(personal_projects.count.to_f / projects_limit) * 100
end
def recent_push(project_ids = nil) def recent_push(project_ids = nil)
# Get push events not earlier than 2 hours ago # Get push events not earlier than 2 hours ago
events = recent_events.code_push.where("created_at > ?", Time.now - 2.hours) events = recent_events.code_push.where("created_at > ?", Time.now - 2.hours)
@ -666,10 +661,6 @@ class User < ActiveRecord::Base
end end
end end
def projects_sorted_by_activity
authorized_projects.sorted_by_activity
end
def several_namespaces? def several_namespaces?
owned_groups.any? || masters_groups.any? owned_groups.any? || masters_groups.any?
end end