diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 15:07:56 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 15:07:56 +0300 |
commit | 045c0f9554a99c80d0a127540da168e272a9f977 (patch) | |
tree | 2c4b0d10c9432e68b6c1aca2097e663ba18b48ec /lib | |
parent | 669c24d9276db9a73bbcea40aeab98273aae9e5e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/cycle_analytics/production_stage.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/gon_helper.rb | 1 | ||||
-rw-r--r-- | lib/sentry/client.rb | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/gitlab/cycle_analytics/production_stage.rb b/lib/gitlab/cycle_analytics/production_stage.rb index 6fd7214dce7..d5f2e868606 100644 --- a/lib/gitlab/cycle_analytics/production_stage.rb +++ b/lib/gitlab/cycle_analytics/production_stage.rb @@ -18,7 +18,7 @@ module Gitlab end def title - s_('CycleAnalyticsStage|Production') + s_('CycleAnalyticsStage|Total') end def legend diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index f22c69c531a..2e27e954e79 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -28,6 +28,7 @@ module Gitlab gon.sprite_file_icons = IconsHelper.sprite_file_icons_path gon.emoji_sprites_css_path = ActionController::Base.helpers.stylesheet_path('emoji_sprites') gon.test_env = Rails.env.test? + gon.disable_animations = Gitlab.config.gitlab['disable_animations'] gon.suggested_label_colors = LabelsHelper.suggested_colors gon.first_day_of_week = current_user&.first_day_of_week || Gitlab::CurrentSettings.first_day_of_week gon.ee = Gitlab.ee? diff --git a/lib/sentry/client.rb b/lib/sentry/client.rb index dd589b6194d..65bedbf9e0f 100644 --- a/lib/sentry/client.rb +++ b/lib/sentry/client.rb @@ -187,13 +187,13 @@ module Sentry def parse_stack_trace(event) exception_entry = event.dig('entries')&.detect { |h| h['type'] == 'exception' } - return unless exception_entry + return [] unless exception_entry exception_values = exception_entry.dig('data', 'values') stack_trace_entry = exception_values&.detect { |h| h['stacktrace'].present? } - return unless stack_trace_entry + return [] unless stack_trace_entry - stack_trace_entry.dig('stacktrace', 'frames') + stack_trace_entry.dig('stacktrace', 'frames') || [] end def map_to_error(issue) |