kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Adopt project_variable_path instead of namespace_project_variable_path. (Resolve confilct from master)

Browse source
This commit is contained in:
Shinya Maeda 2017-07-06 16:39:45 +09:00
parent 5c68fa66cc
commit 61d5b13888
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/projects/variables_controller.rb
View file

@ -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)

4
app/presenters/ci/variable_presenter.rb
View file

@ -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