diff options
| author | Michael Kozono <mkozono@gmail.com> | 2019-05-01 00:49:04 +0300 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2019-05-01 00:49:04 +0300 |
| commit | 109002071858acb39dc00c8e5652d14f5f4d886d (patch) | |
| tree | c278244e2dfe773e872dac75c49aede83ad1afe3 | |
| parent | 45c809179da805555d7409c40b8e55bdac8812fa (diff) | |
| parent | 303ec92ab92942e067f8bc95de27e85b579580c4 (diff) | |
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
| -rw-r--r-- | app/controllers/projects_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 48f4d7a586d..e88c46144ef 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -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 |