diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-11-21 19:15:52 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-11-22 12:06:57 +0300 |
| commit | 0b6d01ed775e957161e1304de44d0bd5251f4098 (patch) | |
| tree | 3022cc2a443a12df103b96d04369184561cce7ac /lib/gitlab/cycle_analytics | |
| parent | 45568bed36095db0df94cf89a8a04458f56f33dc (diff) | |
Just define allowed_ids and override it with empty value
if not needed for those sub-classes.
Diffstat (limited to 'lib/gitlab/cycle_analytics')
6 files changed, 8 insertions, 16 deletions
diff --git a/lib/gitlab/cycle_analytics/base_event_fetcher.rb b/lib/gitlab/cycle_analytics/base_event_fetcher.rb index bec201f309c..62fc3ee3b5f 100644 --- a/lib/gitlab/cycle_analytics/base_event_fetcher.rb +++ b/lib/gitlab/cycle_analytics/base_event_fetcher.rb @@ -56,10 +56,6 @@ module Gitlab end def allowed_ids - nil - end - - def load_allowed_ids allowed_ids_finder_class .new(@options[:current_user], project_id: @project.id) .execute.where(id: event_result_ids).pluck(:id) diff --git a/lib/gitlab/cycle_analytics/code_event_fetcher.rb b/lib/gitlab/cycle_analytics/code_event_fetcher.rb index 39df80352b6..06357c9b377 100644 --- a/lib/gitlab/cycle_analytics/code_event_fetcher.rb +++ b/lib/gitlab/cycle_analytics/code_event_fetcher.rb @@ -19,10 +19,6 @@ module Gitlab AnalyticsMergeRequestSerializer.new(project: @project).represent(event) end - def allowed_ids - load_allowed_ids - end - def allowed_ids_finder_class MergeRequestsFinder end diff --git a/lib/gitlab/cycle_analytics/issue_event_fetcher.rb b/lib/gitlab/cycle_analytics/issue_event_fetcher.rb index cc79e2dfe88..1754f91dccb 100644 --- a/lib/gitlab/cycle_analytics/issue_event_fetcher.rb +++ b/lib/gitlab/cycle_analytics/issue_event_fetcher.rb @@ -17,10 +17,6 @@ module Gitlab AnalyticsIssueSerializer.new(project: @project).represent(event) end - def allowed_ids - load_allowed_ids - end - def allowed_ids_finder_class IssuesFinder end diff --git a/lib/gitlab/cycle_analytics/plan_event_fetcher.rb b/lib/gitlab/cycle_analytics/plan_event_fetcher.rb index 2479b4a7706..ca2742f2aae 100644 --- a/lib/gitlab/cycle_analytics/plan_event_fetcher.rb +++ b/lib/gitlab/cycle_analytics/plan_event_fetcher.rb @@ -19,6 +19,10 @@ module Gitlab private + def allowed_ids + nil + end + def merge_request_diff_commits @merge_request_diff_commits ||= MergeRequestDiffCommit diff --git a/lib/gitlab/cycle_analytics/review_event_fetcher.rb b/lib/gitlab/cycle_analytics/review_event_fetcher.rb index 5a7f1eb00b3..dada819a2a8 100644 --- a/lib/gitlab/cycle_analytics/review_event_fetcher.rb +++ b/lib/gitlab/cycle_analytics/review_event_fetcher.rb @@ -18,10 +18,6 @@ module Gitlab AnalyticsMergeRequestSerializer.new(project: @project).represent(event) end - def allowed_ids - load_allowed_ids - end - def allowed_ids_finder_class MergeRequestsFinder end diff --git a/lib/gitlab/cycle_analytics/staging_event_fetcher.rb b/lib/gitlab/cycle_analytics/staging_event_fetcher.rb index 36c0260dbfe..2f014153ca5 100644 --- a/lib/gitlab/cycle_analytics/staging_event_fetcher.rb +++ b/lib/gitlab/cycle_analytics/staging_event_fetcher.rb @@ -22,6 +22,10 @@ module Gitlab private + def allowed_ids + nil + end + def serialize(event) AnalyticsBuildSerializer.new.represent(event['build']) end |