From 15c0e58a49d623a0f8747e1d7e74364324eeb79f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 26 Feb 2013 11:11:43 +0200
Subject: [PATCH] remove unused code related to gitolite
---
app/models/key.rb | 9 ---------
app/models/project_team.rb | 22 ----------------------
app/models/user.rb | 11 -----------
3 files changed, 42 deletions(-)
diff --git a/app/models/key.rb b/app/models/key.rb
index edb0bcd61fd23..53eee511e13ba 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -21,7 +21,6 @@ class Key < ActiveRecord::Base
attr_accessible :key, :title
before_validation :strip_white_space
- before_save :set_identifier
validates :title, presence: true, length: { within: 0..255 }
validates :key, presence: true, length: { within: 0..5000 }, format: { :with => /ssh-.{3} / }, uniqueness: true
@@ -48,14 +47,6 @@ def fingerprintable_key
errors.add(:key, "can't be fingerprinted") if $?.exitstatus != 0
end
- def set_identifier
- if is_deploy_key
- self.identifier = "deploy_#{Digest::MD5.hexdigest(key)}"
- else
- self.identifier = "#{user.identifier}_#{Time.now.to_i}"
- end
- end
-
def is_deploy_key
!!project_id
end
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index c2cf83c0ca831..f3e5c0e5354bd 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -66,28 +66,6 @@ def masters
members.masters.map(&:user)
end
- def repository_readers
- repository_members[UsersProject::REPORTER]
- end
-
- def repository_writers
- repository_members[UsersProject::DEVELOPER]
- end
-
- def repository_masters
- repository_members[UsersProject::MASTER]
- end
-
- def repository_members
- keys = Hash.new {|h,k| h[k] = [] }
- UsersProject.select("keys.identifier, project_access").
- joins(user: :keys).where(project_id: project.id).
- each {|row| keys[row.project_access] << [row.identifier] }
-
- keys[UsersProject::REPORTER] += project.deploy_keys.pluck(:identifier)
- keys
- end
-
def import(source_project)
target_project = project
diff --git a/app/models/user.rb b/app/models/user.rb
index b72349f872ee2..cd0754d7816a9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -216,17 +216,6 @@ def tm_in_authorized_projects
UsersProject.where(project_id: authorized_projects.map(&:id), user_id: self.id)
end
- # Returns a string for use as a Gitolite user identifier
- #
- # Note that Gitolite 2.x requires the following pattern for users:
- #
- # ^@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$
- def identifier
- # Replace non-word chars with underscores, then make sure it starts with
- # valid chars
- email.gsub(/\W/, '_').gsub(/\A([\W\_])+/, '')
- end
-
def is_admin?
admin
end
--
GitLab