Commit 20352a9a authored by Stan Hu's avatar Stan Hu

Merge branch 'id-bump-marginalia-gem' into 'master'

Bump marginalia gem version to 1.9.0

See merge request gitlab-org/gitlab!40481
parents 0ee341c0 ce869307
...@@ -22,7 +22,7 @@ gem 'rugged', '~> 0.28' ...@@ -22,7 +22,7 @@ gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.3' gem 'grape-path-helpers', '~> 1.3'
gem 'faraday', '~> 0.12' gem 'faraday', '~> 0.12'
gem 'marginalia', '~> 1.8.0' gem 'marginalia', '~> 1.9.0'
# Authentication libraries # Authentication libraries
gem 'devise', '~> 4.6' gem 'devise', '~> 4.6'
......
...@@ -669,7 +669,7 @@ GEM ...@@ -669,7 +669,7 @@ GEM
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
marcel (0.3.3) marcel (0.3.3)
mimemagic (~> 0.3.2) mimemagic (~> 0.3.2)
marginalia (1.8.0) marginalia (1.9.0)
actionpack (>= 2.3) actionpack (>= 2.3)
activerecord (>= 2.3) activerecord (>= 2.3)
memoist (0.16.0) memoist (0.16.0)
...@@ -1358,7 +1358,7 @@ DEPENDENCIES ...@@ -1358,7 +1358,7 @@ DEPENDENCIES
loofah (~> 2.2) loofah (~> 2.2)
lru_redux lru_redux
mail (= 2.7.1) mail (= 2.7.1)
marginalia (~> 1.8.0) marginalia (~> 1.9.0)
memory_profiler (~> 0.9) memory_profiler (~> 0.9)
method_source (~> 0.8) method_source (~> 0.8)
mimemagic (~> 0.3.2) mimemagic (~> 0.3.2)
......
---
title: Bump marginalia gem version to 1.9.0
merge_request: 40481
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment