Commit 10900207 authored by Michael Kozono's avatar Michael Kozono

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
parents 45c80917 303ec92a
...@@ -36,10 +36,10 @@ class ProjectsController < Projects::ApplicationController ...@@ -36,10 +36,10 @@ class ProjectsController < Projects::ApplicationController
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def new def new
namespace = Namespace.find_by(id: params[:namespace_id]) if params[:namespace_id] @namespace = Namespace.find_by(id: params[:namespace_id]) if params[:namespace_id]
return access_denied! if namespace && !can?(current_user, :create_projects, namespace) 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 end
# rubocop: enable CodeReuse/ActiveRecord # rubocop: enable CodeReuse/ActiveRecord
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment