diff options
author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-14 20:08:02 +0100 |
---|---|---|
committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-14 20:08:02 +0100 |
commit | 88f8d3a4d6521d1001bcea83c2fb7b7c4fe15f37 (patch) | |
tree | 6396220c786e65563c8d0eb4dc1a88a60d3636c8 /app/models/project.rb | |
parent | 76eeb316df2f256d0d3c41d97421f709a21a02a8 (diff) | |
parent | b782e7c9732275175d79b485fcddc85e575d48dd (diff) | |
download | gitlab-ce-88f8d3a4d6521d1001bcea83c2fb7b7c4fe15f37.tar.gz |
Merge branch 'master' into 4009-external-users
Diffstat (limited to 'app/models/project.rb')
-rw-r--r-- | app/models/project.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 51952ba72a2..cc877b9af74 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -151,6 +151,8 @@ class Project < ActiveRecord::Base has_many :releases, dependent: :destroy has_many :lfs_objects_projects, dependent: :destroy has_many :lfs_objects, through: :lfs_objects_projects + has_many :project_group_links, dependent: :destroy + has_many :invited_groups, through: :project_group_links, source: :group has_many :todos, dependent: :destroy has_one :import_data, dependent: :destroy, class_name: "ProjectImportData" @@ -893,6 +895,10 @@ class Project < ActiveRecord::Base jira_tracker? && jira_service.active end + def allowed_to_share_with_group? + !namespace.share_with_group_lock + end + def ci_commit(sha) ci_commits.find_by(sha: sha) end |