diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-30 14:40:21 +0300 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-08 13:11:22 +0300 |
| commit | 4d49b7dcf1c8575ccb6ef282fe97e4a610e574b8 (patch) | |
| tree | 0e46ceb1acfaadb13128184ae662abbc31c0aadd /lib | |
| parent | 3c42294bb79fe349d655afee1dc2c0b39e22d556 (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 1e09cb5ca11..cad873b92a3 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 |