summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorJames Lopez <james.lopez@vodafone.com>2015-11-03 11:11:56 +0000
committerJames Lopez <james.lopez@vodafone.com>2015-11-03 11:11:56 +0000
commit1b14bc59570a625365fef232f8c57919f76b3e2a (patch)
treeb1c125a96e844aedfc183ff3874bd74871f0c7af /app/models/project.rb
parent6aa9c21ac0e3f4860f9021718900326ea0575151 (diff)
downloadgitlab-ce-1b14bc59570a625365fef232f8c57919f76b3e2a.tar.gz
refactored permissions and added update_project_member ability logic. Also refactored owner methods to a concern.
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 74b89aad499..79b7a6457d7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -41,6 +41,7 @@ class Project < ActiveRecord::Base
include Sortable
include AfterCommitQueue
include CaseSensitivity
+ include HasOwners
extend Gitlab::ConfigHelper
extend Enumerize
@@ -114,6 +115,7 @@ class Project < ActiveRecord::Base
has_many :hooks, dependent: :destroy, class_name: 'ProjectHook'
has_many :protected_branches, dependent: :destroy
has_many :project_members, dependent: :destroy, as: :source, class_name: 'ProjectMember'
+ alias_method :my_members, :project_members
has_many :users, through: :project_members
has_many :deploy_keys_projects, dependent: :destroy
has_many :deploy_keys, through: :deploy_keys_projects