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

Fix/bump gems (#5611)

Browse Source 
* bump rubocop

* bump nokogiri

* bump oj

* bump json_spec

* bump friendly_id - use gem

[ci skip]
This commit is contained in:
ulferts
2017-06-08 07:52:02 +02:00
committed by Oliver Günther
parent 1b62e20294
commit 9d8a1e1fb1
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile
+3 -3
View File
@@ -55,7 +55,7 @@ gem 'will_paginate', '~> 3.1.0'
gem 'acts_as_list', '~> 0.9.5'
gem 'acts_as_tree', '~> 2.6.1'
gem 'friendly_id', git: 'https://github.com/norman/friendly_id', ref: 'aff05645' # '~> 5.1.0'
gem 'friendly_id', '~> 5.2.1'
gem 'awesome_nested_set', '~> 3.1.3'
@@ -90,7 +90,7 @@ gem 'bcrypt', '~> 3.1.6'
# See: config/initializers/rabl_hack.rb
gem 'rabl', '~> 0.13.0'
gem 'multi_json', '~> 1.12.1'
gem 'oj', '~> 3.0.6'
gem 'oj', '~> 3.1.0'
gem 'daemons'
gem 'delayed_job_active_record', '~> 4.1.1'
@@ -146,7 +146,7 @@ gem 'cocaine', '~> 0.5.8'
# also, better than thin since we can control worker concurrency.
gem 'unicorn'
gem 'nokogiri', '~> 1.7.2'
gem 'nokogiri', '~> 1.8.0'
# carrierwave 0.11.3 should allow to use fog-aws without the rest of the
# fog dependency chain. We only need aws here, so we can avoid it
Gemfile.lock
+17 -21
View File
@@ -49,14 +49,6 @@ GIT
capybara
rspec
GIT
remote: https://github.com/norman/friendly_id
revision: aff0564584e84ffa505e6e278b65ca3c4ee5d698
ref: aff05645
specs:
friendly_id (5.2.0.beta.1)
activerecord (>= 4.0.0)
GIT
remote: https://github.com/oliverguenther/omniauth
revision: 8385bc0da47e4fc4f4a256c97725bcf8215d13c2
@@ -305,6 +297,8 @@ GEM
fog-core
nokogiri (~> 1.5, >= 1.5.11)
formatador (0.2.5)
friendly_id (5.2.1)
activerecord (>= 4.0.0)
fuubar (2.2.0)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
@@ -346,7 +340,7 @@ GEM
iso8601 (0.9.1)
jmespath (1.3.1)
json (1.8.6)
json_spec (1.1.4)
json_spec (1.1.5)
multi_json (~> 1.0)
rspec (>= 2.0, < 4.0)
kgio (2.11.0)
@@ -366,7 +360,7 @@ GEM
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (2.99.3)
mini_portile2 (2.1.0)
mini_portile2 (2.2.0)
minisyntax (0.2.5)
minitest (5.10.2)
mixlib-shellout (2.1.0)
@@ -381,9 +375,9 @@ GEM
netrc (0.11.0)
newrelic_rpm (4.1.0.333)
nio4r (2.0.0)
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
oj (3.0.6)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
oj (3.1.0)
openproject-token (1.0.0)
activemodel (~> 5.0)
parallel (1.11.1)
@@ -465,7 +459,8 @@ GEM
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.1)
rainbow (2.2.2)
rake
raindrops (0.18.0)
rake (12.0.0)
rb-fsevent (0.9.8)
@@ -498,7 +493,7 @@ GEM
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-core (3.5.3)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
@@ -519,7 +514,8 @@ GEM
rspec-retry (0.5.2)
rspec-core (> 3.3, < 3.6)
rspec-support (3.5.0)
rubocop (0.48.1)
rubocop (0.49.1)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
@@ -586,7 +582,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unicode-display_width (1.1.3)
unicode-display_width (1.2.1)
unicorn (5.3.0)
kgio (~> 2.6)
raindrops (~> 0.7)
@@ -655,7 +651,7 @@ DEPENDENCIES
factory_girl_rails (~> 4.7)
faker
fog-aws
friendly_id!
friendly_id (~> 5.2.1)
fuubar (~> 2.2.0)
globalize!
gon (~> 6.1.0)
@@ -674,8 +670,8 @@ DEPENDENCIES
mysql2 (~> 0.4.4)
net-ldap (~> 0.16.0)
newrelic_rpm
nokogiri (~> 1.7.2)
oj (~> 3.0.6)
nokogiri (~> 1.8.0)
oj (~> 3.1.0)
omniauth!
openproject-token (~> 1.0.0)
openproject-translations!
@@ -743,4 +739,4 @@ RUBY VERSION
ruby 2.4.1p111
BUNDLED WITH
1.15.0
1.15.1