diff --git a/.codeclimate.yml b/.codeclimate.yml index 02f0ed721c5..fa6e6a06b12 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -27,7 +27,7 @@ checks: plugins: rubocop: enabled: true - channel: rubocop-1-3 + channel: rubocop-1-4 # Codeclimate uses brakeman 4.3.1 which does not support rails 6 # Check https://docs.codeclimate.com/docs/brakeman for updates. brakeman: diff --git a/Gemfile b/Gemfile index aceae69b5f4..e43089eac51 100644 --- a/Gemfile +++ b/Gemfile @@ -167,7 +167,7 @@ gem 'sprockets', '~> 3.7.0' # also, better than thin since we can control worker concurrency. gem 'unicorn' -gem 'puma', '~> 5.0.0' # used for development and optionally for production +gem 'puma', '~> 5.1.0' # used for development and optionally for production gem 'nokogiri', '~> 1.10.8' @@ -217,7 +217,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.33.0' + gem 'capybara', '~> 3.34.0' gem 'capybara-screenshot', '~> 1.0.17' gem 'selenium-webdriver', '~> 3.14' gem 'webdrivers', '~> 4.4.1' @@ -240,7 +240,7 @@ group :test do end group :ldap do - gem 'net-ldap', '~> 0.16.0' + gem 'net-ldap', '~> 0.17.0' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 78ca9269a03..64dcc4dae2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,21 +1,3 @@ -GIT - remote: https://github.com/finnlabs/omniauth-openid-connect.git - revision: 9e7fd0e7bd36d40451c6b3c2ea641e8d237c295d - ref: 9e7fd0e7bd36d40451c6b3c2ea641e8d237c295d - specs: - omniauth-openid-connect (0.3.0) - addressable (~> 2.5) - omniauth (~> 1.6) - openid_connect (~> 1.1.6) - -GIT - remote: https://github.com/finnlabs/omniauth-openid_connect-providers.git - revision: 5148dd402cacc2785cee76336d649ebdf84488ca - ref: 5148dd402cacc2785cee76336d649ebdf84488ca - specs: - omniauth-openid_connect-providers (0.1.1) - omniauth-openid-connect (>= 0.2.1) - GIT remote: https://github.com/opf/omniauth revision: fe862f986b2e846e291784d2caa3d90a658c67f0 @@ -25,6 +7,24 @@ GIT hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) +GIT + remote: https://github.com/opf/omniauth-openid-connect.git + revision: e1173e682a60010c018146443453560a13b01a90 + ref: e1173e682a60010c018146443453560a13b01a90 + specs: + omniauth-openid-connect (0.4.0) + addressable (~> 2.5) + omniauth (~> 1.6) + openid_connect (~> 1.1.6) + +GIT + remote: https://github.com/opf/omniauth-openid_connect-providers.git + revision: a6c0c3ed78fac79cf4d007e40d4029e524ec7751 + ref: a6c0c3ed78fac79cf4d007e40d4029e524ec7751 + specs: + omniauth-openid_connect-providers (0.2.0) + omniauth-openid-connect (>= 0.2.1) + GIT remote: https://github.com/opf/openproject-translations.git revision: ec6fbe6ef86f82e65f37adb17f37aa5addc17ac4 @@ -60,7 +60,7 @@ PATH remote: modules/avatars specs: openproject-avatars (1.0.0) - fastimage (~> 2.1.0) + fastimage (~> 2.2.0) gravatar_image_tag (~> 1.2.0) PATH @@ -245,7 +245,7 @@ GEM activesupport (= 6.0.3.4) activerecord-import (1.0.7) activerecord (>= 3.2) - activerecord-nulldb-adapter (0.5.0) + activerecord-nulldb-adapter (0.5.1) activerecord (>= 5.2.0) activerecord-session_store (1.1.3) actionpack (>= 4.0) @@ -283,7 +283,7 @@ GEM awesome_nested_set (3.2.1) activerecord (>= 4.0.0, < 7.0) aws-eventstream (1.1.0) - aws-partitions (1.394.0) + aws-partitions (1.402.0) aws-sdk-core (3.109.3) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -292,7 +292,7 @@ GEM aws-sdk-kms (1.39.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.84.1) + aws-sdk-s3 (1.86.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -311,7 +311,7 @@ GEM browser (5.1.0) builder (3.2.4) byebug (11.1.3) - capybara (3.33.0) + capybara (3.34.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -416,7 +416,7 @@ GEM dry-container (0.7.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.4.9) + dry-core (0.4.10) concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) @@ -455,17 +455,17 @@ GEM factory_bot_rails (6.1.0) factory_bot (~> 6.1.0) railties (>= 5.0.0) - faker (2.14.0) + faker (2.15.1) i18n (>= 1.6, < 2) faraday (1.1.0) multipart-post (>= 1.2, < 3) ruby2_keywords faraday-http-cache (2.2.0) faraday (>= 0.8) - fastimage (2.1.7) + fastimage (2.2.0) ffi (1.13.1) flamegraph (0.9.5) - fog-aws (3.6.7) + fog-aws (3.7.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -548,7 +548,7 @@ GEM addressable (~> 2.7) letter_opener (1.7.0) launchy (~> 2.2) - listen (3.3.1) + listen (3.3.3) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) livingstyleguide (2.1.0) @@ -566,7 +566,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.7.0) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -595,14 +595,14 @@ GEM mustermann-grape (1.0.1) mustermann (>= 1.0.0) nap (1.1.0) - net-ldap (0.16.3) + net-ldap (0.17.0) netrc (0.11.0) - newrelic_rpm (6.13.1) + newrelic_rpm (6.14.0) nio4r (2.5.4) no_proxy_fix (0.1.2) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - nokogumbo (2.0.2) + nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) octokit (4.19.0) faraday (>= 0.9) @@ -625,8 +625,8 @@ GEM webfinger (>= 1.0.1) openproject-token (2.1.3) activemodel - parallel (1.20.0) - parallel_tests (3.3.0) + parallel (1.20.1) + parallel_tests (3.4.0) parallel parser (2.7.2.0) ast (~> 2.4.1) @@ -677,7 +677,7 @@ GEM eventmachine_httpserver http_parser.rb (~> 0.6.0) multi_json - puma (5.0.4) + puma (5.1.0) nio4r (~> 2.0) rack (2.2.3) rack-accept (0.4.5) @@ -791,7 +791,7 @@ GEM rspec-retry (0.6.2) rspec-core (> 3.3) rspec-support (3.10.0) - rubocop (1.3.1) + rubocop (1.4.2) parallel (~> 1.10) parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) @@ -800,7 +800,7 @@ GEM rubocop-ast (>= 1.1.1) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.1.1) + rubocop-ast (1.3.0) parser (>= 2.7.1.5) ruby-duration (3.2.3) activesupport (>= 3.0.0) @@ -920,7 +920,7 @@ GEM activerecord (>= 4.2) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.4.1) + zeitwerk (2.4.2) PLATFORMS ruby @@ -944,7 +944,7 @@ DEPENDENCIES brakeman (~> 4.10.0) browser (~> 5.1.0) budgets! - capybara (~> 3.33.0) + capybara (~> 3.34.0) capybara-screenshot (~> 1.0.17) carrierwave (~> 1.3.1) carrierwave_direct (~> 2.1.0) @@ -991,7 +991,7 @@ DEPENDENCIES mini_magick (~> 4.11.0) multi_json (~> 1.15.0) my_page! - net-ldap (~> 0.16.0) + net-ldap (~> 0.17.0) newrelic_rpm nokogiri (~> 1.10.8) oj (~> 3.10.2) @@ -1032,7 +1032,7 @@ DEPENDENCIES pry-rescue (~> 1.5.2) pry-stack_explorer (~> 0.5.1) puffing-billy (~> 2.4.0) - puma (~> 5.0.0) + puma (~> 5.1.0) rack-attack (~> 6.3.1) rack-cors (~> 1.1.1) rack-mini-profiler diff --git a/Gemfile.modules b/Gemfile.modules index 5be2195915c..d2698da9346 100644 --- a/Gemfile.modules +++ b/Gemfile.modules @@ -9,41 +9,41 @@ group :development, :test do end gem 'omniauth-openid_connect-providers', - git: 'https://github.com/finnlabs/omniauth-openid_connect-providers.git', - ref: '5148dd402cacc2785cee76336d649ebdf84488ca' + git: 'https://github.com/opf/omniauth-openid_connect-providers.git', + ref: 'a6c0c3ed78fac79cf4d007e40d4029e524ec7751' gem 'omniauth-openid-connect', - git: 'https://github.com/finnlabs/omniauth-openid-connect.git', - ref: '9e7fd0e7bd36d40451c6b3c2ea641e8d237c295d' + git: 'https://github.com/opf/omniauth-openid-connect.git', + ref: 'e1173e682a60010c018146443453560a13b01a90' group :opf_plugins do # included so that engines can reference OpenProject::Version $:.push File.expand_path("../lib", __FILE__) - gem 'openproject-auth_plugins', path: 'modules/auth_plugins' - gem 'openproject-auth_saml', path: 'modules/auth_saml' - gem 'openproject-openid_connect', path: 'modules/openid_connect' - gem 'openproject-documents', path: 'modules/documents' - gem 'openproject-xls_export', path: 'modules/xls_export' - gem 'costs', path: 'modules/costs' - gem 'openproject-reporting', path: 'modules/reporting' - gem 'openproject-meeting', path: 'modules/meeting' - gem 'openproject-pdf_export', path: 'modules/pdf_export' - gem "openproject-backlogs", path: 'modules/backlogs' - gem 'openproject-avatars', path: 'modules/avatars' - gem 'openproject-two_factor_authentication', path: 'modules/two_factor_authentication' - gem 'openproject-webhooks', path: 'modules/webhooks' - gem 'openproject-github_integration', path: 'modules/github_integration' - gem 'openproject-ldap_groups', path: 'modules/ldap_groups' - gem 'openproject-recaptcha', path: 'modules/recaptcha' - gem 'openproject-job_status', path: 'modules/job_status' + gem 'openproject-auth_plugins', path: 'modules/auth_plugins' + gem 'openproject-auth_saml', path: 'modules/auth_saml' + gem 'openproject-openid_connect', path: 'modules/openid_connect' + gem 'openproject-documents', path: 'modules/documents' + gem 'openproject-xls_export', path: 'modules/xls_export' + gem 'costs', path: 'modules/costs' + gem 'openproject-reporting', path: 'modules/reporting' + gem 'openproject-meeting', path: 'modules/meeting' + gem 'openproject-pdf_export', path: 'modules/pdf_export' + gem "openproject-backlogs", path: 'modules/backlogs' + gem 'openproject-avatars', path: 'modules/avatars' + gem 'openproject-two_factor_authentication', path: 'modules/two_factor_authentication' + gem 'openproject-webhooks', path: 'modules/webhooks' + gem 'openproject-github_integration', path: 'modules/github_integration' + gem 'openproject-ldap_groups', path: 'modules/ldap_groups' + gem 'openproject-recaptcha', path: 'modules/recaptcha' + gem 'openproject-job_status', path: 'modules/job_status' - gem 'grids', path: 'modules/grids' - gem 'my_page', path: 'modules/my_page' - gem 'dashboards', path: 'modules/dashboards' - gem 'openproject-boards', path: 'modules/boards' - gem 'overviews', path: 'modules/overviews' - gem 'budgets', path: 'modules/budgets' + gem 'grids', path: 'modules/grids' + gem 'my_page', path: 'modules/my_page' + gem 'dashboards', path: 'modules/dashboards' + gem 'openproject-boards', path: 'modules/boards' + gem 'overviews', path: 'modules/overviews' + gem 'budgets', path: 'modules/budgets' - gem 'openproject-bim', path: 'modules/bim' + gem 'openproject-bim', path: 'modules/bim' end diff --git a/modules/avatars/openproject-avatars.gemspec b/modules/avatars/openproject-avatars.gemspec index 9d081eb1af4..885ee6c68fe 100644 --- a/modules/avatars/openproject-avatars.gemspec +++ b/modules/avatars/openproject-avatars.gemspec @@ -15,5 +15,5 @@ Gem::Specification.new do |s| s.test_files = Dir["spec/**/*"] s.add_dependency 'gravatar_image_tag', '~> 1.2.0' - s.add_dependency 'fastimage', '~> 2.1.0' + s.add_dependency 'fastimage', '~> 2.2.0' end