Skip to content
Snippets Groups Projects

Make GitLab pages support access control

Merged Tuomo Ala-Vannesluoma requested to merge tuomoa/gitlab-foss:auth into master
Compare and Show latest version
1 file
+ 0
13
Compare changes
  • Side-by-side
  • Inline
@@ -84,7 +84,6 @@ def issues_enabled?
issues_access_level > DISABLED
end
<<<<<<< HEAD
def pages_enabled?
pages_access_level > DISABLED
end
@@ -95,18 +94,6 @@ def public_pages?
pages_access_level == PUBLIC || pages_access_level == ENABLED && project.public?
end
# This is a workaround for the removal hooks not been triggered when removing a Project.
#
# ProjectFeature is removed using database cascade index rule.
# This method is called by Project model when deletion starts.
def untrack_statistics_for_deletion!
return unless wiki_enabled?
SiteStatistic.untrack(STATISTICS_ATTRIBUTE)
end
=======
>>>>>>> master
private
# Validates builds and merge requests access level
Loading