Merge branch 'group-project-template-in-paid-features' into 'master'

Group project templates should be a Silver/Premium feature - CE backport

See merge request gitlab-org/gitlab-ce!27407
This commit is contained in:
Michael Kozono 2019-04-30 21:49:04 +00:00
commit 1090020718
1 changed files with 3 additions and 3 deletions

View File

@ -36,10 +36,10 @@ class ProjectsController < Projects::ApplicationController
# rubocop: disable CodeReuse/ActiveRecord
def new
namespace = Namespace.find_by(id: params[:namespace_id]) if params[:namespace_id]
return access_denied! if namespace && !can?(current_user, :create_projects, namespace)
@namespace = Namespace.find_by(id: params[:namespace_id]) if params[:namespace_id]
return access_denied! if @namespace && !can?(current_user, :create_projects, @namespace)
@project = Project.new(namespace_id: namespace&.id)
@project = Project.new(namespace_id: @namespace&.id)
end
# rubocop: enable CodeReuse/ActiveRecord