diff --git a/Gemfile b/Gemfile index 4d55d5b679a..26190991318 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ ruby '~> 2.5.1' gem 'actionpack-xml_parser', '~> 2.0.0' gem 'activemodel-serializers-xml', '~> 1.0.1' gem 'activerecord-session_store', '~> 1.1.0' -gem 'rails', '~> 5.1.5' +gem 'rails', '~> 5.1.6' gem 'responders', '~> 2.4' gem 'rubytree', git: 'https://github.com/dr0verride/RubyTree.git', ref: '06f53ee' diff --git a/Gemfile.lock b/Gemfile.lock index 256b4090e09..f6829f39bcf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,24 +6,6 @@ GIT rubytree (0.9.7) json (~> 1.8) -GIT - remote: https://github.com/finnlabs/omniauth-openid-connect.git - revision: 42c4bd27aaab986e0d8723da50314135691a0955 - ref: 42c4bd27aaab986e0d8723da50314135691a0955 - specs: - omniauth-openid-connect (0.3.0) - addressable (~> 2.5) - omniauth (~> 1.6.1) - openid_connect (~> 1.1.6) - -GIT - remote: https://github.com/finnlabs/omniauth-openid_connect-providers.git - revision: b8b9d4be88fb48a1fa4f4afd9fd226dac54430f8 - ref: b8b9d4be88fb48a1fa4f4afd9fd226dac54430f8 - specs: - omniauth-openid_connect-providers (0.1.0) - omniauth-openid-connect (>= 0.2.1) - GIT remote: https://github.com/finnlabs/rspec-example_disabler.git revision: deb9c38e3f4e3688724583ac1ff58e1ae8aba409 @@ -75,130 +57,22 @@ GIT activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) -PATH - remote: modules/auth_plugins - specs: - openproject-auth_plugins (8.2.0) - omniauth (~> 1.0) - rails (~> 5.0) - -PATH - remote: modules/avatars - specs: - openproject-avatars (8.2.0) - fastimage (~> 2.1.0) - gravatar_image_tag (~> 1.2.0) - rails (~> 5.0) - -PATH - remote: modules/backlogs - specs: - openproject-backlogs (8.2.0) - acts_as_silent_list (~> 3.0.0) - openproject-pdf_export (= 8.2.0) - -PATH - remote: modules/costs - specs: - openproject-costs (8.2.0) - -PATH - remote: modules/documents - specs: - openproject-documents (8.2.0) - -PATH - remote: modules/github_integration - specs: - openproject-github_integration (8.2.0) - openproject-webhooks - rails (~> 5.0) - -PATH - remote: modules/global_roles - specs: - openproject-global_roles (8.2.0) - -PATH - remote: modules/meeting - specs: - openproject-meeting (8.2.0) - icalendar (~> 2.3.0) - -PATH - remote: modules/my_project_page - specs: - openproject-my_project_page (8.2.0) - -PATH - remote: modules/openid_connect - specs: - openproject-openid_connect (8.2.0) - lobby_boy (~> 0.1.3) - omniauth-openid_connect-providers (~> 0.1) - openproject-auth_plugins (~> 8.0) - rails (~> 5.0) - -PATH - remote: modules/pdf_export - specs: - openproject-pdf_export (8.2.0) - pdf-inspector (~> 1.3.0) - prawn (~> 2.2) - -PATH - remote: modules/reporting_engine - specs: - reporting_engine (8.2.0) - json - rails (~> 5.1.0) - -PATH - remote: modules/reporting - specs: - openproject-reporting (8.2.0) - jquery-tablesorter (~> 1.25.5) - openproject-costs (= 8.2.0) - reporting_engine (>= 1.1.0) - -PATH - remote: modules/two_factor_authentication - specs: - openproject-two_factor_authentication (8.2.0) - aws-sdk-sns (~> 1.1.0) - messagebird-rest (~> 1.3.2) - rails (~> 5) - rotp (~> 3.3) - -PATH - remote: modules/webhooks - specs: - openproject-webhooks (8.2.0) - rails (~> 5.0) - -PATH - remote: modules/xls_export - specs: - openproject-xls_export (8.2.0) - spreadsheet (~> 0.8.9) - GEM remote: https://rubygems.org/ specs: - Ascii85 (1.0.3) - actioncable (5.1.6) - actionpack (= 5.1.6) + actioncable (5.1.6.1) + actionpack (= 5.1.6.1) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.6) - actionpack (= 5.1.6) - actionview (= 5.1.6) - activejob (= 5.1.6) + actionmailer (5.1.6.1) + actionpack (= 5.1.6.1) + actionview (= 5.1.6.1) + activejob (= 5.1.6.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.6) - actionview (= 5.1.6) - activesupport (= 5.1.6) + actionpack (5.1.6.1) + actionview (= 5.1.6.1) + activesupport (= 5.1.6.1) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -206,26 +80,26 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.1.6) - activesupport (= 5.1.6) + actionview (5.1.6.1) + activesupport (= 5.1.6.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) active_record_query_trace (1.5.4) - activejob (5.1.6) - activesupport (= 5.1.6) + activejob (5.1.6.1) + activesupport (= 5.1.6.1) globalid (>= 0.3.6) - activemodel (5.1.6) - activesupport (= 5.1.6) + activemodel (5.1.6.1) + activesupport (= 5.1.6.1) activemodel-serializers-xml (1.0.1) activemodel (> 5.x) activerecord (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.1.6) - activemodel (= 5.1.6) - activesupport (= 5.1.6) + activerecord (5.1.6.1) + activemodel (= 5.1.6.1) + activesupport (= 5.1.6.1) arel (~> 8.0) activerecord-session_store (1.1.1) actionpack (>= 4.0) @@ -233,20 +107,17 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 1.5.2, < 3) railties (>= 4.0) - activesupport (5.1.6) + activesupport (5.1.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) acts_as_list (0.9.11) activerecord (>= 3.0) - acts_as_silent_list (3.0.0) acts_as_tree (2.7.1) activerecord (>= 3.0.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - aes_key_wrap (1.0.1) - afm (0.2.2) airbrake (5.1.0) airbrake-ruby (~> 1.1) airbrake-ruby (1.5.0) @@ -254,7 +125,6 @@ GEM io-like (~> 0.3.0) arel (8.0.0) ast (2.4.0) - attr_required (1.0.1) autoprefixer-rails (7.1.5) execjs awesome_nested_set (3.1.3) @@ -271,9 +141,6 @@ GEM aws-sdk-core (~> 3) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) - aws-sdk-sns (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) aws-sigv4 (1.0.2) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -281,7 +148,6 @@ GEM thread_safe (~> 0.3, >= 0.3.1) backports (3.11.3) bcrypt (3.1.11) - bindata (2.4.4) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) bootsnap (1.1.5) @@ -325,7 +191,7 @@ GEM descendants_tracker (~> 0.0.1) commonmarker (0.17.9) ruby-enum (~> 0.5) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.3) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) @@ -397,7 +263,6 @@ GEM railties (>= 3.0.0) faker (1.8.4) i18n (~> 0.5) - fastimage (2.1.4) ffi (1.9.25) fog-aws (0.11.0) fog-core (~> 1.38) @@ -435,9 +300,7 @@ GEM rack (>= 1.3.0) rack-accept virtus (>= 1.0.0) - gravatar_image_tag (1.2.0) hashdiff (0.3.7) - hashery (2.1.2) hashie (3.5.6) health_check (2.6.0) rails (>= 4.0) @@ -447,25 +310,17 @@ GEM htmldiff (0.0.1) http-cookie (1.0.3) domain_name (~> 0.5) - httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) i18n-js (3.0.5) i18n (>= 0.6.6, < 2) - icalendar (2.3.0) ice_nine (0.11.2) interception (0.5) io-like (0.3.0) ipaddress (0.8.3) iso8601 (0.9.1) jmespath (1.4.0) - jquery-tablesorter (1.25.5) - railties (>= 3.2, < 6) json (1.8.6) - json-jwt (1.9.4) - activesupport - aes_key_wrap - bindata json_spec (1.1.5) multi_json (~> 1.0) rspec (>= 2.0, < 4.0) @@ -480,22 +335,17 @@ GEM sass thor tilt - lobby_boy (0.1.3) - omniauth (~> 1.1) - omniauth-openid-connect (>= 0.2.1) - rails (>= 3.2.21) loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - messagebird-rest (1.3.3) + mail (2.7.1) + mini_mime (>= 0.1.1) meta-tags (2.6.0) actionpack (>= 3.2.0, < 5.3) - method_source (0.9.0) - mime-types (3.1) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mini_mime (1.0.1) mini_portile2 (2.3.0) minisyntax (0.2.5) @@ -511,26 +361,13 @@ GEM net-ldap (0.16.0) netrc (0.11.0) newrelic_rpm (4.5.0.337) - nio4r (2.3.0) + nio4r (2.3.1) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) nokogumbo (1.5.0) nokogiri oj (3.5.0) okcomputer (1.16.0) - omniauth-saml (1.7.0) - omniauth (~> 1.3) - ruby-saml (~> 1.4) - openid_connect (1.1.6) - activemodel - attr_required (>= 1.0.0) - json-jwt (>= 1.5.0) - rack-oauth2 (>= 1.6.1) - swd (>= 1.0.0) - tzinfo - validate_email - validate_url - webfinger (>= 1.0.1) openproject-token (1.0.1) activemodel (~> 5.0) parallel (1.12.1) @@ -542,14 +379,6 @@ GEM rack rake (>= 0.8.1) pdf-core (0.7.0) - pdf-inspector (1.3.0) - pdf-reader (>= 1.0, < 3.0.a) - pdf-reader (2.1.0) - Ascii85 (~> 1.0.0) - afm (~> 0.2.1) - hashery (~> 2.0) - ruby-rc4 - ttfunk pg (1.0.0) plaintext (0.1.0) activesupport (> 2.2.1) @@ -585,12 +414,6 @@ GEM rack (>= 0.4) rack-attack (5.2.0) rack - rack-oauth2 (1.9.3) - activesupport - attr_required - httpclient - json-jwt (>= 1.9.0) - rack rack-protection (2.0.1) rack rack-test (1.0.0) @@ -598,17 +421,17 @@ GEM rack_session_access (0.2.0) builder (>= 2.0.0) rack (>= 1.0.0) - rails (5.1.6) - actioncable (= 5.1.6) - actionmailer (= 5.1.6) - actionpack (= 5.1.6) - actionview (= 5.1.6) - activejob (= 5.1.6) - activemodel (= 5.1.6) - activerecord (= 5.1.6) - activesupport (= 5.1.6) + rails (5.1.6.1) + actioncable (= 5.1.6.1) + actionmailer (= 5.1.6.1) + actionpack (= 5.1.6.1) + actionview (= 5.1.6.1) + activejob (= 5.1.6.1) + activemodel (= 5.1.6.1) + activerecord (= 5.1.6.1) + activesupport (= 5.1.6.1) bundler (>= 1.3.0) - railties (= 5.1.6) + railties (= 5.1.6.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -624,9 +447,9 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (5.1.6) - actionpack (= 5.1.6) - activesupport (= 5.1.6) + railties (5.1.6.1) + actionpack (= 5.1.6.1) + activesupport (= 5.1.6.1) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -662,7 +485,6 @@ GEM rinku (2.0.4) roar (1.1.0) representable (~> 3.0.0) - rotp (3.3.1) rouge (3.1.1) rspec (3.7.0) rspec-core (~> 3.7.0) @@ -702,12 +524,8 @@ GEM iso8601 ruby-enum (0.7.2) i18n - ruby-ole (1.2.12.1) ruby-prof (0.17.0) ruby-progressbar (1.9.0) - ruby-rc4 (0.1.5) - ruby-saml (1.9.0) - nokogiri (>= 1.5.10) rubyzip (1.2.2) safe_yaml (1.0.4) sanitize (4.6.4) @@ -739,8 +557,6 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - spreadsheet (0.8.9) - ruby-ole (>= 1.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -751,10 +567,6 @@ GEM sqlite3 (1.3.13) stringex (2.7.1) svg-graph (2.1.3) - swd (1.1.2) - activesupport (>= 3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) sys-filesystem (1.1.9) ffi test-prof (0.7.3) @@ -762,7 +574,7 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.8) timecop (0.9.1) @@ -785,12 +597,6 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) useragent (0.16.10) - validate_email (0.1.6) - activemodel (>= 3.0) - mail (>= 2.2.5) - validate_url (1.0.2) - activemodel (>= 3.0.0) - addressable virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -800,9 +606,6 @@ GEM rack (>= 1.0) warden-basic_auth (0.2.1) warden (~> 1.2) - webfinger (1.1.0) - activesupport - httpclient (>= 2.4) webmock (3.1.0) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -875,26 +678,8 @@ DEPENDENCIES oj (~> 3.5.0) okcomputer (~> 1.16.0) omniauth! - omniauth-openid-connect! - omniauth-openid_connect-providers! - omniauth-saml (~> 1.7.0) - openproject-auth_plugins! - openproject-avatars! - openproject-backlogs! - openproject-costs! - openproject-documents! - openproject-github_integration! - openproject-global_roles! - openproject-meeting! - openproject-my_project_page! - openproject-openid_connect! - openproject-pdf_export! - openproject-reporting! openproject-token (~> 1.0.1) openproject-translations! - openproject-two_factor_authentication! - openproject-webhooks! - openproject-xls_export! parallel_tests (~> 2.21.3) passenger (~> 5.3.3) pg (~> 1.0.0) @@ -912,13 +697,12 @@ DEPENDENCIES rack-protection (~> 2.0.0) rack-test (~> 1.0.0) rack_session_access - rails (~> 5.1.5) + rails (~> 5.1.6) rails-controller-testing (~> 1.0.2) rails_12factor rdoc (>= 2.4.2) reform (~> 2.2.0) reform-rails (~> 0.1.7) - reporting_engine! request_store (~> 1.4.1) responders (~> 2.4) rest-client (~> 2.0)