diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 11 | ||||
| -rw-r--r-- | app/controllers/admin/projects_controller.rb | 5 | ||||
| -rw-r--r-- | app/controllers/admin/services_controller.rb | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index ef6af01eff6..ce71730cef1 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -8,7 +8,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController # ApplicationSetting model uses Gitlab::ThreadMemoryCache for caching and the # cache might be stale immediately after an update. # https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30233 - before_action :set_application_setting + before_action :set_application_setting, except: :integrations before_action :whitelist_query_limiting, only: [:usage_data] @@ -29,12 +29,11 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController def integrations if Feature.enabled?(:instance_level_integrations) - # TODO: Update this with actual integrations - # To be fixed with https://gitlab.com/gitlab-org/gitlab/-/issues/199388 - @integrations = [] + @integrations = Service.find_or_initialize_instances.sort_by(&:title) + else + set_application_setting + perform_update if submitted? end - - perform_update if submitted? end def update diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index 7015da8bd50..9fe1f22c342 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -9,6 +9,11 @@ class Admin::ProjectsController < Admin::ApplicationController def index params[:sort] ||= 'latest_activity_desc' @sort = params[:sort] + + if params[:last_repository_check_failed].present? && params[:archived].nil? + params[:archived] = true + end + @projects = Admin::ProjectsFinder.new(params: params, current_user: current_user).execute respond_to do |format| diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb index 55817550b4b..08ef992e604 100644 --- a/app/controllers/admin/services_controller.rb +++ b/app/controllers/admin/services_controller.rb @@ -6,7 +6,7 @@ class Admin::ServicesController < Admin::ApplicationController before_action :service, only: [:edit, :update] def index - @services = Service.find_or_create_templates + @services = Service.find_or_create_templates.sort_by(&:title) end def edit |