From 61d5b13888e9eb83cd86ca9849034d320b94d2b7 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Thu, 6 Jul 2017 16:39:45 +0900 Subject: [PATCH] Adopt project_variable_path instead of namespace_project_variable_path. (Resolve confilct from master) --- app/controllers/projects/variables_controller.rb | 4 ++-- app/presenters/ci/variable_presenter.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/projects/variables_controller.rb b/app/controllers/projects/variables_controller.rb index 176c0294ead..04d7429d939 100644 --- a/app/controllers/projects/variables_controller.rb +++ b/app/controllers/projects/variables_controller.rb @@ -13,7 +13,7 @@ class Projects::VariablesController < Projects::ApplicationController def update if @variable.update(project_params) - redirect_to namespace_project_variables_path(project.namespace, project), + redirect_to project_variables_path(project), notice: 'Variable was successfully updated.' else render "show" @@ -24,7 +24,7 @@ class Projects::VariablesController < Projects::ApplicationController new_variable = project.variables.create(project_params) if new_variable.persisted? - redirect_to namespace_project_settings_ci_cd_path(project.namespace, project), + redirect_to project_settings_ci_cd_path(project), notice: 'Variables were successfully updated.' else @variable = new_variable.present(current_user: current_user) diff --git a/app/presenters/ci/variable_presenter.rb b/app/presenters/ci/variable_presenter.rb index 3f14d972c50..710604c653c 100644 --- a/app/presenters/ci/variable_presenter.rb +++ b/app/presenters/ci/variable_presenter.rb @@ -15,11 +15,11 @@ module Ci end def edit_path - namespace_project_variable_path(project.namespace, project, variable) + project_variable_path(project, variable) end def delete_path - namespace_project_variable_path(project.namespace, project, variable) + project_variable_path(project, variable) end end end