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:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-17 12:10:43 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-17 12:10:43 +0300
commitb1a7b1b7e33ae747119d89e5a6697b361df4d947 (patch)
tree3666a1b101c55f06a2618eadfa0ce3f7ef9950d2 /app
parent8624e54ae69729abf8664f1f1a57e90ee9ecab1a (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects/badges_controller.rb3
-rw-r--r--app/controllers/projects/graphs_controller.rb4
2 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/projects/badges_controller.rb b/app/controllers/projects/badges_controller.rb
index 0cd59c136e5..8023e51b552 100644
--- a/app/controllers/projects/badges_controller.rb
+++ b/app/controllers/projects/badges_controller.rb
@@ -6,7 +6,8 @@ class Projects::BadgesController < Projects::ApplicationController
before_action :no_cache_headers, only: [:pipeline, :coverage]
before_action :authorize_read_build!, only: [:pipeline, :coverage]
- feature_category :continuous_integration
+ feature_category :continuous_integration, [:index, :pipeline]
+ feature_category :code_testing, [:coverage]
def pipeline
pipeline_status = Gitlab::Ci::Badge::Pipeline::Status
diff --git a/app/controllers/projects/graphs_controller.rb b/app/controllers/projects/graphs_controller.rb
index 82eddd618a5..d3a05736a47 100644
--- a/app/controllers/projects/graphs_controller.rb
+++ b/app/controllers/projects/graphs_controller.rb
@@ -11,9 +11,11 @@ class Projects::GraphsController < Projects::ApplicationController
track_redis_hll_event :charts, name: 'p_analytics_repo'
- feature_category :source_code_management
+ feature_category :source_code_management, [:show, :commits, :languages, :charts]
urgency :low, [:show]
+ feature_category :continuous_integration, [:ci]
+
def show
respond_to do |format|
format.html