Automatic merge of gitlab-org/gitlab-ce master

app/helpers/application_helper.rb

@@ -268,6 +268,17 @@ module ApplicationHelper
     _('You are on a read-only GitLab instance.')
   end
 
+  def client_class_list
+    "gl-browser-#{browser.id} gl-platform-#{browser.platform.id}"
+  end
+
+  def client_js_flags
+    {
+      "is#{browser.id.to_s.titlecase}": true,
+      "is#{browser.platform.id.to_s.titlecase}": true
+    }
+  end
+
   def autocomplete_data_sources(object, noteable_type)
     return {} unless object && noteable_type
 

app/views/layouts/_init_client_detection_flags.html.haml

+- client = client_js_flags
+
+- if client
+  -# haml-lint:disable InlineJavaScript
+  :javascript
+    gl = window.gl || {};
+    gl.client = #{client.to_json};

app/views/layouts/application.html.haml

 !!! 5
 %html{ lang: I18n.locale, class: page_class }
   = render "layouts/head"
-  %body{ class: "#{user_application_theme} #{@body_class}", data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}", find_file: find_file_path } }
+  %body{ class: "#{user_application_theme} #{@body_class} #{client_class_list}", data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}", find_file: find_file_path } }
     = render "layouts/init_auto_complete" if @gfm_form
+    = render "layouts/init_client_detection_flags"
     = render 'peek/bar'
     = header_message
     = render  partial: "layouts/header/default", locals: { project: @project, group: @group }

changelogs/unreleased/50013-add-browser-platform-flags.yml

+---
+title: Add CSS & JS global flags to represent browser and platform
+merge_request: 24017
+author:
+type: other

doc/development/testing_guide/flaky_tests.md

@@ -7,16 +7,37 @@ eventually.
 
 ## Quarantined tests
 
-Tests can be put in quarantine by assigning `:quarantine` metadata. This means
-they will be skipped unless run with `--tag quarantine`. This can be used for
-tests that are expected to fail while a fix is in progress (similar to how
-[`skip` or `pending`](https://relishapp.com/rspec/rspec-core/v/3-8/docs/pending-and-skipped-examples)
- can be used).
+When a test frequently fails in `master`,
+[a ~"broken master" issue](https://about.gitlab.com/handbook/engineering/workflow/#broken-master)
+should be created.
+If the test cannot be fixed in a timely fashion, there is an impact on the
+productivity of all the developers, so it should be placed in quarantine by
+assigning the `:quarantine` metadata.
 
-```
+This means it will be skipped unless run with `--tag quarantine`:
+
+```shell
 bin/rspec --tag quarantine
 ```
 
+**Before putting a test in quarantine, you should make sure that a
+~"broken master" issue exists for it so it won't stay in quarantine forever.**
+
+Once a test is in quarantine, there are 3 choices:
+
+- Should the test be fixed (i.e. get rid of its flakiness)?
+- Should the test be moved to a lower level of testing?
+- Should the test be removed entirely (e.g. because there's already a
+  lower-level test, or it's duplicating another same-level test, or it's testing
+  too much etc.)?
+
+### Quarantine tests on the CI
+
+Quarantined tests are run on the CI in dedicated jobs that are allowed to fail:
+
+- `rspec-pg-quarantine` and `rspec-mysql-quarantine` (CE & EE)
+- `rspec-pg-quarantine-ee` and `rspec-mysql-quarantine-ee` (EE only)
+
 ## Automatic retries and flaky tests detection
 
 On our CI, we use [rspec-retry] to automatically retry a failing example a few

spec/helpers/application_helper_spec.rb

@@ -168,6 +168,21 @@ describe ApplicationHelper do
     end
   end
 
+  describe '#client_class_list' do
+    it 'returns string containing CSS classes representing client browser and platform' do
+      class_list = helper.client_class_list
+      expect(class_list).to eq('gl-browser-generic gl-platform-other')
+    end
+  end
+
+  describe '#client_js_flags' do
+    it 'returns map containing JS flags representing client browser and platform' do
+      flags_list = helper.client_js_flags
+      expect(flags_list[:isGeneric]).to eq(true)
+      expect(flags_list[:isOther]).to eq(true)
+    end
+  end
+
   describe '#autocomplete_data_sources' do
     let(:project) { create(:project) }
     let(:noteable_type) { Issue }