Merge branch 'master' into fixes/api

10 files changed, 46 insertions, 62 deletions

diff --git a/app/models/key.rb b/app/models/key.rb
index 2bf50f56565..895e8d6cb9c 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -24,8 +24,8 @@ class Key < ActiveRecord::Base
   before_save :set_identifier
 
   validates :title, presence: true, length: { within: 0..255 }
-  validates :key, presence: true, length: { within: 0..5000 }, format: { :with => /ssh-.{3} / }
-  validate :unique_key, :fingerprintable_key
+  validates :key, presence: true, length: { within: 0..5000 }, format: { :with => /ssh-.{3} / }, uniqueness: true
+  validate :fingerprintable_key
 
   delegate :name, :email, to: :user, prefix: true
 
@@ -33,14 +33,6 @@ class Key < ActiveRecord::Base
     self.key = self.key.strip unless self.key.blank?
   end
 
-  def unique_key
-    query = Key.where(key: key)
-    query = query.where('(project_id IS NULL OR project_id = ?)', project_id) if project_id
-    if (query.count > 0)
-      errors.add :key, 'already exist.'
-    end
-  end
-
   def fingerprintable_key
     return true unless key # Don't test if there is no key.
     # `ssh-keygen -lf /dev/stdin <<< "#{key}"` errors with: redirection unexpected
@@ -65,7 +57,7 @@ class Key < ActiveRecord::Base
   end
 
   def is_deploy_key
-    true if project_id
+    !!project_id
   end
 
   # projects that has this key
@@ -77,7 +69,7 @@ class Key < ActiveRecord::Base
     end
   end
 
-  def last_deploy?
-    Key.where(identifier: identifier).count == 0
+  def shell_id
+    "key-#{self.id}"
   end
 end
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index ad04d0ef99b..f17d8f65183 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -27,7 +27,6 @@ class Namespace < ActiveRecord::Base
 
   after_create :ensure_dir_exist
   after_update :move_dir
-  after_commit :update_gitolite, on: :update, if: :require_update_gitolite
   after_destroy :rm_dir
 
   scope :root, where('type IS NULL')
@@ -89,11 +88,6 @@ class Namespace < ActiveRecord::Base
     end
   end
 
-  def update_gitolite
-    @require_update_gitolite = false
-    projects.each(&:update_repository)
-  end
-
   def rm_dir
     dir_path = File.join(Gitlab.config.gitolite.repos_path, path)
     FileUtils.rm_r( dir_path, force: true )
diff --git a/app/models/project.rb b/app/models/project.rb
index dde15927808..e6be2d2ce84 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -8,7 +8,6 @@
 #  description            :text
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
-#  private_flag           :boolean          default(TRUE), not null
 #  creator_id             :integer
 #  default_branch         :string(255)
 #  issues_enabled         :boolean          default(TRUE), not null
@@ -16,6 +15,7 @@
 #  merge_requests_enabled :boolean          default(TRUE), not null
 #  wiki_enabled           :boolean          default(TRUE), not null
 #  namespace_id           :integer
+#  public                 :boolean          default(FALSE), not null
 #
 
 require "grit"
@@ -262,8 +262,6 @@ class Project < ActiveRecord::Base
 
       Gitlab::ProjectMover.new(self, old_dir, new_dir).execute
 
-      gitolite.move_repository(old_repo, self)
-
       save!
     end
   rescue Gitlab::ProjectMover::ProjectMoveError => ex
@@ -459,20 +457,6 @@ class Project < ActiveRecord::Base
     namespace.try(:path) || ''
   end
 
-  def update_repository
-    GitoliteWorker.perform_async(
-      :update_repository,
-      self.id
-    )
-  end
-
-  def destroy_repository
-    GitoliteWorker.perform_async(
-      :remove_repository,
-      self.path_with_namespace
-    )
-  end
-
   def repo_exists?
     @repo_exists ||= (repository && repository.branches.present?)
   rescue
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index 2cc76974987..c2cf83c0ca8 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -112,7 +112,6 @@ class ProjectTeam
       source_team.each do |tm|
         tm.save
       end
