Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-07-06 10:39:45 +0300
committerShinya Maeda <shinya@gitlab.com>2017-07-07 09:35:12 +0300
commit61d5b13888e9eb83cd86ca9849034d320b94d2b7 (patch)
tree1bf677e098febb0b6c94f6624d59b8e11d97db00 /app/controllers/projects
parent5c68fa66ccb17cb9a2c17574c3136c89b1a5d19f (diff)
Adopt project_variable_path instead of namespace_project_variable_path. (Resolve confilct from master)
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/variables_controller.rb4
1 files changed, 2 insertions, 2 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)