TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8110 from opf/fix/bump_gems

Browse Source 
Fix/bump gems
pull/8112/head
ulferts 5 years ago committed by GitHub
parent 588e9ab250 94587dcf4f
commit 11dbe35aa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 82 additions and 80 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 26
      Gemfile
  2. 136
      Gemfile.lock

26
Gemfile
Unescape View File

@ -43,12 +43,12 @@ gem 'rdoc', '>= 2.4.2'
# see upstream PR: https://github.com/omniauth/omniauth/pull/903
gem 'omniauth', git: 'https://github.com/opf/omniauth', ref: 'fe862f986b2e846e291784d2caa3d90a658c67f0'
gem 'doorkeeper', '~> 5.3.1'
gem 'request_store', '~> 1.4.1'
gem 'request_store', '~> 1.5.0'
gem 'warden', '~> 1.2'
gem 'warden-basic_auth', '~> 0.2.1'
gem 'will_paginate', '~> 3.1.7'
gem 'will_paginate', '~> 3.3.0'
gem 'friendly_id', '~> 5.3.0'
@ -70,13 +70,13 @@ gem 'htmldiff'
gem 'stringex', '~> 2.8.5'
# CommonMark markdown parser with GFM extension
gem 'commonmarker', '~> 0.20.1'
gem 'commonmarker', '~> 0.21.0'
# HTML pipeline for transformations on text formatter output
# such as sanitization or additional features
gem 'html-pipeline', '~> 2.12.0'
# Tasklist parsing and renderer
gem 'deckar01-task_list', '2.2.0'
gem 'deckar01-task_list', '~> 2.3.1'
# Requires escape-utils for faster escaping
gem 'escape_utils', '~> 1.0'
# Syntax highlighting used in html-pipeline with rouge
@ -129,7 +129,7 @@ gem 'okcomputer', '~> 1.18.1'
gem 'gon', '~> 6.3.2'
# Lograge to provide sane and non-verbose logging
gem 'lograge', '~> 0.10.0'
gem 'lograge', '~> 0.11.0'
# catch exceptions and send them to any airbrake compatible backend
# don't require by default, instead load on-demand when actually configured
@ -141,7 +141,7 @@ gem 'prawn-markup', '~> 0.2.1'
gem 'cells-erb', '~> 0.1.0'
gem 'cells-rails', '~> 0.0.9'
gem 'meta-tags', '~> 2.11.0'
gem 'meta-tags', '~> 2.13.0'
group :production do
# we use dalli as standard memcache client
@ -169,9 +169,9 @@ gem 'nokogiri', '~> 1.10.8'
gem 'carrierwave', '~> 1.3.1'
gem 'fog-aws'
gem 'aws-sdk-core', '~> 3.66.0'
gem 'aws-sdk-core', '~> 3.90.1'
# File upload via fog + screenshots on travis
gem 'aws-sdk-s3', '~> 1.48.0'
gem 'aws-sdk-s3', '~> 1.60.2'
gem 'openproject-token', '~> 1.0.2'
@ -188,11 +188,11 @@ group :test do
# Test prof provides factories from code
# and other niceties
gem 'test-prof', '~> 0.10.0'
gem 'test-prof', '~> 0.11.0'
gem 'cucumber', '~> 3.1.0'
gem 'cucumber-rails', '~> 1.8.0', require: false
gem 'database_cleaner', '~> 1.6'
gem 'database_cleaner', '~> 1.8'
gem 'rack_session_access'
gem 'rspec', '~> 3.9.0'
gem 'rspec-activemodel-mocks', '~> 1.1.0', git: 'https://github.com/rspec/rspec-activemodel-mocks'
@ -211,7 +211,7 @@ group :test do
# brings back testing for 'assigns' and 'assert_template' extracted in rails 5
gem 'rails-controller-testing', '~> 1.0.2'
gem 'capybara', '~> 3.29.0'
gem 'capybara', '~> 3.31.0'
gem 'capybara-screenshot', '~> 1.0.17'
gem 'capybara-select2', git: 'https://github.com/goodwill/capybara-select2', ref: '585192e'
gem 'webdrivers', '~> 4.2.0', require: false
@ -219,7 +219,7 @@ group :test do
gem 'fuubar', '~> 2.3.2'
gem 'timecop', '~> 0.9.0'
gem 'webmock', '~> 3.7.2', require: false
gem 'webmock', '~> 3.8.2', require: false
gem 'equivalent-xml', '~> 0.6'
gem 'json_spec', '~> 1.1.4'
@ -259,7 +259,7 @@ group :development, :test do
gem 'ruby-prof', require: false
gem 'stackprof', require: false
gem 'pry-byebug', '~> 3.7.0', platforms: [:mri]
gem 'pry-byebug', '~> 3.8.0', platforms: [:mri]
gem 'pry-rails', '~> 0.3.6'
gem 'pry-rescue', '~> 1.5.0'
gem 'pry-stack_explorer', '~> 0.4.9.2'