-      target_project.update_repository
     end
 
     true
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index 2e7010ea9c9..57229d50759 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -18,13 +18,6 @@ class ProtectedBranch < ActiveRecord::Base
   validates :name, presence: true
   validates :project, presence: true
 
-  after_save :update_repository
-  after_destroy :update_repository
-
-  def update_repository
-    project.update_repository
-  end
-
   def commit
     project.repository.commit(self.name)
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 5a95deec53d..5b0df09a439 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -31,6 +31,8 @@
 #  extern_uid             :string(255)
 #  provider               :string(255)
 #  username               :string(255)
+#  can_create_group       :boolean          default(TRUE), not null
+#  can_create_team        :boolean          default(TRUE), not null
 #
 
 class User < ActiveRecord::Base
diff --git a/app/models/user_team.rb b/app/models/user_team.rb
index b28a6a041ac..dc8cf9eeb22 100644
--- a/app/models/user_team.rb
+++ b/app/models/user_team.rb
@@ -1,3 +1,15 @@
+# == Schema Information
+#
+# Table name: user_teams
+#
+#  id         :integer          not null, primary key
+#  name       :string(255)
+#  path       :string(255)
+#  owner_id   :integer
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
 class UserTeam < ActiveRecord::Base
   attr_accessible :name, :owner_id, :path
 
diff --git a/app/models/user_team_project_relationship.rb b/app/models/user_team_project_relationship.rb
index 1b0368c7ecc..a7aa88970c7 100644
--- a/app/models/user_team_project_relationship.rb
+++ b/app/models/user_team_project_relationship.rb
@@ -1,3 +1,15 @@
+# == Schema Information
+#
+# Table name: user_team_project_relationships
+#
+#  id              :integer          not null, primary key
+#  project_id      :integer
+#  user_team_id    :integer
+#  greatest_access :integer
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#
+
 class UserTeamProjectRelationship < ActiveRecord::Base
   attr_accessible :greatest_access, :project_id, :user_team_id
 
diff --git a/app/models/user_team_user_relationship.rb b/app/models/user_team_user_relationship.rb
index 63bdc49e5b6..1f7e2625f5f 100644
--- a/app/models/user_team_user_relationship.rb
+++ b/app/models/user_team_user_relationship.rb
@@ -1,3 +1,16 @@
+# == Schema Information
+#
+# Table name: user_team_user_relationships
+#
+#  id           :integer          not null, primary key
+#  user_id      :integer
+#  user_team_id :integer
+#  group_admin  :boolean
+#  permission   :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+
 class UserTeamUserRelationship < ActiveRecord::Base
   attr_accessible :group_admin, :permission, :user_id, :user_team_id
 
diff --git a/app/models/users_project.rb b/app/models/users_project.rb
index 183878cb30c..dd8ceb9da70 100644
--- a/app/models/users_project.rb
+++ b/app/models/users_project.rb
@@ -25,15 +25,12 @@ class UsersProject < ActiveRecord::Base
 
   attr_accessor :skip_git
 
-  after_save :update_repository, unless: :skip_git?
-  after_destroy :update_repository, unless: :skip_git?
-
   validates :user, presence: true
   validates :user_id, uniqueness: { scope: [:project_id], message: "already exists in project" }
   validates :project_access, inclusion: { in: [GUEST, REPORTER, DEVELOPER, MASTER] }, presence: true
   validates :project, presence: true
 
-  delegate :name, :email, to: :user, prefix: true
+  delegate :name, :username, :email, to: :user, prefix: true
 
   scope :guests, where(project_access: GUEST)
   scope :reporters, where(project_access: REPORTER)
@@ -84,11 +81,6 @@ class UsersProject < ActiveRecord::Base
         end
       end
 
-      GitoliteWorker.perform_async(
-        :update_repositories,
-        project_ids
-      )
-
       true
     rescue
       false
@@ -103,11 +95,6 @@ class UsersProject < ActiveRecord::Base
         end
       end
 
-      GitoliteWorker.perform_async(
-        :update_repositories,
-        project_ids
-      )
-
       true
     rescue
       false
@@ -136,10 +123,6 @@ class UsersProject < ActiveRecord::Base
     end
   end
 
-  def update_repository
-    project.update_repository
-  end
-
   def project_access_human
     Project.access_options.key(self.project_access)
   end