about summary refs log tree commit diff
path: root/Gemfile
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-12-28 19:10:27 +0100
committerGitHub <noreply@github.com>2019-12-28 19:10:27 +0100
commit22daf24600d8e99e4569740ee5836d25c70c1e8b (patch)
tree6608ef7a5978b1071589d4891f8074241136a883 /Gemfile
parentf064cd4fb8057af04f0f1db6a98fc45935811e25 (diff)
parentad292792142a53fac05fac11e57ede103be2bdee (diff)
Merge pull request #1257 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index a748e1d7a..bb4e65fdc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -65,7 +65,7 @@ gem 'mime-types', '~> 3.3', require: 'mime/types/columnar'
 gem 'nilsimsa', git: 'https://github.com/witgo/nilsimsa', ref: 'fd184883048b922b176939f851338d0a4971a532'
 gem 'nokogiri', '~> 1.10'
 gem 'nsa', '~> 0.2'
-gem 'oj', '~> 3.9'
+gem 'oj', '~> 3.10'
 gem 'ostatus2', '~> 2.0'
 gem 'ox', '~> 2.11'
 gem 'parslet'
@@ -120,7 +120,7 @@ end
 group :test do
   gem 'capybara', '~> 3.29'
   gem 'climate_control', '~> 0.2'
-  gem 'faker', '~> 2.8'
+  gem 'faker', '~> 2.9'
   gem 'microformats', '~> 4.1'
   gem 'rails-controller-testing', '~> 1.0'
   gem 'rspec-sidekiq', '~> 3.0'
@@ -138,7 +138,7 @@ group :development do
   gem 'letter_opener', '~> 1.7'
   gem 'letter_opener_web', '~> 1.3'
   gem 'memory_profiler'
-  gem 'rubocop', '~> 0.77', require: false
+  gem 'rubocop', '~> 0.78', require: false
   gem 'rubocop-rails', '~> 2.4', require: false
   gem 'brakeman', '~> 4.7', require: false
   gem 'bundler-audit', '~> 0.6', require: false