136
Gemfile.lock
Unescape View File

@ -261,11 +261,11 @@ GEM
activerecord (6.0.2.1)
activemodel (= 6.0.2.1)
activesupport (= 6.0.2.1)
activerecord-import (1.0.2)
activerecord-import (1.0.4)
activerecord (>= 3.2)
activerecord-nulldb-adapter (0.4.0)
activerecord (>= 2.0.0)
activerecord-session_store (1.1.1)
activerecord-session_store (1.1.3)
actionpack (>= 4.0)
activerecord (>= 4.0)
multi_json (~> 1.11, >= 1.11.2)
@ -284,7 +284,7 @@ GEM
zeitwerk (~> 2.2)
acts_as_list (0.9.19)
activerecord (>= 3.0)
acts_as_tree (2.9.0)
acts_as_tree (2.9.1)
activerecord (>= 3.0.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
@ -301,23 +301,23 @@ GEM
awesome_nested_set (3.2.0)
activerecord (>= 4.0.0, < 7.0)
aws-eventstream (1.0.3)
aws-partitions (1.208.0)
aws-sdk-core (3.66.0)
aws-partitions (1.279.0)
aws-sdk-core (3.90.1)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.24.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sdk-kms (1.29.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.48.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sdk-s3 (1.60.2)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sdk-sns (1.1.0)
aws-sdk-core (~> 3)
aws-sigv4 (~> 1.0)
aws-sigv4 (1.1.0)
aws-sigv4 (1.1.1)
aws-eventstream (~> 1.0, >= 1.0.2)
backports (3.11.4)
bcrypt (3.1.13)
@ -331,8 +331,8 @@ GEM
brakeman (4.6.1)
browser (2.6.1)
builder (3.2.4)
byebug (11.0.1)
capybara (3.29.0)
byebug (11.1.1)
capybara (3.31.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
@ -340,7 +340,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
capybara-screenshot (1.0.22)
capybara-screenshot (1.0.24)
capybara (>= 1.0, < 4)
launchy
carrierwave (1.3.1)
@ -366,7 +366,7 @@ GEM
open4 (~> 1.3)
coderay (1.1.2)
colored2 (3.1.2)
commonmarker (0.20.1)
commonmarker (0.21.0)
ruby-enum (~> 0.5)
compare-xml (0.66)
nokogiri (~> 1.8)
@ -420,12 +420,12 @@ GEM
danger-plugin-api (~> 1.0)
danger-plugin-api (1.0.0)
danger (> 2.0)
database_cleaner (1.7.0)
database_cleaner (1.8.3)
date_validator (0.9.0)
activemodel
activesupport
debug_inspector (0.0.3)
deckar01-task_list (2.2.0)
deckar01-task_list (2.3.1)
html-pipeline
declarative (0.0.10)
declarative-builder (0.1.0)
@ -443,7 +443,7 @@ GEM
declarative-option (< 0.2.0)
representable (>= 2.4.0, <= 3.1.0)
uber (< 0.2.0)
domain_name (0.5.20180417)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (5.3.1)
railties (>= 5)
@ -532,13 +532,14 @@ GEM
rack (>= 1.3.0)
rack-accept
gravatar_image_tag (1.2.0)
hashdiff (1.0.0)
hashdiff (1.0.1)
hashery (2.1.2)
hashie (3.6.0)
html-pipeline (2.12.3)
activesupport (>= 2)
nokogiri (>= 1.4)
htmldiff (0.0.1)
http-accept (1.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
@ -564,7 +565,7 @@ GEM
json_spec (1.1.5)
multi_json (~> 1.0)
rspec (>= 2.0, < 4.0)
kgio (2.11.2)
kgio (2.11.3)
kramdown (2.1.0)
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
@ -587,7 +588,7 @@ GEM
omniauth (~> 1.1)
omniauth-openid-connect (>= 0.2.1)
rails (>= 3.2.21)
lograge (0.10.0)
lograge (0.11.2)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
@ -600,12 +601,12 @@ GEM
marcel (0.3.3)
mimemagic (~> 0.3.2)
messagebird-rest (1.3.3)
meta-tags (2.11.1)
meta-tags (2.13.0)
actionpack (>= 3.2.0, < 6.1)
method_source (0.9.2)
mime-types (3.2.2)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mime-types-data (3.2019.1009)
mimemagic (0.3.3)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
@ -621,9 +622,9 @@ GEM
mustermann-grape (1.0.1)
mustermann (>= 1.0.0)
nap (1.1.0)
net-ldap (0.16.1)
net-ldap (0.16.2)
netrc (0.11.0)
newrelic_rpm (6.6.0.358)
newrelic_rpm (6.9.0.363)
nio4r (2.5.2)
no_proxy_fix (0.1.2)
nokogiri (1.10.9)
@ -633,7 +634,7 @@ GEM
octokit (4.16.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
oj (3.10.3)
oj (3.10.5)
okcomputer (1.18.1)
omniauth-saml (1.10.1)
omniauth (~> 1.3, >= 1.3.2)
@ -685,7 +686,7 @@ GEM
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.7.0)
pry-byebug (3.8.0)
byebug (~> 11.0)
pry (~> 0.10)
pry-rails (0.3.9)
@ -696,7 +697,7 @@ GEM
pry-stack_explorer (0.4.9.3)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
public_suffix (4.0.1)
public_suffix (4.0.3)
puma (4.3.3)
nio4r (~> 2.0)
rack (2.2.2)
@ -704,7 +705,7 @@ GEM
rack (>= 0.4)
rack-attack (6.2.2)
rack (>= 1.0, < 3)
rack-mini-profiler (1.0.1)
rack-mini-profiler (1.1.6)
rack (>= 1.2.0)
rack-oauth2 (1.9.3)
activesupport
@ -755,14 +756,14 @@ GEM
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rainbow (3.0.0)
raindrops (0.19.0)
raindrops (0.19.1)
rake (13.0.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rbtree3 (0.5.0)
rchardet (1.8.0)
rdoc (6.1.1)
rdoc (6.2.1)
recaptcha (5.1.0)
json
redcarpet (3.4.0)
@ -772,23 +773,24 @@ GEM
reform-rails (0.1.7)
activemodel (>= 3.2)
reform (>= 2.2.0)
regexp_parser (1.6.0)
regexp_parser (1.7.0)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)
request_store (1.4.1)
request_store (1.5.0)
rack (>= 1.4)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
rest-client (2.0.2)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
retriable (3.1.2)
rexml (3.2.4)
rinku (2.0.4)
rinku (2.0.6)
roar (1.1.0)
representable (~> 3.0.0)
rotp (3.3.1)
@ -797,25 +799,25 @@ GEM
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.0)
rspec-support (~> 3.9.0)
rspec-core (3.9.1)
rspec-support (~> 3.9.1)
rspec-expectations (3.9.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-rails (4.0.0.beta3)
rspec-rails (4.0.0.beta4)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
rspec-core (~> 3.8)
rspec-expectations (~> 3.8)
rspec-mocks (~> 3.8)
rspec-support (~> 3.8)
rspec-retry (0.6.1)
rspec-core (~> 3.9)
rspec-expectations (~> 3.9)
rspec-mocks (~> 3.9)
rspec-support (~> 3.9)
rspec-retry (0.6.2)
rspec-core (> 3.3)
rspec-support (3.9.0)
rspec-support (3.9.2)
rubocop (0.80.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
@ -831,7 +833,7 @@ GEM
ruby-enum (0.7.2)
i18n
ruby-ole (1.2.12.2)
ruby-prof (1.0.0)
ruby-prof (1.3.0)
ruby-progressbar (1.10.1)
ruby-rc4 (0.1.5)
ruby-saml (1.9.0)
@ -878,7 +880,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
stackprof (0.2.12)
stackprof (0.2.15)
stringex (2.8.5)
structured_warnings (0.4.0)
svg-graph (2.1.3)
@ -891,7 +893,7 @@ GEM
temple (0.8.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
test-prof (0.10.0)
test-prof (0.11.3)
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
@ -910,9 +912,9 @@ GEM
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unf_ext (0.0.7.6)
unicode-display_width (1.6.1)
unicorn (5.5.1)
unicorn (5.5.3)
kgio (~> 2.6)
raindrops (~> 0.7)
unicorn-worker-killer (0.4.4)
@ -935,19 +937,19 @@ GEM
webfinger (1.1.0)
activesupport
httpclient (>= 2.4)
webmock (3.7.2)
webmock (3.8.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
will_paginate (3.1.8)
will_paginate (3.3.0)
with_advisory_lock (4.6.0)
activerecord (>= 4.2)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.2.2)
zeitwerk (2.3.0)
PLATFORMS
ruby
@ -964,20 +966,20 @@ DEPENDENCIES
airbrake (~> 9.4.3)
autoprefixer-rails (~> 9.7.4)
awesome_nested_set (~> 3.2.0)
aws-sdk-core (~> 3.66.0)
aws-sdk-s3 (~> 1.48.0)
aws-sdk-core (~> 3.90.1)
aws-sdk-s3 (~> 1.60.2)
bcrypt (~> 3.1.6)
bootsnap (~> 1.4.5)
bourbon (~> 6.0.0)
brakeman (~> 4.6.1)
browser (~> 2.6.1)
capybara (~> 3.29.0)
capybara (~> 3.31.0)
capybara-screenshot (~> 1.0.17)
capybara-select2!
carrierwave (~> 1.3.1)
cells-erb (~> 0.1.0)
cells-rails (~> 0.0.9)
commonmarker (~> 0.20.1)
commonmarker (~> 0.21.0)
compare-xml (~> 0.66)
cucumber (~> 3.1.0)
cucumber-rails (~> 1.8.0)
@ -986,9 +988,9 @@ DEPENDENCIES
danger (~> 6.3.1)
danger-brakeman
dashboards!
database_cleaner (~> 1.6)
database_cleaner (~> 1.8)
date_validator (~> 0.9.0)
deckar01-task_list (= 2.2.0)
deckar01-task_list (~> 2.3.1)
delayed_job_active_record (~> 4.1.4)
doorkeeper (~> 5.3.1)
equivalent-xml (~> 0.6)
@ -1012,8 +1014,8 @@ DEPENDENCIES
letter_opener
listen (~> 3.2.1)
livingstyleguide (~> 2.1.0)
lograge (~> 0.10.0)
meta-tags (~> 2.11.0)
lograge (~> 0.11.0)
meta-tags (~> 2.13.0)
multi_json (~> 1.14.1)
my_page!
net-ldap (~> 0.16.0)
@ -1054,7 +1056,7 @@ DEPENDENCIES
posix-spawn (~> 0.3.13)
prawn (~> 2.2)
prawn-markup (~> 0.2.1)
pry-byebug (~> 3.7.0)
pry-byebug (~> 3.8.0)
pry-rails (~> 0.3.6)
pry-rescue (~> 1.5.0)
pry-stack_explorer (~> 0.4.9.2)
@ -1071,7 +1073,7 @@ DEPENDENCIES
reform (~> 2.2.0)
reform-rails (~> 0.1.7)
reporting_engine!
request_store (~> 1.4.1)
request_store (~> 1.5.0)
responders (~> 3.0)
rest-client (~> 2.0)
retriable (~> 3.1.1)
@ -1102,7 +1104,7 @@ DEPENDENCIES
stringex (~> 2.8.5)
svg-graph (~> 2.1.0)
sys-filesystem (~> 1.2.0)
test-prof (~> 0.10.0)
test-prof (~> 0.11.0)
thin (~> 1.7.2)
timecop (~> 0.9.0)
typed_dag (~> 2.0.2)
@ -1112,8 +1114,8 @@ DEPENDENCIES
warden (~> 1.2)
warden-basic_auth (~> 0.2.1)
webdrivers (~> 4.2.0)
webmock (~> 3.7.2)
will_paginate (~> 3.1.7)
webmock (~> 3.8.2)
will_paginate (~> 3.3.0)
with_advisory_lock (~> 4.6.0)
RUBY VERSION

Write Preview
Loading…
Cancel
Save