summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab/ci/rails.gitlab-ci.yml2
-rw-r--r--README.md2
-rw-r--r--app/assets/javascripts/releases/list/components/release_block.vue183
-rw-r--r--app/assets/javascripts/releases/list/components/release_block_assets.vue65
-rw-r--r--app/assets/javascripts/releases/list/components/release_block_author.vue42
-rw-r--r--app/assets/javascripts/releases/list/components/release_block_header.vue47
-rw-r--r--app/assets/javascripts/releases/list/components/release_block_metadata.vue84
-rw-r--r--app/assets/javascripts/releases/list/components/release_block_milestones.vue51
-rw-r--r--changelogs/unreleased/ruby-2-6-5-source.yml5
-rw-r--r--doc/administration/logs.md2
-rw-r--r--doc/administration/monitoring/prometheus/gitlab_metrics.md2
-rw-r--r--doc/development/pipelines.md4
-rw-r--r--doc/install/installation.md6
-rw-r--r--doc/update/upgrading_from_source.md6
-rw-r--r--lib/gitlab/usage_data.rb4
-rw-r--r--qa/qa/fixtures/auto_devops_rack/Dockerfile2
-rw-r--r--spec/fixtures/sentry/issue_latest_event_no_stack_sample_response.json4
-rw-r--r--spec/fixtures/sentry/issue_latest_event_sample_response.json212
-rw-r--r--spec/frontend/jobs/components/log/mock_data.js2
-rw-r--r--spec/lib/gitlab/usage_data_spec.rb6
20 files changed, 437 insertions, 294 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 885fd109227..8c3df170f6d 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -273,7 +273,7 @@ static-analysis:
script:
- scripts/static-analysis
cache:
- key: "debian-stretch-ruby-2.6.3-and-rubocop"
+ key: "debian-stretch-ruby-2.6-and-rubocop"
paths:
- vendor/ruby
- tmp/rubocop_cache
diff --git a/README.md b/README.md
index 95a2192a375..b3b66959884 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ Instructions on how to start GitLab and how to run the tests can be found in the
GitLab is a Ruby on Rails application that runs on the following software:
- Ubuntu/Debian/CentOS/RHEL/OpenSUSE
-- Ruby (MRI) 2.6.3
+- Ruby (MRI) 2.6.5
- Git 2.8.4+
- Redis 2.8+
- PostgreSQL (preferred) or MySQL
diff --git a/app/assets/javascripts/releases/list/components/release_block.vue b/app/assets/javascripts/releases/list/components/release_block.vue
index d5621808ed7..d924b5795f0 100644
--- a/app/assets/javascripts/releases/list/components/release_block.vue
+++ b/app/assets/javascripts/releases/list/components/release_block.vue
@@ -1,34 +1,27 @@
<script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
import _ from 'underscore';
-import { GlTooltipDirective, GlLink, GlBadge } from '@gitlab/ui';
-import Icon from '~/vue_shared/components/icon.vue';
-import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
-import timeagoMixin from '~/vue_shared/mixins/timeago';
-import { __, n__, sprintf } from '~/locale';
import { slugify } from '~/lib/utils/text_utility';
import { getLocationHash } from '~/lib/utils/url_utility';
import { scrollToElement } from '~/lib/utils/common_utils';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import ReleaseBlockFooter from './release_block_footer.vue';
import EvidenceBlock from './evidence_block.vue';
+import ReleaseBlockAssets from './release_block_assets.vue';
+import ReleaseBlockFooter from './release_block_footer.vue';
+import ReleaseBlockHeader from './release_block_header.vue';
+import ReleaseBlockMetadata from './release_block_metadata.vue';
import ReleaseBlockMilestoneInfo from './release_block_milestone_info.vue';
export default {
name: 'ReleaseBlock',
components: {
EvidenceBlock,
- GlLink,
- GlBadge,
- Icon,
- UserAvatarLink,
+ ReleaseBlockAssets,
ReleaseBlockFooter,
+ ReleaseBlockHeader,
+ ReleaseBlockMetadata,
ReleaseBlockMilestoneInfo,
},
- directives: {
- GlTooltip: GlTooltipDirective,
- },
- mixins: [timeagoMixin, glFeatureFlagsMixin()],
+ mixins: [glFeatureFlagsMixin()],
props: {
release: {
type: Object,
@@ -45,45 +38,14 @@ export default {
id() {
return slugify(this.release.tag_name);
},
- releasedTimeAgo() {
- return sprintf(__('released %{time}'), {
- time: this.timeFormatted(this.release.released_at),
- });
- },
- userImageAltDescription() {
- return this.author && this.author.username
- ? sprintf(__("%{username}'s avatar"), { username: this.author.username })
- : null;
- },
- commit() {
- return this.release.commit || {};
- },
- commitUrl() {
- return this.release.commit_path;
- },
- tagUrl() {
- return this.release.tag_path;
- },
assets() {
return this.release.assets || {};
},
- author() {
- return this.release.author || {};
- },
- hasAuthor() {
- return !_.isEmpty(this.author);
- },
hasEvidence() {
return Boolean(this.release.evidence_sha);
},
- shouldRenderMilestones() {
- return !_.isEmpty(this.release.milestones);
- },
- labelText() {
- return n__('Milestone', 'Milestones', this.release.milestones.length);
- },
- shouldShowEditButton() {
- return Boolean(this.release._links && this.release._links.edit_url);
+ milestones() {
+ return this.release.milestones || [];
},
shouldShowEvidence() {
return this.glFeatures.releaseEvidenceCollection;
@@ -91,6 +53,11 @@ export default {
shouldShowFooter() {
return this.glFeatures.releaseIssueSummary;
},
+ shouldRenderAssets() {
+ return Boolean(
+ this.assets.links.length || (this.assets.sources && this.assets.sources.length),
+ );
+ },
shouldRenderReleaseMetaData() {
return !this.glFeatures.releaseIssueSummary;
},
@@ -113,127 +80,15 @@ export default {
</script>
<template>
<div :id="id" :class="{ 'bg-line-target-blue': isHighlighted }" class="card release-block">
- <div class="card-header d-flex align-items-center bg-white pr-0">
- <h2 class="card-title my-2 mr-auto gl-font-size-20">
- {{ release.name }}
- <gl-badge v-if="release.upcoming_release" variant="warning" class="align-middle">{{
- __('Upcoming Release')
- }}</gl-badge>
- </h2>
- <gl-link
- v-if="shouldShowEditButton"
- v-gl-tooltip
- class="btn btn-default append-right-10 js-edit-button ml-2"
- :title="__('Edit this release')"
- :href="release._links.edit_url"
- >
- <icon name="pencil" />
- </gl-link>
- </div>
+ <release-block-header :release="release" />
<div class="card-body">
<div v-if="shouldRenderMilestoneInfo">
- <release-block-milestone-info :milestones="release.milestones" />
+ <release-block-milestone-info :milestones="milestones" />
<hr class="mb-3 mt-0" />
</div>
- <div v-if="shouldRenderReleaseMetaData" class="card-subtitle d-flex flex-wrap text-secondary">
- <div class="append-right-8">
- <icon name="commit" class="align-middle" />
- <gl-link v-if="commitUrl" v-gl-tooltip.bottom :title="commit.title" :href="commitUrl">
- {{ commit.short_id }}
- </gl-link>
- <span v-else v-gl-tooltip.bottom :title="commit.title">{{ commit.short_id }}</span>
- </div>
-
- <div class="append-right-8">
- <icon name="tag" class="align-middle" />
- <gl-link v-if="tagUrl" v-gl-tooltip.bottom :title="__('Tag')" :href="tagUrl">
- {{ release.tag_name }}
- </gl-link>
- <span v-else v-gl-tooltip.bottom :title="__('Tag')">{{ release.tag_name }}</span>
- </div>
-
- <template v-if="shouldRenderMilestones">
- <div class="js-milestone-list-label">
- <icon name="flag" class="align-middle" />
- <span class="js-label-text">{{ labelText }}</span>
- </div>
-
- <template v-for="(milestone, index) in release.milestones">
- <gl-link
- :key="milestone.id"
- v-gl-tooltip
- :title="milestone.description"
- :href="milestone.web_url"
- class="append-right-4 prepend-left-4 js-milestone-link"
- >
- {{ milestone.title }}
- </gl-link>
- <template v-if="index !== release.milestones.length - 1">
- &bull;
- </template>
- </template>
- </template>
-
- <div class="append-right-4">
- &bull;
- <span v-gl-tooltip.bottom :title="tooltipTitle(release.released_at)">
- {{ releasedTimeAgo }}
- </span>
- </div>
-
- <div v-if="hasAuthor" class="d-flex">
- by
- <user-avatar-link
- class="prepend-left-4"
- :link-href="author.web_url"
- :img-src="author.avatar_url"
- :img-alt="userImageAltDescription"
- :tooltip-text="author.username"
- />
- </div>
- </div>
-
- <div
- v-if="assets.links.length || (assets.sources && assets.sources.length)"
- class="card-text prepend-top-default"
- >
- <b>
- {{ __('Assets') }}
- <span class="js-assets-count badge badge-pill">{{ assets.count }}</span>
- </b>
-
- <ul v-if="assets.links.length" class="pl-0 mb-0 prepend-top-8 list-unstyled js-assets-list">
- <li v-for="link in assets.links" :key="link.name" class="append-bottom-8">
- <gl-link v-gl-tooltip.bottom :title="__('Download asset')" :href="link.url">
- <icon name="package" class="align-middle append-right-4 align-text-bottom" />
- {{ link.name }}
- <span v-if="link.external">{{ __('(external source)') }}</span>
- </gl-link>
- </li>
- </ul>
-
- <div v-if="assets.sources && assets.sources.length" class="dropdown">
- <button
- type="button"
- class="btn btn-link"
- data-toggle="dropdown"
- aria-haspopup="true"
- aria-expanded="false"
- >
- <icon name="doc-code" class="align-top append-right-4" />
- {{ __('Source code') }}
- <icon name="arrow-down" />
- </button>
-
- <div class="js-sources-dropdown dropdown-menu">
- <li v-for="asset in assets.sources" :key="asset.url">
- <gl-link :href="asset.url">{{ __('Download') }} {{ asset.format }}</gl-link>
- </li>
- </div>
- </div>
- </div>
-
+ <release-block-metadata v-if="shouldRenderReleaseMetaData" :release="release" />
+ <release-block-assets v-if="shouldRenderAssets" :assets="assets" />
<evidence-block v-if="hasEvidence && shouldShowEvidence" :release="release" />
<div class="card-text prepend-top-default">
diff --git a/app/assets/javascripts/releases/list/components/release_block_assets.vue b/app/assets/javascripts/releases/list/components/release_block_assets.vue
new file mode 100644
index 00000000000..e840bc90d68
--- /dev/null
+++ b/app/assets/javascripts/releases/list/components/release_block_assets.vue
@@ -0,0 +1,65 @@
+<script>
+import { GlTooltipDirective, GlLink } from '@gitlab/ui';
+import Icon from '~/vue_shared/components/icon.vue';
+
+export default {
+ name: 'ReleaseBlockAssets',
+ components: {
+ GlLink,
+ Icon,
+ },
+ directives: {
+ GlTooltip: GlTooltipDirective,
+ },
+ props: {
+ assets: {
+ type: Object,
+ required: true,
+ },
+ },
+ computed: {
+ hasAssets() {
+ return Boolean(this.assets.count);
+ },
+ },
+};
+</script>
+
+<template>
+ <div class="card-text prepend-top-default">
+ <b>
+ {{ __('Assets') }}
+ <span class="js-assets-count badge badge-pill">{{ assets.count }}</span>
+ </b>
+
+ <ul v-if="assets.links.length" class="pl-0 mb-0 prepend-top-8 list-unstyled js-assets-list">
+ <li v-for="link in assets.links" :key="link.name" class="append-bottom-8">
+ <gl-link v-gl-tooltip.bottom :title="__('Download asset')" :href="link.url">
+ <icon name="package" class="align-middle append-right-4 align-text-bottom" />
+ {{ link.name }}
+ <span v-if="link.external">{{ __('(external source)') }}</span>
+ </gl-link>
+ </li>
+ </ul>
+
+ <div v-if="hasAssets" class="dropdown">
+ <button
+ type="button"
+ class="btn btn-link"
+ data-toggle="dropdown"
+ aria-haspopup="true"
+ aria-expanded="false"
+ >
+ <icon name="doc-code" class="align-top append-right-4" />
+ {{ __('Source code') }}
+ <icon name="arrow-down" />
+ </button>
+
+ <div class="js-sources-dropdown dropdown-menu">
+ <li v-for="asset in assets.sources" :key="asset.url">
+ <gl-link :href="asset.url">{{ __('Download') }} {{ asset.format }}</gl-link>
+ </li>
+ </div>
+ </div>
+ </div>
+</template>
diff --git a/app/assets/javascripts/releases/list/components/release_block_author.vue b/app/assets/javascripts/releases/list/components/release_block_author.vue
new file mode 100644
index 00000000000..ff6b00d8221
--- /dev/null
+++ b/app/assets/javascripts/releases/list/components/release_block_author.vue
@@ -0,0 +1,42 @@
+<script>
+import { __, sprintf } from '~/locale';
+import { GlSprintf } from '@gitlab/ui';
+import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
+
+export default {
+ name: 'ReleaseBlockAuthor',
+ components: {
+ GlSprintf,
+ UserAvatarLink,
+ },
+ props: {
+ author: {
+ type: Object,
+ required: true,
+ },
+ },
+ computed: {
+ userImageAltDescription() {
+ return this.author && this.author.username
+ ? sprintf(__("%{username}'s avatar"), { username: this.author.username })
+ : null;
+ },
+ },
+};
+</script>
+
+<template>
+ <div class="d-flex">
+ <gl-sprintf message="by %{user}">
+ <template #user>
+ <user-avatar-link
+ class="prepend-left-4"
+ :link-href="author.web_url"
+ :img-src="author.avatar_url"
+ :img-alt="userImageAltDescription"
+ :tooltip-text="author.username"
+ />
+ </template>
+ </gl-sprintf>
+ </div>
+</template>
diff --git a/app/assets/javascripts/releases/list/components/release_block_header.vue b/app/assets/javascripts/releases/list/components/release_block_header.vue
new file mode 100644
index 00000000000..9c5dcf2a709
--- /dev/null
+++ b/app/assets/javascripts/releases/list/components/release_block_header.vue
@@ -0,0 +1,47 @@
+<script>
+import { GlTooltipDirective, GlLink, GlBadge } from '@gitlab/ui';
+import Icon from '~/vue_shared/components/icon.vue';
+
+export default {
+ name: 'ReleaseBlockHeader',
+ components: {
+ GlLink,
+ GlBadge,
+ Icon,
+ },
+ directives: {
+ GlTooltip: GlTooltipDirective,
+ },
+ props: {
+ release: {
+ type: Object,
+ required: true,
+ },
+ },
+ computed: {
+ shouldShowEditButton() {
+ return Boolean(this.release._links && this.release._links.edit_url);
+ },
+ },
+};
+</script>
+
+<template>
+ <div class="card-header d-flex align-items-center bg-white pr-0">
+ <h2 class="card-title my-2 mr-auto gl-font-size-20">
+ {{ release.name }}
+ <gl-badge v-if="release.upcoming_release" variant="warning" class="align-middle">{{
+ __('Upcoming Release')
+ }}</gl-badge>
+ </h2>
+ <gl-link
+ v-if="shouldShowEditButton"
+ v-gl-tooltip
+ class="btn btn-default append-right-10 js-edit-button ml-2"
+ :title="__('Edit this release')"
+ :href="release._links.edit_url"
+ >
+ <icon name="pencil" />
+ </gl-link>
+ </div>
+</template>
diff --git a/app/assets/javascripts/releases/list/components/release_block_metadata.vue b/app/assets/javascripts/releases/list/components/release_block_metadata.vue
new file mode 100644
index 00000000000..f0aad594062
--- /dev/null
+++ b/app/assets/javascripts/releases/list/components/release_block_metadata.vue
@@ -0,0 +1,84 @@
+<script>
+import { GlTooltipDirective, GlLink } from '@gitlab/ui';
+import { __, sprintf } from '~/locale';
+import Icon from '~/vue_shared/components/icon.vue';
+import timeagoMixin from '~/vue_shared/mixins/timeago';
+import ReleaseBlockAuthor from './release_block_author.vue';
+import ReleaseBlockMilestones from './release_block_milestones.vue';
+
+export default {
+ name: 'ReleaseBlockMetadata',
+ components: {
+ Icon,
+ GlLink,
+ ReleaseBlockAuthor,
+ ReleaseBlockMilestones,
+ },
+ directives: {
+ GlTooltip: GlTooltipDirective,
+ },
+ mixins: [timeagoMixin],
+ props: {
+ release: {
+ type: Object,
+ required: true,
+ },
+ },
+ computed: {
+ author() {
+ return this.release.author;
+ },
+ commit() {
+ return this.release.commit || {};
+ },
+ commitUrl() {
+ return this.release.commit_path;
+ },
+ hasAuthor() {
+ return Boolean(this.author);
+ },
+ releasedTimeAgo() {
+ return sprintf(__('released %{time}'), {
+ time: this.timeFormatted(this.release.released_at),
+ });
+ },
+ shouldRenderMilestones() {
+ return Boolean(this.release.milestones?.length);
+ },
+ tagUrl() {
+ return this.release.tag_path;
+ },
+ },
+};
+</script>
+
+<template>
+ <div class="card-subtitle d-flex flex-wrap text-secondary">
+ <div class="append-right-8">
+ <icon name="commit" class="align-middle" />
+ <gl-link v-if="commitUrl" v-gl-tooltip.bottom :title="commit.title" :href="commitUrl">
+ {{ commit.short_id }}
+ </gl-link>
+ <span v-else v-gl-tooltip.bottom :title="commit.title">{{ commit.short_id }}</span>
+ </div>
+
+ <div class="append-right-8">
+ <icon name="tag" class="align-middle" />
+ <gl-link v-if="tagUrl" v-gl-tooltip.bottom :title="__('Tag')" :href="tagUrl">
+ {{ release.tag_name }}
+ </gl-link>
+ <span v-else v-gl-tooltip.bottom :title="__('Tag')">{{ release.tag_name }}</span>
+ </div>
+
+ <release-block-milestones v-if="shouldRenderMilestones" :milestones="release.milestones" />
+
+ <div class="append-right-4">
+ &bull;
+ <span v-gl-tooltip.bottom :title="tooltipTitle(release.released_at)">
+ {{ releasedTimeAgo }}
+ </span>
+ </div>
+
+ <release-block-author v-if="hasAuthor" :author="author" />
+ </div>
+</template>
diff --git a/app/assets/javascripts/releases/list/components/release_block_milestones.vue b/app/assets/javascripts/releases/list/components/release_block_milestones.vue
new file mode 100644
index 00000000000..a3dff75b828
--- /dev/null
+++ b/app/assets/javascripts/releases/list/components/release_block_milestones.vue
@@ -0,0 +1,51 @@
+<script>
+import { GlTooltipDirective, GlLink } from '@gitlab/ui';
+import { n__ } from '~/locale';
+import Icon from '~/vue_shared/components/icon.vue';
+
+export default {
+ name: 'ReleaseBlockMilestones',
+ components: {
+ GlLink,
+ Icon,
+ },
+ directives: {
+ GlTooltip: GlTooltipDirective,
+ },
+ props: {
+ milestones: {
+ type: Array,
+ required: true,
+ },
+ },
+ computed: {
+ labelText() {
+ return n__('Milestone', 'Milestones', this.milestones.length);
+ },
+ },
+};
+</script>
+
+<template>
+ <div>
+ <div class="js-milestone-list-label">
+ <icon name="flag" class="align-middle" />
+ <span class="js-label-text">{{ labelText }}</span>
+ </div>
+
+ <template v-for="(milestone, index) in milestones">
+ <gl-link
+ :key="milestone.id"
+ v-gl-tooltip
+ :title="milestone.description"
+ :href="milestone.web_url"
+ class="mx-1 js-milestone-link"
+ >
+ {{ milestone.title }}
+ </gl-link>
+ <template v-if="index !== milestones.length - 1">
+ &bull;
+ </template>
+ </template>
+ </div>
+</template>
diff --git a/changelogs/unreleased/ruby-2-6-5-source.yml b/changelogs/unreleased/ruby-2-6-5-source.yml
new file mode 100644
index 00000000000..53c27465118
--- /dev/null
+++ b/changelogs/unreleased/ruby-2-6-5-source.yml
@@ -0,0 +1,5 @@
+---
+title: Update Ruby to 2.6.5
+merge_request: 22417
+author:
+type: other
diff --git a/doc/administration/logs.md b/doc/administration/logs.md
index fab37248134..81a8f537e08 100644
--- a/doc/administration/logs.md
+++ b/doc/administration/logs.md
@@ -447,7 +447,7 @@ Each line contains a JSON line that can be ingested by Elasticsearch. For exampl
},
"runtime": {
"name": "ruby",
- "version": "ruby 2.6.3p62 (2019-04-16 revision 67580) [x86_64-darwin18]"
+ "version": "ruby 2.6.5p114 (2019-10-01 revision 67812) [x86_64-darwin18]"
}
},
"extra.project_id": 55,
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index 57048059476..1b542d95d21 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -157,7 +157,7 @@ Some basic Ruby runtime metrics are available:
| `ruby_process_resident_memory_bytes` | Gauge | 12.0 | Memory usage by process, measured in bytes |
| `ruby_process_start_time_seconds` | Gauge | 12.0 | UNIX timestamp of process start time |
-[GC.stat]: https://ruby-doc.org/core-2.6.3/GC.html#method-c-stat
+[GC.stat]: https://ruby-doc.org/core-2.6.5/GC.html#method-c-stat
## Unicorn Metrics
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index 32c89c28815..1269087c38d 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -42,9 +42,9 @@ The current stages are:
## Default image
The default image is currently
-`registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33`.
+`registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33`.
-It includes Ruby 2.6.3, Go 1.12, Git 2.24, Git LFS 2.9, Chrome 73, Node 12, Yarn 1.16,
+It includes Ruby 2.6.5, Go 1.12, Git 2.24, Git LFS 2.9, Chrome 73, Node 12, Yarn 1.16,
PostgreSQL 9.6, and Graphics Magick 1.3.33.
The images used in our pipelines are configured in the
diff --git a/doc/install/installation.md b/doc/install/installation.md
index f8995617849..5cd8f98b2f3 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -224,9 +224,9 @@ Download Ruby and compile it:
```sh
mkdir /tmp/ruby && cd /tmp/ruby
-curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.3.tar.gz
-echo '2347ed6ca5490a104ebd5684d2b9b5eefa6cd33c ruby-2.6.3.tar.gz' | shasum -c - && tar xzf ruby-2.6.3.tar.gz
-cd ruby-2.6.3
+curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.5.tar.gz
+echo '1416ce288fb8bfeae07a12b608540318c9cace71 ruby-2.6.5.tar.gz' | shasum -c - && tar xzf ruby-2.6.5.tar.gz
+cd ruby-2.6.5
./configure --disable-install-rdoc
make
diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md
index 662701dbb56..4157b4f7bc5 100644
--- a/doc/update/upgrading_from_source.md
+++ b/doc/update/upgrading_from_source.md
@@ -56,9 +56,9 @@ Download Ruby and compile it:
```bash
mkdir /tmp/ruby && cd /tmp/ruby
-curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.3.tar.gz
-echo '2347ed6ca5490a104ebd5684d2b9b5eefa6cd33c ruby-2.6.3.tar.gz' | shasum -c - && tar xzf ruby-2.6.3.tar.gz
-cd ruby-2.6.3
+curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.5.tar.gz
+echo '1416ce288fb8bfeae07a12b608540318c9cace71 ruby-2.6.5.tar.gz' | shasum -c - && tar xzf ruby-2.6.5.tar.gz
+cd ruby-2.6.5
./configure --disable-install-rdoc
make
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 0753b2edb6f..b200596a500 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -228,8 +228,8 @@ module Gitlab
{} # augmented in EE
end
- def count(relation, count_by: nil, fallback: -1)
- count_by ? relation.count(count_by) : relation.count
+ def count(relation, fallback: -1)
+ relation.count
rescue ActiveRecord::StatementInvalid
fallback
end
diff --git a/qa/qa/fixtures/auto_devops_rack/Dockerfile b/qa/qa/fixtures/auto_devops_rack/Dockerfile
index 1f59c23ea88..6ab2795dd40 100644
--- a/qa/qa/fixtures/auto_devops_rack/Dockerfile
+++ b/qa/qa/fixtures/auto_devops_rack/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.6.3-alpine
+FROM ruby:2.6.5-alpine
ADD ./ /app/
WORKDIR /app
ENV RACK_ENV production
diff --git a/spec/fixtures/sentry/issue_latest_event_no_stack_sample_response.json b/spec/fixtures/sentry/issue_latest_event_no_stack_sample_response.json
index 8ac446ae04e..c0860ebbbd8 100644
--- a/spec/fixtures/sentry/issue_latest_event_no_stack_sample_response.json
+++ b/spec/fixtures/sentry/issue_latest_event_no_stack_sample_response.json
@@ -261,7 +261,7 @@
"context": {
"server": {
"runtime": {
- "version": "ruby 2.6.3p62 (2019-04-16 revision 67580) [x86_64-darwin18]",
+ "version": "ruby 2.6.5p114 (2019-10-01 revision 67812) [x86_64-darwin18]",
"name": "ruby"
},
"os": {
@@ -297,4 +297,4 @@
]
},
"groupID": "1378364652"
-} \ No newline at end of file
+}
diff --git a/spec/fixtures/sentry/issue_latest_event_sample_response.json b/spec/fixtures/sentry/issue_latest_event_sample_response.json
index c924022dffb..f047eb07e1f 100644
--- a/spec/fixtures/sentry/issue_latest_event_sample_response.json
+++ b/spec/fixtures/sentry/issue_latest_event_sample_response.json
@@ -132,7 +132,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/puma-3.12.1/lib/puma/thread_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/puma-3.12.1/lib/puma/thread_pool.rb",
"inApp": false,
"lineNo": 135,
"module": null,
@@ -180,7 +180,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/puma-3.12.1/lib/puma/server.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/puma-3.12.1/lib/puma/server.rb",
"inApp": false,
"lineNo": 334,
"module": null,
@@ -228,7 +228,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/puma-3.12.1/lib/puma/server.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/puma-3.12.1/lib/puma/server.rb",
"inApp": false,
"lineNo": 474,
"module": null,
@@ -276,7 +276,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/puma-3.12.1/lib/puma/server.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/puma-3.12.1/lib/puma/server.rb",
"inApp": false,
"lineNo": 660,
"module": null,
@@ -324,7 +324,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/puma-3.12.1/lib/puma/configuration.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/puma-3.12.1/lib/puma/configuration.rb",
"inApp": false,
"lineNo": 227,
"module": null,
@@ -372,7 +372,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/collector.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/collector.rb",
"inApp": false,
"lineNo": 24,
"module": null,
@@ -420,7 +420,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/collector.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/collector.rb",
"inApp": false,
"lineNo": 61,
"module": null,
@@ -468,7 +468,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/collector.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/collector.rb",
"inApp": false,
"lineNo": 24,
"module": null,
@@ -516,7 +516,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/exporter.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/exporter.rb",
"inApp": false,
"lineNo": 29,
"module": null,
@@ -564,7 +564,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/railties-5.2.3/lib/rails/engine.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/railties-5.2.3/lib/rails/engine.rb",
"inApp": false,
"lineNo": 524,
"module": null,
@@ -612,7 +612,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/sentry-raven-2.12.3/lib/raven/integrations/rack.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/sentry-raven-2.12.3/lib/raven/integrations/rack.rb",
"inApp": false,
"lineNo": 51,
"module": null,
@@ -660,7 +660,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/rack-2.0.7/lib/rack/sendfile.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/rack-2.0.7/lib/rack/sendfile.rb",
"inApp": false,
"lineNo": 111,
"module": null,
@@ -708,7 +708,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/static.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/static.rb",
"inApp": false,
"lineNo": 127,
"module": null,
@@ -756,7 +756,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/executor.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/executor.rb",
"inApp": false,
"lineNo": 14,
"module": null,
@@ -804,7 +804,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activesupport-5.2.3/lib/active_support/cache/strategy/local_cache_middleware.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activesupport-5.2.3/lib/active_support/cache/strategy/local_cache_middleware.rb",
"inApp": false,
"lineNo": 29,
"module": null,
@@ -852,7 +852,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/rack-2.0.7/lib/rack/runtime.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/rack-2.0.7/lib/rack/runtime.rb",
"inApp": false,
"lineNo": 22,
"module": null,
@@ -900,7 +900,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/rack-2.0.7/lib/rack/method_override.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/rack-2.0.7/lib/rack/method_override.rb",
"inApp": false,
"lineNo": 22,
"module": null,
@@ -948,7 +948,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/request_id.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/request_id.rb",
"inApp": false,
"lineNo": 27,
"module": null,
@@ -996,7 +996,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/remote_ip.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/remote_ip.rb",
"inApp": false,
"lineNo": 81,
"module": null,
@@ -1044,7 +1044,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/sprockets-rails-3.2.1/lib/sprockets/rails/quiet_assets.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/sprockets-rails-3.2.1/lib/sprockets/rails/quiet_assets.rb",
"inApp": false,
"lineNo": 13,
"module": null,
@@ -1092,7 +1092,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/railties-5.2.3/lib/rails/rack/logger.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/railties-5.2.3/lib/rails/rack/logger.rb",
"inApp": false,
"lineNo": 26,
"module": null,
@@ -1140,7 +1140,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activesupport-5.2.3/lib/active_support/tagged_logging.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activesupport-5.2.3/lib/active_support/tagged_logging.rb",
"inApp": false,
"lineNo": 71,
"module": null,
@@ -1188,7 +1188,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activesupport-5.2.3/lib/active_support/tagged_logging.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activesupport-5.2.3/lib/active_support/tagged_logging.rb",
"inApp": false,
"lineNo": 28,
"module": null,
@@ -1236,7 +1236,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activesupport-5.2.3/lib/active_support/tagged_logging.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activesupport-5.2.3/lib/active_support/tagged_logging.rb",
"inApp": false,
"lineNo": 71,
"module": null,
@@ -1284,7 +1284,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/railties-5.2.3/lib/rails/rack/logger.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/railties-5.2.3/lib/rails/rack/logger.rb",
"inApp": false,
"lineNo": 26,
"module": null,
@@ -1332,7 +1332,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/railties-5.2.3/lib/rails/rack/logger.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/railties-5.2.3/lib/rails/rack/logger.rb",
"inApp": false,
"lineNo": 38,
"module": null,
@@ -1356,7 +1356,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/show_exceptions.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/show_exceptions.rb",
"inApp": false,
"lineNo": 33,
"module": null,
@@ -1380,7 +1380,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/web-console-3.7.0/lib/web_console/middleware.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/web-console-3.7.0/lib/web_console/middleware.rb",
"inApp": false,
"lineNo": 20,
"module": null,
@@ -1404,7 +1404,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/web-console-3.7.0/lib/web_console/middleware.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/web-console-3.7.0/lib/web_console/middleware.rb",
"inApp": false,
"lineNo": 20,
"module": null,
@@ -1452,7 +1452,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/web-console-3.7.0/lib/web_console/middleware.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/web-console-3.7.0/lib/web_console/middleware.rb",
"inApp": false,
"lineNo": 30,
"module": null,
@@ -1500,7 +1500,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/web-console-3.7.0/lib/web_console/middleware.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/web-console-3.7.0/lib/web_console/middleware.rb",
"inApp": false,
"lineNo": 135,
"module": null,
@@ -1548,7 +1548,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/debug_exceptions.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/debug_exceptions.rb",
"inApp": false,
"lineNo": 61,
"module": null,
@@ -1596,7 +1596,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/executor.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/executor.rb",
"inApp": false,
"lineNo": 14,
"module": null,
@@ -1644,7 +1644,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/callbacks.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/callbacks.rb",
"inApp": false,
"lineNo": 26,
"module": null,
@@ -1692,7 +1692,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activesupport-5.2.3/lib/active_support/callbacks.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activesupport-5.2.3/lib/active_support/callbacks.rb",
"inApp": false,
"lineNo": 98,
"module": null,
@@ -1740,7 +1740,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/callbacks.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/callbacks.rb",
"inApp": false,
"lineNo": 28,
"module": null,
@@ -1788,7 +1788,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/migration.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/migration.rb",
"inApp": false,
"lineNo": 554,
"module": null,
@@ -1836,7 +1836,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_handling.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_handling.rb",
"inApp": false,
"lineNo": 90,
"module": null,
@@ -1884,7 +1884,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_handling.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_handling.rb",
"inApp": false,
"lineNo": 118,
"module": null,
@@ -1932,7 +1932,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 1014,
"module": null,
@@ -1980,7 +1980,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 382,
"module": null,
@@ -2028,7 +2028,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 523,
"module": null,
@@ -2076,7 +2076,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 795,
"module": null,
@@ -2124,7 +2124,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 834,
"module": null,
@@ -2172,7 +2172,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 855,
"module": null,
@@ -2220,7 +2220,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 811,
"module": null,
@@ -2268,7 +2268,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
"inApp": false,
"lineNo": 48,
"module": null,
@@ -2316,7 +2316,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
"inApp": false,
"lineNo": 48,
"module": null,
@@ -2364,7 +2364,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
"inApp": false,
"lineNo": 223,
"module": null,
@@ -2412,7 +2412,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
"inApp": false,
"lineNo": 692,
"module": null,
@@ -2460,7 +2460,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/pg-1.1.4/lib/pg.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/pg-1.1.4/lib/pg.rb",
"inApp": false,
"lineNo": 56,
"module": null,
@@ -2508,7 +2508,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/pg-1.1.4/lib/pg.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/pg-1.1.4/lib/pg.rb",
"inApp": false,
"lineNo": 56,
"module": null,
@@ -2556,7 +2556,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/pg-1.1.4/lib/pg.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/pg-1.1.4/lib/pg.rb",
"inApp": false,
"lineNo": 56,
"module": null,
@@ -2619,7 +2619,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/puma-3.12.1/lib/puma/thread_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/puma-3.12.1/lib/puma/thread_pool.rb",
"inApp": false,
"lineNo": 135,
"module": null,
@@ -2667,7 +2667,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/puma-3.12.1/lib/puma/server.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/puma-3.12.1/lib/puma/server.rb",
"inApp": false,
"lineNo": 334,
"module": null,
@@ -2715,7 +2715,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/puma-3.12.1/lib/puma/server.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/puma-3.12.1/lib/puma/server.rb",
"inApp": false,
"lineNo": 474,
"module": null,
@@ -2763,7 +2763,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/puma-3.12.1/lib/puma/server.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/puma-3.12.1/lib/puma/server.rb",
"inApp": false,
"lineNo": 660,
"module": null,
@@ -2811,7 +2811,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/puma-3.12.1/lib/puma/configuration.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/puma-3.12.1/lib/puma/configuration.rb",
"inApp": false,
"lineNo": 227,
"module": null,
@@ -2859,7 +2859,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/collector.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/collector.rb",
"inApp": false,
"lineNo": 24,
"module": null,
@@ -2907,7 +2907,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/collector.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/collector.rb",
"inApp": false,
"lineNo": 61,
"module": null,
@@ -2955,7 +2955,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/collector.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/collector.rb",
"inApp": false,
"lineNo": 24,
"module": null,
@@ -3003,7 +3003,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/exporter.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/prometheus-client-mmap-0.9.8/lib/prometheus/client/rack/exporter.rb",
"inApp": false,
"lineNo": 29,
"module": null,
@@ -3051,7 +3051,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/railties-5.2.3/lib/rails/engine.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/railties-5.2.3/lib/rails/engine.rb",
"inApp": false,
"lineNo": 524,
"module": null,
@@ -3099,7 +3099,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/sentry-raven-2.12.3/lib/raven/integrations/rack.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/sentry-raven-2.12.3/lib/raven/integrations/rack.rb",
"inApp": false,
"lineNo": 51,
"module": null,
@@ -3147,7 +3147,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/rack-2.0.7/lib/rack/sendfile.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/rack-2.0.7/lib/rack/sendfile.rb",
"inApp": false,
"lineNo": 111,
"module": null,
@@ -3195,7 +3195,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/static.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/static.rb",
"inApp": false,
"lineNo": 127,
"module": null,
@@ -3243,7 +3243,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/executor.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/executor.rb",
"inApp": false,
"lineNo": 14,
"module": null,
@@ -3291,7 +3291,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activesupport-5.2.3/lib/active_support/cache/strategy/local_cache_middleware.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activesupport-5.2.3/lib/active_support/cache/strategy/local_cache_middleware.rb",
"inApp": false,
"lineNo": 29,
"module": null,
@@ -3339,7 +3339,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/rack-2.0.7/lib/rack/runtime.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/rack-2.0.7/lib/rack/runtime.rb",
"inApp": false,
"lineNo": 22,
"module": null,
@@ -3387,7 +3387,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/rack-2.0.7/lib/rack/method_override.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/rack-2.0.7/lib/rack/method_override.rb",
"inApp": false,
"lineNo": 22,
"module": null,
@@ -3435,7 +3435,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/request_id.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/request_id.rb",
"inApp": false,
"lineNo": 27,
"module": null,
@@ -3483,7 +3483,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/remote_ip.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/remote_ip.rb",
"inApp": false,
"lineNo": 81,
"module": null,
@@ -3531,7 +3531,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/sprockets-rails-3.2.1/lib/sprockets/rails/quiet_assets.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/sprockets-rails-3.2.1/lib/sprockets/rails/quiet_assets.rb",
"inApp": false,
"lineNo": 13,
"module": null,
@@ -3579,7 +3579,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/railties-5.2.3/lib/rails/rack/logger.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/railties-5.2.3/lib/rails/rack/logger.rb",
"inApp": false,
"lineNo": 26,
"module": null,
@@ -3627,7 +3627,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activesupport-5.2.3/lib/active_support/tagged_logging.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activesupport-5.2.3/lib/active_support/tagged_logging.rb",
"inApp": false,
"lineNo": 71,
"module": null,
@@ -3675,7 +3675,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activesupport-5.2.3/lib/active_support/tagged_logging.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activesupport-5.2.3/lib/active_support/tagged_logging.rb",
"inApp": false,
"lineNo": 28,
"module": null,
@@ -3723,7 +3723,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activesupport-5.2.3/lib/active_support/tagged_logging.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activesupport-5.2.3/lib/active_support/tagged_logging.rb",
"inApp": false,
"lineNo": 71,
"module": null,
@@ -3771,7 +3771,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/railties-5.2.3/lib/rails/rack/logger.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/railties-5.2.3/lib/rails/rack/logger.rb",
"inApp": false,
"lineNo": 26,
"module": null,
@@ -3819,7 +3819,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/railties-5.2.3/lib/rails/rack/logger.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/railties-5.2.3/lib/rails/rack/logger.rb",
"inApp": false,
"lineNo": 38,
"module": null,
@@ -3843,7 +3843,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/show_exceptions.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/show_exceptions.rb",
"inApp": false,
"lineNo": 33,
"module": null,
@@ -3891,7 +3891,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/web-console-3.7.0/lib/web_console/middleware.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/web-console-3.7.0/lib/web_console/middleware.rb",
"inApp": false,
"lineNo": 20,
"module": null,
@@ -3939,7 +3939,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/web-console-3.7.0/lib/web_console/middleware.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/web-console-3.7.0/lib/web_console/middleware.rb",
"inApp": false,
"lineNo": 20,
"module": null,
@@ -3987,7 +3987,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/web-console-3.7.0/lib/web_console/middleware.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/web-console-3.7.0/lib/web_console/middleware.rb",
"inApp": false,
"lineNo": 30,
"module": null,
@@ -4035,7 +4035,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/web-console-3.7.0/lib/web_console/middleware.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/web-console-3.7.0/lib/web_console/middleware.rb",
"inApp": false,
"lineNo": 135,
"module": null,
@@ -4083,7 +4083,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/debug_exceptions.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/debug_exceptions.rb",
"inApp": false,
"lineNo": 61,
"module": null,
@@ -4131,7 +4131,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/executor.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/executor.rb",
"inApp": false,
"lineNo": 14,
"module": null,
@@ -4179,7 +4179,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/callbacks.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/callbacks.rb",
"inApp": false,
"lineNo": 26,
"module": null,
@@ -4227,7 +4227,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activesupport-5.2.3/lib/active_support/callbacks.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activesupport-5.2.3/lib/active_support/callbacks.rb",
"inApp": false,
"lineNo": 98,
"module": null,
@@ -4275,7 +4275,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/actionpack-5.2.3/lib/action_dispatch/middleware/callbacks.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/actionpack-5.2.3/lib/action_dispatch/middleware/callbacks.rb",
"inApp": false,
"lineNo": 28,
"module": null,
@@ -4323,7 +4323,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/migration.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/migration.rb",
"inApp": false,
"lineNo": 554,
"module": null,
@@ -4371,7 +4371,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_handling.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_handling.rb",
"inApp": false,
"lineNo": 90,
"module": null,
@@ -4419,7 +4419,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_handling.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_handling.rb",
"inApp": false,
"lineNo": 118,
"module": null,
@@ -4467,7 +4467,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 1014,
"module": null,
@@ -4515,7 +4515,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 382,
"module": null,
@@ -4563,7 +4563,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 523,
"module": null,
@@ -4611,7 +4611,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 795,
"module": null,
@@ -4659,7 +4659,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 834,
"module": null,
@@ -4707,7 +4707,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 855,
"module": null,
@@ -4755,7 +4755,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/abstract/connection_pool.rb",
"inApp": false,
"lineNo": 811,
"module": null,
@@ -4803,7 +4803,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
"inApp": false,
"lineNo": 48,
"module": null,
@@ -4851,7 +4851,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
"inApp": false,
"lineNo": 48,
"module": null,
@@ -4899,7 +4899,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
"inApp": false,
"lineNo": 223,
"module": null,
@@ -4947,7 +4947,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
"inApp": false,
"lineNo": 691,
"module": null,
@@ -4995,7 +4995,7 @@
"colNo": null,
"vars": null,
"package": null,
- "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.3/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
+ "absPath": "/Users/gitlab/.rvm/gems/ruby-2.6.5/gems/activerecord-5.2.3/lib/active_record/connection_adapters/postgresql_adapter.rb",
"inApp": false,
"lineNo": 696,
"module": null,
@@ -5260,7 +5260,7 @@
"context": {
"server": {
"runtime": {
- "version": "ruby 2.6.3p62 (2019-04-16 revision 67580) [x86_64-darwin18]",
+ "version": "ruby 2.6.5p114 (2019-10-01 revision 67812) [x86_64-darwin18]",
"name": "ruby"
},
"os": {
@@ -5296,4 +5296,4 @@
]
},
"groupID": "1378364652"
-} \ No newline at end of file
+}
diff --git a/spec/frontend/jobs/components/log/mock_data.js b/spec/frontend/jobs/components/log/mock_data.js
index 01f69e6328c..587818045eb 100644
--- a/spec/frontend/jobs/components/log/mock_data.js
+++ b/spec/frontend/jobs/components/log/mock_data.js
@@ -34,7 +34,7 @@ export const utilsMockData = [
content: [
{
text:
- 'Using Docker executor with image dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33',
+ 'Using Docker executor with image dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33',
},
],
section: 'prepare-executor',
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index 6ab23b00d5c..3a56462ec1b 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -339,12 +339,6 @@ describe Gitlab::UsageData do
expect(described_class.count(relation)).to eq(1)
end
- it 'returns the count for count_by when provided' do
- allow(relation).to receive(:count).with(:creator_id).and_return(2)
-
- expect(described_class.count(relation, count_by: :creator_id)).to eq(2)
- end
-
it 'returns the fallback value when counting fails' do
allow(relation).to receive(:count).and_raise(ActiveRecord::StatementInvalid.new(''))