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
path: root/app
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-07-06 14:18:11 +0300
committerShinya Maeda <shinya@gitlab.com>2017-07-07 09:35:12 +0300
commitb7d17aab66343d94e5aa9c1680d6bbf5fdfc173f (patch)
treeaedc11164c8e8cb41cde2d972b91cf05fa4971ab /app
parent8c434a52fcfc92ffbd8bf9aa5ee2893724d3c666 (diff)
Use new project_variables_path in this MR
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects/variables_controller.rb6
-rw-r--r--app/presenters/ci/variable_presenter.rb4
2 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/projects/variables_controller.rb b/app/controllers/projects/variables_controller.rb
index e8dcfa92348..a7fd4c2657c 100644
--- a/app/controllers/projects/variables_controller.rb
+++ b/app/controllers/projects/variables_controller.rb
@@ -5,7 +5,7 @@ class Projects::VariablesController < Projects::ApplicationController
layout 'project_settings'
def index
- redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project)
+ redirect_to project_settings_ci_cd_path(@project)
end
def show
@@ -34,11 +34,11 @@ class Projects::VariablesController < Projects::ApplicationController
def destroy
if variable.destroy
- redirect_to namespace_project_settings_ci_cd_path(project.namespace, project),
+ redirect_to project_settings_ci_cd_path(project),
status: 302,
notice: 'Variable was successfully removed.'
else
- redirect_to namespace_project_settings_ci_cd_path(project.namespace, project),
+ redirect_to project_settings_ci_cd_path(project),
status: 302,
notice: 'Failed to remove the variable.'
end
diff --git a/app/presenters/ci/variable_presenter.rb b/app/presenters/ci/variable_presenter.rb
index 710604c653c..5d7998393a6 100644
--- a/app/presenters/ci/variable_presenter.rb
+++ b/app/presenters/ci/variable_presenter.rb
@@ -8,9 +8,9 @@ module Ci
def form_path
if variable.persisted?
- namespace_project_variable_path(project.namespace, project, variable)
+ project_variable_path(project, variable)
else
- namespace_project_variables_path(project.namespace, project)
+ project_variables_path(project)
end
end