diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-01-22 10:15:03 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-01-22 10:15:03 +0000 |
| commit | 03def93b7679f86ecd4d31eeeaa5bf70784da8e3 (patch) | |
| tree | 706962189d1039ab8eeefcf7c617eb7cc89c67d3 /app | |
| parent | 3de51c11b5835527ab0cc618a43da1d2f17e4169 (diff) | |
| parent | 6c1e0cc5e927132ed62914d0ee2ab4881bc9d132 (diff) | |
| download | gitlab-ce-03def93b7679f86ecd4d31eeeaa5bf70784da8e3.tar.gz | |
Merge branch '50013-add-browser-platform-flags' into 'master'
Add CSS & JS global flags to represent browser and platform
Closes #50013
See merge request gitlab-org/gitlab-ce!24017
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 11 | ||||
| -rw-r--r-- | app/views/layouts/_init_client_detection_flags.html.haml | 7 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 3 |
3 files changed, 20 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 82bb2d1a805..9efa84b02f0 100644 --- a/app/helpers/application_helper.rb +++ b/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 diff --git a/app/views/layouts/_init_client_detection_flags.html.haml b/app/views/layouts/_init_client_detection_flags.html.haml new file mode 100644 index 00000000000..c729f8aa696 --- /dev/null +++ b/app/views/layouts/_init_client_detection_flags.html.haml @@ -0,0 +1,7 @@ +- client = client_js_flags + +- if client + -# haml-lint:disable InlineJavaScript + :javascript + gl = window.gl || {}; + gl.client = #{client.to_json}; diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 1f4d24d996c..4373240001e 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,8 +1,9 @@ !!! 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' = render partial: "layouts/header/default", locals: { project: @project, group: @group } = render 'layouts/page', sidebar: sidebar, nav: nav |