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:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-24 21:11:44 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-24 21:11:44 +0300
commitfd247970cfe1e98276c780fbdcca026b7960e42a (patch)
treeab7963eb9b30fd73283c526cb6ae4ca1ef61c06f /app/services/analytics
parentdf9890e9a702e2f12bbc8f022b916ca72820a292 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/analytics')
-rw-r--r--app/services/analytics/cycle_analytics/stages/base_service.rb2
-rw-r--r--app/services/analytics/cycle_analytics/stages/list_service.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/analytics/cycle_analytics/stages/base_service.rb b/app/services/analytics/cycle_analytics/stages/base_service.rb
index b676eff0a0b..0f5415c9f9e 100644
--- a/app/services/analytics/cycle_analytics/stages/base_service.rb
+++ b/app/services/analytics/cycle_analytics/stages/base_service.rb
@@ -37,7 +37,7 @@ module Analytics
end
def value_stream
- @value_stream ||= params[:value_stream]
+ @value_stream ||= params.fetch(:value_stream)
end
end
end
diff --git a/app/services/analytics/cycle_analytics/stages/list_service.rb b/app/services/analytics/cycle_analytics/stages/list_service.rb
index a6b94ef8295..1cd7d3f5c6d 100644
--- a/app/services/analytics/cycle_analytics/stages/list_service.rb
+++ b/app/services/analytics/cycle_analytics/stages/list_service.rb
@@ -13,7 +13,7 @@ module Analytics
private
def allowed?
- can?(current_user, :read_cycle_analytics, parent)
+ can?(current_user, :read_cycle_analytics, parent.project)
end
def success(stages)