diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-11 16:45:58 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-11 16:45:58 -0500 |
| commit | 44727525952f22c2234d2991e20f4f4f8bac3221 (patch) | |
| tree | c34babda3b6b6014f8a05870922fe8f4855983cf /app/controllers/application_controller.rb | |
| parent | 38a4f5cec6ab85525ab9db1d7d2669a77171f768 (diff) | |
| parent | 7998725e3c2557c04ceece028dd73a316a3a746c (diff) | |
| download | gitlab-ce-issue_14206.tar.gz | |
Merge branch 'master' into issue_14206issue_14206
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c81cb85dc1b..97d53acde94 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -47,6 +47,16 @@ class ApplicationController < ActionController::Base email: current_user.email, username: current_user.username, ) + + Raven.tags_context(program: sentry_program_context) + end + end + + def sentry_program_context + if Sidekiq.server? + 'sidekiq' + else + 'rails' end end |