Commit 3312252d authored by Michael Kozono's avatar Michael Kozono

Merge branch 'cli-update-feature-category_verify-pa' into 'master'

Updating feature_category from CI to PA and code_testing

See merge request gitlab-org/gitlab!68214
parents bf15be87 0b8cb75d
...@@ -7,8 +7,6 @@ module API ...@@ -7,8 +7,6 @@ module API
before { authenticate_non_get! } before { authenticate_non_get! }
feature_category :continuous_integration
params do params do
requires :id, type: String, desc: 'The project ID' requires :id, type: String, desc: 'The project ID'
end end
...@@ -53,7 +51,7 @@ module API ...@@ -53,7 +51,7 @@ module API
desc: 'Sort pipelines' desc: 'Sort pipelines'
optional :source, type: String, values: ::Ci::Pipeline.sources.keys optional :source, type: String, values: ::Ci::Pipeline.sources.keys
end end
get ':id/pipelines' do get ':id/pipelines', feature_category: :continuous_integration do
authorize! :read_pipeline, user_project authorize! :read_pipeline, user_project
authorize! :read_build, user_project authorize! :read_build, user_project
...@@ -69,7 +67,7 @@ module API ...@@ -69,7 +67,7 @@ module API
requires :ref, type: String, desc: 'Reference' requires :ref, type: String, desc: 'Reference'
optional :variables, Array, desc: 'Array of variables available in the pipeline' optional :variables, Array, desc: 'Array of variables available in the pipeline'
end end
post ':id/pipeline' do post ':id/pipeline', feature_category: :continuous_integration do
Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/20711') Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/20711')
authorize! :create_pipeline, user_project authorize! :create_pipeline, user_project
...@@ -96,7 +94,7 @@ module API ...@@ -96,7 +94,7 @@ module API
params do params do
optional :ref, type: String, desc: 'branch ref of pipeline' optional :ref, type: String, desc: 'branch ref of pipeline'
end end
get ':id/pipelines/latest' do get ':id/pipelines/latest', feature_category: :continuous_integration do
authorize! :read_pipeline, latest_pipeline authorize! :read_pipeline, latest_pipeline
present latest_pipeline, with: Entities::Ci::Pipeline present latest_pipeline, with: Entities::Ci::Pipeline
...@@ -109,7 +107,7 @@ module API ...@@ -109,7 +107,7 @@ module API
params do params do
requires :pipeline_id, type: Integer, desc: 'The pipeline ID' requires :pipeline_id, type: Integer, desc: 'The pipeline ID'
end end
get ':id/pipelines/:pipeline_id' do get ':id/pipelines/:pipeline_id', feature_category: :continuous_integration do
authorize! :read_pipeline, pipeline authorize! :read_pipeline, pipeline
present pipeline, with: Entities::Ci::Pipeline present pipeline, with: Entities::Ci::Pipeline
...@@ -125,7 +123,7 @@ module API ...@@ -125,7 +123,7 @@ module API
use :pagination use :pagination
end end
get ':id/pipelines/:pipeline_id/jobs' do get ':id/pipelines/:pipeline_id/jobs', feature_category: :continuous_integration do
authorize!(:read_pipeline, user_project) authorize!(:read_pipeline, user_project)
pipeline = user_project.all_pipelines.find(params[:pipeline_id]) pipeline = user_project.all_pipelines.find(params[:pipeline_id])
...@@ -148,7 +146,7 @@ module API ...@@ -148,7 +146,7 @@ module API
use :pagination use :pagination
end end
get ':id/pipelines/:pipeline_id/bridges' do get ':id/pipelines/:pipeline_id/bridges', feature_category: :pipeline_authoring do
authorize!(:read_build, user_project) authorize!(:read_build, user_project)
pipeline = user_project.all_pipelines.find(params[:pipeline_id]) pipeline = user_project.all_pipelines.find(params[:pipeline_id])
...@@ -168,7 +166,7 @@ module API ...@@ -168,7 +166,7 @@ module API
params do params do
requires :pipeline_id, type: Integer, desc: 'The pipeline ID' requires :pipeline_id, type: Integer, desc: 'The pipeline ID'
end end
get ':id/pipelines/:pipeline_id/variables' do get ':id/pipelines/:pipeline_id/variables', feature_category: :pipeline_authoring do
authorize! :read_pipeline_variable, pipeline authorize! :read_pipeline_variable, pipeline
present pipeline.variables, with: Entities::Ci::Variable present pipeline.variables, with: Entities::Ci::Variable
...@@ -181,7 +179,7 @@ module API ...@@ -181,7 +179,7 @@ module API
params do params do
requires :pipeline_id, type: Integer, desc: 'The pipeline ID' requires :pipeline_id, type: Integer, desc: 'The pipeline ID'
end end
get ':id/pipelines/:pipeline_id/test_report' do get ':id/pipelines/:pipeline_id/test_report', feature_category: :code_testing do
authorize! :read_build, pipeline authorize! :read_build, pipeline
present pipeline.test_reports, with: TestReportEntity, details: true present pipeline.test_reports, with: TestReportEntity, details: true
...@@ -194,7 +192,7 @@ module API ...@@ -194,7 +192,7 @@ module API
params do params do
requires :pipeline_id, type: Integer, desc: 'The pipeline ID' requires :pipeline_id, type: Integer, desc: 'The pipeline ID'
end end
get ':id/pipelines/:pipeline_id/test_report_summary' do get ':id/pipelines/:pipeline_id/test_report_summary', feature_category: :code_testing do
authorize! :read_build, pipeline authorize! :read_build, pipeline
present pipeline.test_report_summary, with: TestReportSummaryEntity present pipeline.test_report_summary, with: TestReportSummaryEntity
...@@ -207,7 +205,7 @@ module API ...@@ -207,7 +205,7 @@ module API
params do params do
requires :pipeline_id, type: Integer, desc: 'The pipeline ID' requires :pipeline_id, type: Integer, desc: 'The pipeline ID'
end end
delete ':id/pipelines/:pipeline_id' do delete ':id/pipelines/:pipeline_id', feature_category: :continuous_integration do
authorize! :destroy_pipeline, pipeline authorize! :destroy_pipeline, pipeline
destroy_conditionally!(pipeline) do destroy_conditionally!(pipeline) do
...@@ -222,7 +220,7 @@ module API ...@@ -222,7 +220,7 @@ module API
params do params do
requires :pipeline_id, type: Integer, desc: 'The pipeline ID' requires :pipeline_id, type: Integer, desc: 'The pipeline ID'
end end
post ':id/pipelines/:pipeline_id/retry' do post ':id/pipelines/:pipeline_id/retry', feature_category: :continuous_integration do
authorize! :update_pipeline, pipeline authorize! :update_pipeline, pipeline
pipeline.retry_failed(current_user) pipeline.retry_failed(current_user)
...@@ -237,7 +235,7 @@ module API ...@@ -237,7 +235,7 @@ module API
params do params do
requires :pipeline_id, type: Integer, desc: 'The pipeline ID' requires :pipeline_id, type: Integer, desc: 'The pipeline ID'
end end
post ':id/pipelines/:pipeline_id/cancel' do post ':id/pipelines/:pipeline_id/cancel', feature_category: :continuous_integration do
authorize! :update_pipeline, pipeline authorize! :update_pipeline, pipeline
pipeline.cancel_running pipeline.cancel_running
......
...@@ -6,7 +6,7 @@ module API ...@@ -6,7 +6,7 @@ module API
before { authenticate! } before { authenticate! }
before { authorize! :admin_group, user_group } before { authorize! :admin_group, user_group }
feature_category :continuous_integration feature_category :pipeline_authoring
helpers ::API::Helpers::VariablesHelpers helpers ::API::Helpers::VariablesHelpers
......
...@@ -11,7 +11,7 @@ module API ...@@ -11,7 +11,7 @@ module API
}, },
gitlab_ci_ymls: { gitlab_ci_ymls: {
gitlab_version: 8.9, gitlab_version: 8.9,
feature_category: :continuous_integration feature_category: :pipeline_authoring
}, },
dockerfiles: { dockerfiles: {
gitlab_version: 8.15, gitlab_version: 8.15,
......
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