diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/issuable_collections.rb | 2 | ||||
| -rw-r--r-- | app/controllers/explore/projects_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/project.rb | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb index fe793a1116f..4841225de08 100644 --- a/app/controllers/concerns/issuable_collections.rb +++ b/app/controllers/concerns/issuable_collections.rb @@ -16,7 +16,7 @@ module IssuableCollections def show_alert_if_search_is_disabled return if current_user || params[:search].blank? || !html_request? || Feature.disabled?(:disable_anonymous_search, type: :ops) - flash[:notice] = _('You must sign in to search for specific terms.') + flash.now[:notice] = _('You must sign in to search for specific terms.') end # rubocop:disable Gitlab/ModuleWithInstanceVariables diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb index 92ff3ffb8ff..3dc6a16cbc1 100644 --- a/app/controllers/explore/projects_controller.rb +++ b/app/controllers/explore/projects_controller.rb @@ -125,7 +125,7 @@ class Explore::ProjectsController < Explore::ApplicationController def show_alert_if_search_is_disabled return if current_user || params[:name].blank? && params[:search].blank? || !html_request? || Feature.disabled?(:disable_anonymous_project_search, type: :ops) - flash[:notice] = _('You must sign in to search for specific projects.') + flash.now[:notice] = _('You must sign in to search for specific projects.') end end diff --git a/app/models/project.rb b/app/models/project.rb index 99c64ec1f68..74ffeef797e 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -380,6 +380,7 @@ class Project < ApplicationRecord has_many :jira_imports, -> { order 'jira_imports.created_at' }, class_name: 'JiraImportState', inverse_of: :project has_many :daily_build_group_report_results, class_name: 'Ci::DailyBuildGroupReportResult' + has_many :ci_feature_usages, class_name: 'Projects::CiFeatureUsage' has_many :repository_storage_moves, class_name: 'Projects::RepositoryStorageMove', inverse_of: :container |