references/openproject
1
0
Fork 0
mirror of https://github.com/opf/openproject.git synced 2026-06-14 03:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump oj

Browse Source
This commit is contained in:
Oliver Günther
2016-03-15 20:53:49 +01:00
parent b05ac7b06c
commit 3c2bee2a53
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile
+1 -1
View File
@@ -81,7 +81,7 @@ gem 'sys-filesystem', '~> 1.1.4', require: false
# See: config/initializers/rabl_hack.rb
gem 'rabl', '0.9.3'
gem 'multi_json', '~> 1.11.0'
gem 'oj', '~> 2.11.4'
gem 'oj', '~> 2.14.6'
gem 'delayed_job_active_record', '~> 4.0.2'
gem 'daemons'
Gemfile.lock
+2 -2
View File
@@ -331,7 +331,7 @@ GEM
nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
non-stupid-digest-assets (1.0.4)
oj (2.11.5)
oj (2.14.6)
parallel (1.6.1)
parallel_tests (2.1.2)
parallel
@@ -608,7 +608,7 @@ DEPENDENCIES
newrelic_rpm
nokogiri (~> 1.6.7)
non-stupid-digest-assets
oj (~> 2.11.4)
oj (~> 2.14.6)
omniauth!
openproject-translations!
parallel_tests (~> 2.1.2)