diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-30 14:40:21 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-05-30 14:40:21 +0300 |
| commit | ebd6e5f351a53b55e15631f01d1bc96ff04e4065 (patch) | |
| tree | fd51a190cb3e1d3605dc4bb4865754c29b062c70 /lib | |
| parent | ffe52f0143a222350c8356084215ff5e502ead20 (diff) | |
| parent | 13dd82b5de6a2076f33defc9f12bc05f98891423 (diff) | |
Merge branch '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone' into 'master'
Resolve "Browser notifications for pipeline running in a MR is gone"
Closes #32916
See merge request !11734
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gon_helper.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index 21f2e6b6970..319633656ff 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -1,3 +1,5 @@ +# rubocop:disable Metrics/AbcSize + module Gitlab module GonHelper def add_gon_variables @@ -13,6 +15,7 @@ module Gitlab gon.sentry_dsn = current_application_settings.clientside_sentry_dsn if current_application_settings.clientside_sentry_enabled gon.gitlab_url = Gitlab.config.gitlab.url gon.revision = Gitlab::REVISION + gon.gitlab_logo = ActionController::Base.helpers.asset_path('gitlab_logo.png') if current_user gon.current_user_id = current_user.id |