Commit 08ecab60 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

changed pipelines controller name to ci_cd_pipelines

parent 58110293
......@@ -259,7 +259,7 @@
new gl.ProtectedBranchCreate();
new gl.ProtectedBranchEditList();
break;
case 'projects:variables:index':
case 'projects:ci_cd_pipelines:show':
new gl.ProjectVariables();
break;
case 'ci:lints:create':
......
......@@ -2,13 +2,13 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
before_action :authorize_admin_pipeline!
def show
redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project)
redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
end
def update
if @project.update_attributes(update_params)
flash[:notice] = "CI/CD Pipelines settings for '#{@project.name}' were successfully updated."
redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project)
redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
else
render 'show'
end
......
......@@ -5,7 +5,7 @@ class Projects::RunnersController < Projects::ApplicationController
layout 'project_settings'
def index
redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project)
redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
end
def edit
......@@ -49,7 +49,7 @@ class Projects::RunnersController < Projects::ApplicationController
def toggle_shared_runners
project.toggle!(:shared_runners_enabled)
redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project)
redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
end
protected
......
module Projects
module Settings
class PipelinesController < Projects::ApplicationController
class CiCdPipelinesController < Projects::ApplicationController
before_action :authorize_admin_pipeline!
def show
......
......@@ -4,7 +4,7 @@ class Projects::VariablesController < Projects::ApplicationController
layout 'project_settings'
def index
redirect_to namespace_project_settings_pipelines_path(project.namespace, project)
redirect_to namespace_project_settings_ci_cd_pipelines_path(project.namespace, project)
end
def show
......@@ -15,7 +15,7 @@ class Projects::VariablesController < Projects::ApplicationController
@variable = @project.variables.find(params[:id])
if @variable.update_attributes(project_params)
redirect_to namespace_project_settings_pipelines_path(project.namespace, project), notice: 'Variable was successfully updated.'
redirect_to namespace_project_settings_ci_cd_pipelines_path(project.namespace, project), notice: 'Variable was successfully updated.'
else
render action: "show"
end
......@@ -25,7 +25,7 @@ class Projects::VariablesController < Projects::ApplicationController
@variable = Ci::Variable.new(project_params)
if @variable.valid? && @project.variables << @variable
redirect_to namespace_project_settings_pipelines_path(project.namespace, project), notice: 'Variables were successfully updated.'
redirect_to namespace_project_settings_ci_cd_pipelines_path(project.namespace, project), notice: 'Variables were successfully updated.'
else
render action: "index"
end
......@@ -35,7 +35,7 @@ class Projects::VariablesController < Projects::ApplicationController
@key = @project.variables.find(params[:id])
@key.destroy
redirect_to namespace_project_settings_pipelines_path(project.namespace, project), notice: 'Variable was successfully removed.'
redirect_to namespace_project_settings_ci_cd_pipelines_path(project.namespace, project), notice: 'Variable was successfully removed.'
end
private
......
......@@ -22,7 +22,7 @@
- else
%h4.underlined-title Available shared Runners : #{@shared_runners_count}
%ul.bordered-list.available-shared-runners
= render partial: 'runner', collection: @shared_runners, as: :runner
= render partial: 'projects/runners/runner', collection: @shared_runners, as: :runner
- if @shared_runners_count > 10
.light
and #{@shared_runners_count - 10} more...
......@@ -315,8 +315,8 @@ constraints(ProjectUrlConstrainer.new) do
end
namespace :settings do
resource :members, only: [:show]
resource :ci_cd_pipelines, only: [:show]
resource :integrations, only: [:show]
resource :pipelines, only: [:show]
end
# Since both wiki and repository routing contains wildcard characters
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment