Skip to content

Update ee admin settings error alerts

Alexander Turinske requested to merge 364956-update-bootstrap-alert into master

What does this MR do and why?

Update ee admin settings error alerts

  • update bootstrap alert to Pajamas

Changelog: other

EE: true

Screenshots or screen recordings

Note: I had to force the errors on programatically, so there are no reasons for the errors

Before After
Screen_Shot_2022-06-10_at_15.54.38 Screen_Shot_2022-06-10_at_15.55.08
advanced_search_-_b advanced_search_-_a
Screen_Shot_2022-06-10_at_16.50.18 Screen_Shot_2022-06-10_at_16.50.36
Screen_Shot_2022-06-10_at_16.49.00 Screen_Shot_2022-06-10_at_16.49.28

How to set up and validate locally

  1. Apply the below patch
  2. Navigate to admin => Settings => Templates => Custom project templates
  3. Navigate to admin => Settings => CI/CD => Required Pipeline Configuration
  4. Navigate to admin => Settings => Advanced Search
  5. Navigate to admin => Push Rules and disable the first line of ee/app/views/admin/push_rules/_merge_request_approvals.html.haml
diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb
index d2f1976e3c0..c7ceef2c480 100644
--- a/app/helpers/form_helper.rb
+++ b/app/helpers/form_helper.rb
@@ -4,7 +4,7 @@ module FormHelper
   def form_errors(model, type: 'form', truncate: [], pajamas_alert: false)
     errors = model.errors
 
-    return unless errors.any?
+    return if errors.any?
 
     headline = n_(
       'The %{type} contains the following error:',

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Related to #364956 (closed) Related to #364950 (closed) Related to #364975 (closed) Related to #364984 (closed)

Edited by Alexander Turinske

Merge request reports