From 4b2a2c5d5c8ec7a7bde4f8fece6e3eb37fcf2b17 Mon Sep 17 00:00:00 2001 From: rajavi-mishra Date: Sat, 24 Apr 2021 23:13:12 -0700 Subject: [PATCH 01/12] sign-in check added --- app/views/proposals/show.html.haml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/proposals/show.html.haml b/app/views/proposals/show.html.haml index 5d2dd948..d80e912f 100644 --- a/app/views/proposals/show.html.haml +++ b/app/views/proposals/show.html.haml @@ -25,9 +25,10 @@ .col-md-4 %p{style: "margin-top: 20px"} - if @event_schedule&.start_time - = link_to google_calendar_link(@event_schedule), target: '_blank', class: 'btn btn-success btn-mini' do - %i.fa.fa-calendar - Add to Google Calendar (beta) + - if user_signed_in? + = link_to google_calendar_link(@event_schedule), target: '_blank', class: 'btn btn-success btn-mini' do + %i.fa.fa-calendar + Add to Google Calendar (beta) - if can?(:update, @event) && @event.require_registration? = link_to 'Registrations', registrations_conference_program_proposal_path(@conference.short_title, @event), class: 'btn btn-mini btn-success' - if can?(:edit, @event) From 158cf85f7204f4fddc0b3f5ebfaa6b56844d1beb Mon Sep 17 00:00:00 2001 From: rajavi-mishra Date: Sun, 25 Apr 2021 01:02:41 -0700 Subject: [PATCH 02/12] testing --- spec/features/proposals_spec.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index e7377bb2..bc8a528a 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -212,4 +212,26 @@ feature Event do expect(page.find('#event_submission_text').value).to eq(event_type.submission_instructions) end end + + context 'as a user, looking at a conference with scheduled events' do + before(:each) do + @user = create(:user) + @program = conference.program + @selected_schedule = create(:schedule, program: @program) + @program.update_attributes!(selected_schedule: @selected_schedule) + @scheduled_event1 = create(:event, program: @program, state: 'confirmed', abstract: '`markdown`') + event_schedule1 = create(:event_schedule, event: @scheduled_event1, schedule: @selected_schedule, start_time: conference.start_hour + 1.hour) + end + + scenario 'for a scheduled event, can add an event to google calendar if signed in', feature: true, js: true do + sign_in @user + visit conference_program_proposal_path(conference.short_title, @scheduled_event1.id) + expect(page).to have_content('Add to Google Calendar (beta)') + end + + scenario 'for a scheduled event, cannot add an event to google calendar if not signed on', feature: true, js: true do + visit conference_program_proposal_path(conference.short_title, @scheduled_event1.id) + expect(page).not_to have_content('Add to Google Calendar (beta)') + end + end end From aebbe5615f3f1af50272cd9a579812052a2150bd Mon Sep 17 00:00:00 2001 From: rajavi-mishra Date: Sun, 25 Apr 2021 01:03:41 -0700 Subject: [PATCH 03/12] rubocop fixes --- spec/features/proposals_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index bc8a528a..a9543e05 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -215,23 +215,23 @@ feature Event do context 'as a user, looking at a conference with scheduled events' do before(:each) do - @user = create(:user) + @user = create(:user) @program = conference.program - @selected_schedule = create(:schedule, program: @program) + @selected_schedule = create(:schedule, program: @program) @program.update_attributes!(selected_schedule: @selected_schedule) @scheduled_event1 = create(:event, program: @program, state: 'confirmed', abstract: '`markdown`') - event_schedule1 = create(:event_schedule, event: @scheduled_event1, schedule: @selected_schedule, start_time: conference.start_hour + 1.hour) + @event_schedule1 = create(:event_schedule, event: @scheduled_event1, schedule: @selected_schedule, start_time: conference.start_hour + 1.hour) end scenario 'for a scheduled event, can add an event to google calendar if signed in', feature: true, js: true do sign_in @user visit conference_program_proposal_path(conference.short_title, @scheduled_event1.id) expect(page).to have_content('Add to Google Calendar (beta)') - end + end scenario 'for a scheduled event, cannot add an event to google calendar if not signed on', feature: true, js: true do visit conference_program_proposal_path(conference.short_title, @scheduled_event1.id) expect(page).not_to have_content('Add to Google Calendar (beta)') - end + end end end From 7444f86ce5aadac3de166818921af26293ed037c Mon Sep 17 00:00:00 2001 From: rajavi-mishra Date: Thu, 29 Apr 2021 13:51:45 -0700 Subject: [PATCH 04/12] PR review changes --- spec/features/proposals_spec.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 12285d2b..089de637 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -216,7 +216,6 @@ feature Event do context 'as a user, looking at a conference with scheduled events' do before(:each) do - @user = create(:user) @program = conference.program @selected_schedule = create(:schedule, program: @program) @program.update_attributes!(selected_schedule: @selected_schedule) @@ -225,7 +224,7 @@ feature Event do end scenario 'for a scheduled event, can add an event to google calendar if signed in', feature: true, js: true do - sign_in @user + sign_in participant visit conference_program_proposal_path(conference.short_title, @scheduled_event1.id) expect(page).to have_content('Add to Google Calendar (beta)') end @@ -236,7 +235,7 @@ feature Event do end end - context 'happening now or next section', feature: true, js: true do + context 'happening now or next section', feature: true let!(:conference1) { create(:full_conference, start_date: 1.day.ago, end_date: 7.days.from_now, start_hour: 0, end_hour: 24) } let!(:program) { conference1.program } let!(:selected_schedule) { create(:schedule, program: program) } From 90d6bb016c6fd326a26c4eb25d699dfd2027b840 Mon Sep 17 00:00:00 2001 From: rajavi-mishra Date: Thu, 29 Apr 2021 13:52:00 -0700 Subject: [PATCH 05/12] PR review change --- spec/features/proposals_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 089de637..f4568e9b 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -214,7 +214,7 @@ feature Event do end - context 'as a user, looking at a conference with scheduled events' do + context 'as a user, looking at a conference with scheduled events' do, feature: true before(:each) do @program = conference.program @selected_schedule = create(:schedule, program: @program) From 0599da258e739221a1e608808b3b290441e486bc Mon Sep 17 00:00:00 2001 From: rajavi-mishra Date: Thu, 29 Apr 2021 13:54:35 -0700 Subject: [PATCH 06/12] rubocop fixes --- spec/features/proposals_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index f4568e9b..ead8bfce 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -214,7 +214,7 @@ feature Event do end - context 'as a user, looking at a conference with scheduled events' do, feature: true + context 'as a user, looking at a conference with scheduled events' do before(:each) do @program = conference.program @selected_schedule = create(:schedule, program: @program) @@ -223,13 +223,13 @@ feature Event do @event_schedule1 = create(:event_schedule, event: @scheduled_event1, schedule: @selected_schedule, start_time: conference.start_hour + 1.hour) end - scenario 'for a scheduled event, can add an event to google calendar if signed in', feature: true, js: true do + scenario 'for a scheduled event, can add an event to google calendar if signed in', feature: true do sign_in participant visit conference_program_proposal_path(conference.short_title, @scheduled_event1.id) expect(page).to have_content('Add to Google Calendar (beta)') end - scenario 'for a scheduled event, cannot add an event to google calendar if not signed on', feature: true, js: true do + scenario 'for a scheduled event, cannot add an event to google calendar if not signed on', feature: true do visit conference_program_proposal_path(conference.short_title, @scheduled_event1.id) expect(page).not_to have_content('Add to Google Calendar (beta)') end From 40fd23e11b9db650b834ba05e4afc6eb7ff2d727 Mon Sep 17 00:00:00 2001 From: rajavi-mishra Date: Thu, 29 Apr 2021 13:57:03 -0700 Subject: [PATCH 07/12] remove whitespaces --- spec/features/proposals_spec.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index ead8bfce..2b0986ec 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -333,9 +333,7 @@ feature Event do expect(happening_now).not_to have_content(event_schedule3.event.title) expect(happening_now).not_to have_content(event_schedule1.event.title) expect(happening_now).not_to have_content(event_schedule2.event.title) - expect(happening_now).to have_content(event_schedule4.event.title) - end end end From 89e87a1be9569591554cbf8c0d6fbac591aa8e6e Mon Sep 17 00:00:00 2001 From: rajavi-mishra Date: Thu, 29 Apr 2021 14:14:56 -0700 Subject: [PATCH 08/12] rubocop fixes --- spec/features/proposals_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 2b0986ec..856d28c9 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -213,7 +213,6 @@ feature Event do end end - context 'as a user, looking at a conference with scheduled events' do before(:each) do @program = conference.program @@ -235,7 +234,7 @@ feature Event do end end - context 'happening now or next section', feature: true + context 'happening now or next section' do let!(:conference1) { create(:full_conference, start_date: 1.day.ago, end_date: 7.days.from_now, start_hour: 0, end_hour: 24) } let!(:program) { conference1.program } let!(:selected_schedule) { create(:schedule, program: program) } From f0e3b2ca0cb3b3fe7dbd5ec42b2de996c931fc30 Mon Sep 17 00:00:00 2001 From: rajavi-mishra Date: Thu, 29 Apr 2021 14:29:17 -0700 Subject: [PATCH 09/12] hakiri fix --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 52965d29..d2b796a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -293,7 +293,7 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2021.0225) - mimemagic (0.4.3) + mimemagic (0.3.10) nokogiri (~> 1) rake mina (1.2.3) @@ -301,7 +301,7 @@ GEM rake mini_magick (4.9.5) mini_mime (1.0.3) - mini_portile2 (2.5.0) + mini_portile2 (2.5.1) minitest (5.14.4) momentjs-rails (2.20.1) railties (>= 3.1) @@ -320,7 +320,7 @@ GEM nenv (0.3.0) netrc (0.11.0) nio4r (2.5.7) - nokogiri (1.11.2) + nokogiri (1.11.3) mini_portile2 (~> 2.5.0) racc (~> 1.4) notiffany (0.1.1) From c21965b67f9ac359e3161a6bba3c35d7c2c017f3 Mon Sep 17 00:00:00 2001 From: rajavi-mishra Date: Thu, 29 Apr 2021 22:32:51 -0700 Subject: [PATCH 10/12] trying to fix hakiri --- Gemfile.lock | 381 ++++++++++++++++++++++++++------------------------- 1 file changed, 194 insertions(+), 187 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d2b796a3..2bf85cfb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - Ascii85 (1.0.3) + Ascii85 (1.1.0) actioncable (5.2.5) actionpack (= 5.2.5) nio4r (~> 2.0) @@ -53,27 +53,27 @@ GEM activerecord (>= 4.0) activesupport (>= 4.0) awesome_nested_set (>= 3.0) - acts_as_list (0.9.19) - activerecord (>= 3.0) + acts_as_list (1.0.4) + activerecord (>= 4.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - ajax-datatables-rails (0.4.3) - railties (>= 4.0) + ajax-datatables-rails (1.3.1) + zeitwerk annotate (3.1.1) activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) archive-zip (0.12.0) io-like (~> 0.3.0) arel (9.0.0) - ast (2.4.0) - autoprefixer-rails (9.6.4) + ast (2.4.2) + autoprefixer-rails (10.2.4.0) execjs awesome_nested_set (3.4.0) activerecord (>= 4.0.0, < 7.0) aws_cf_signer (0.1.3) bcrypt (3.1.16) - bindex (0.6.0) + bindex (0.8.1) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) @@ -82,7 +82,7 @@ GEM momentjs-rails (>= 2.8.1) builder (3.2.4) byebug (11.1.3) - cancancan (2.3.0) + cancancan (3.2.1) capybara (3.35.3) addressable mini_mime (>= 0.1.3) @@ -91,12 +91,12 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - carrierwave (2.1.1) + carrierwave (2.2.1) activemodel (>= 5.0.0) activesupport (>= 5.0.0) addressable (~> 2.6) image_processing (~> 1.1) - mimemagic (>= 0.3.0) + marcel (~> 1.0.0) mini_mime (>= 0.1.3) ssrf_filter (~> 1.0) carrierwave-bombshelter (0.2.2) @@ -113,39 +113,44 @@ GEM caxlsx_rails (0.6.2) actionpack (>= 3.1) caxlsx (>= 3.0) - chartkick (3.4.2) + chartkick (4.0.3) childprocess (3.0.0) chronic (0.10.2) - chunky_png (1.3.11) - climate_control (0.2.0) - cloudinary (1.11.1) + chunky_png (1.4.0) + climate_control (1.0.0) + cloudinary (1.20.0) aws_cf_signer - rest-client + rest-client (>= 2.0.0) cocoon (1.2.15) - coderay (1.1.1) + coderay (1.1.3) concurrent-ruby (1.1.8) countable-rails (0.0.1) railties (>= 3.1) - countries (3.0.0) - i18n_data (~> 0.8.0) + countries (3.1.0) + i18n_data (~> 0.11.0) sixarm_ruby_unaccent (~> 1.1) unicode_utils (~> 1.4) - country_select (4.0.0) + country_select (5.0.1) countries (~> 3.0) - sort_alphabetical (~> 1.0) - crack (0.4.3) - safe_yaml (~> 1.0.0) + sort_alphabetical (~> 1.1) + crack (0.4.5) + rexml crass (1.0.6) daemons (1.3.1) dalli (2.7.11) dante (0.2.0) - database_cleaner (1.7.0) + database_cleaner (2.0.1) + database_cleaner-active_record (~> 2.0.0) + database_cleaner-active_record (2.0.0) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) delayed_job (4.1.9) activesupport (>= 3.0, < 6.2) - delayed_job_active_record (4.1.5) + delayed_job_active_record (4.1.6) activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) - devise (4.7.3) + devise (4.8.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -153,9 +158,9 @@ GEM warden (~> 1.2.3) devise_ichain_authenticatable (0.3.2) devise (>= 2.2) - diff-lcs (1.3) + diff-lcs (1.4.4) docile (1.3.5) - domain_name (0.5.20180417) + domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) dotenv-rails (2.7.6) @@ -164,21 +169,25 @@ GEM erubi (1.10.0) erubis (2.7.0) execjs (2.7.0) - factory_bot (4.11.1) - activesupport (>= 3.0.0) - factory_bot_rails (4.11.1) - factory_bot (~> 4.11.1) - railties (>= 3.0.0) - faker (1.9.3) - i18n (>= 0.7) - faraday (1.3.0) + factory_bot (6.1.0) + activesupport (>= 5.0.0) + factory_bot_rails (6.1.0) + factory_bot (~> 6.1.0) + railties (>= 5.0.0) + faker (2.17.0) + i18n (>= 1.6, < 2) + faraday (1.4.1) + faraday-excon (~> 1.1) faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) - ruby2_keywords + ruby2_keywords (>= 0.0.4) + faraday-excon (1.1.0) faraday-net_http (1.0.1) - fastimage (2.1.4) + faraday-net_http_persistent (1.1.0) + fastimage (2.2.3) feature (1.4.0) - ffi (1.10.0) + ffi (1.15.0) flay (2.12.1) erubis (~> 2.7.0) path_expander (~> 1.0) @@ -191,7 +200,7 @@ GEM actionpack (>= 3.2.13) formtastic-bootstrap (3.1.1) formtastic (>= 3.0) - geckodriver-helper (0.23.0) + geckodriver-helper (0.24.0) archive-zip (~> 0.7) gitlab (4.17.0) httparty (~> 0.18) @@ -199,10 +208,10 @@ GEM globalid (0.4.2) activesupport (>= 4.2.0) gravtastic (3.2.6) - guard (2.14.1) + guard (2.16.2) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) - lumberjack (~> 1.0) + lumberjack (>= 1.0.12, < 2.0) nenv (~> 0.1) notiffany (~> 0.0) pry (>= 0.9.12) @@ -213,24 +222,24 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - haml (5.0.4) + haml (5.2.1) temple (>= 0.8.0) tilt haml-lint (0.999.999) haml_lint - haml-rails (1.0.0) - actionpack (>= 4.0.1) - activesupport (>= 4.0.1) + haml-rails (2.0.1) + actionpack (>= 5.1) + activesupport (>= 5.1) haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) - railties (>= 4.0.1) - haml_lint (0.28.0) - haml (>= 4.0, < 5.1) + railties (>= 5.1) + haml_lint (0.37.0) + haml (>= 4.0, < 5.3) + parallel (~> 1.10) rainbow - rake (>= 10, < 13) rubocop (>= 0.50.0) sysexits (~> 1.1) - hashdiff (0.3.7) + hashdiff (1.0.1) hashery (2.1.2) hashie (4.1.0) html2haml (2.2.0) @@ -239,6 +248,7 @@ GEM nokogiri (>= 1.6.0) ruby_parser (~> 3.5) htmlentities (4.3.4) + http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) httparty (0.18.1) @@ -246,18 +256,17 @@ GEM multi_xml (>= 0.5.2) i18n (1.8.10) concurrent-ruby (~> 1.0) - i18n_data (0.8.0) + i18n_data (0.11.0) icalendar (2.7.1) ice_cube (~> 0.16) ice_cube (0.16.3) image_processing (1.12.1) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - io-like (0.3.0) - iso-639 (0.2.8) - jaro_winkler (1.5.3) + io-like (0.3.1) + iso-639 (0.3.5) jquery-datatables (1.10.20) - jquery-rails (4.3.5) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -267,10 +276,10 @@ GEM json-schema (2.8.1) addressable (>= 2.4) jsonapi-renderer (0.2.2) - jwt (2.2.2) - launchy (2.4.3) - addressable (~> 2.3) - leaflet-rails (1.5.1) + jwt (2.2.3) + launchy (2.5.0) + addressable (~> 2.7) + leaflet-rails (1.7.0) rails (>= 4.2.0) letter_opener (1.7.0) launchy (~> 2.2) @@ -278,18 +287,17 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - loofah (2.9.0) + listen (3.5.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lumberjack (1.0.12) + lumberjack (1.2.8) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.0) - method_source (0.8.2) + marcel (1.0.1) + method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2021.0225) @@ -299,17 +307,17 @@ GEM mina (1.2.3) open4 (~> 1.3.4) rake - mini_magick (4.9.5) - mini_mime (1.0.3) + mini_magick (4.11.0) + mini_mime (1.1.0) mini_portile2 (2.5.1) minitest (5.14.4) momentjs-rails (2.20.1) railties (>= 3.1) - monetize (1.9.2) + monetize (1.9.4) money (~> 6.12) - money (6.13.4) + money (6.13.8) i18n (>= 0.6.4, <= 2) - money-rails (1.13.3) + money-rails (1.14.0) activesupport (>= 3.0) monetize (~> 1.9.0) money (~> 6.13.2) @@ -323,16 +331,16 @@ GEM nokogiri (1.11.3) mini_portile2 (~> 2.5.0) racc (~> 1.4) - notiffany (0.1.1) + notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - oauth2 (1.4.4) + oauth2 (1.4.7) faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.20.0) + octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.9.1) @@ -345,32 +353,32 @@ GEM omniauth-github (1.4.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.8.1) + omniauth-google-oauth2 (0.8.2) jwt (>= 2.0) oauth2 (~> 1.1) - omniauth (>= 1.1.1) + omniauth (~> 1.1) omniauth-oauth2 (>= 1.6) omniauth-oauth2 (1.7.1) oauth2 (~> 1.4) omniauth (>= 1.9, < 3) - omniauth-openid (1.0.1) - omniauth (~> 1.0) - rack-openid (~> 1.3.1) + omniauth-openid (2.0.1) + omniauth (>= 1.0, < 3.0) + rack-openid (~> 1.4.0) open4 (1.3.4) orm_adapter (0.5.0) - pagy (3.12.0) - paper_trail (10.3.1) - activerecord (>= 4.2) + pagy (3.13.0) + paper_trail (12.0.0) + activerecord (>= 5.2) request_store (~> 1.1) - parallel (1.18.0) - parser (2.6.5.0) - ast (~> 2.4.0) + parallel (1.20.1) + parser (3.0.1.0) + ast (~> 2.4.1) path_expander (1.1.0) pdf-core (0.9.0) pdf-inspector (1.3.0) pdf-reader (>= 1.0, < 3.0.a) - pdf-reader (2.2.0) - Ascii85 (~> 1.0.0) + pdf-reader (2.4.2) + Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 @@ -383,13 +391,13 @@ GEM prawn (2.4.0) pdf-core (~> 0.9.0) ttfunk (~> 1.7) - prawn-qrcode (0.3.1) + prawn-qrcode (0.5.2) prawn (>= 1) - rqrcode (>= 0.4.1) - prawn-rails (1.3.0) + rqrcode (>= 1.0.0) + prawn-rails (1.4.0) prawn prawn-table - rails (>= 3.1.0) + railties (>= 3.1.0) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) pronto (0.11.0) @@ -410,10 +418,9 @@ GEM pronto-rubocop (0.11.1) pronto (~> 0.11.0) rubocop (>= 0.63.1, < 2.0) - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) + pry (0.14.1) + coderay (~> 1.1) + method_source (~> 1.0) pry-byebug (3.8.0) byebug (~> 11.0) pry (~> 0.10) @@ -422,7 +429,7 @@ GEM nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) - rack-openid (1.3.1) + rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (1.1.0) @@ -440,16 +447,16 @@ GEM bundler (>= 1.3.0) railties (= 5.2.5) sprockets-rails (>= 2.0.0) - rails-assets-bootstrap (3.3.6) - rails-assets-jquery (>= 1.9.1, < 3) + rails-assets-bootstrap (3.4.1) + rails-assets-jquery (>= 1.9.1, < 4) rails-assets-bootstrap-markdown (2.10.0) rails-assets-bootstrap (~> 3) - rails-assets-bootstrap-select (1.13.3) + rails-assets-bootstrap-select (1.13.10) rails-assets-bootstrap (>= 3.0.0) rails-assets-jquery (>= 1.9.1, < 4) rails-assets-date.format (1.2.3) rails-assets-holderjs (2.9.6) - rails-assets-jquery (2.2.4) + rails-assets-jquery (3.4.1) rails-assets-jquery-smooth-scroll (2.2.0) rails-assets-jquery (>= 1.7.0) rails-assets-markdown (0.5.0) @@ -459,7 +466,7 @@ GEM rails-assets-tinycolor (1.4.1) rails-assets-to-markdown (3.1.1) rails-assets-trianglify (1.2.0) - rails-assets-waypoints (4.0.0) + rails-assets-waypoints (4.0.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -479,110 +486,112 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (12.3.3) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rake (13.0.3) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) ffi (~> 1.0) - recaptcha (4.14.0) + recaptcha (5.7.0) json redcarpet (3.5.1) regexp_parser (2.1.1) - request_store (1.4.1) + request_store (1.5.0) rack (>= 1.4) responders (2.4.1) actionpack (>= 4.2.0, < 6.0) railties (>= 4.2.0, < 6.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) - rexml (3.2.4) - rolify (5.2.0) - rqrcode (0.10.1) + rexml (3.2.5) + rolify (6.0.0) + rqrcode (1.2.0) chunky_png (~> 1.0) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) + rqrcode_core (~> 0.2) + rqrcode_core (0.2.0) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) rspec-activemodel-mocks (1.1.0) activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-rails (3.6.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-support (~> 3.6.0) - rspec-support (3.6.0) - rubocop (0.75.1) - jaro_winkler (~> 1.5.1) + rspec-support (~> 3.10.0) + rspec-rails (5.0.1) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.10.2) + rubocop (0.93.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8) + rexml + rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.36.0) - rubocop (>= 0.68.1) - ruby-oembed (0.12.0) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (1.4.1) + parser (>= 2.7.1.5) + rubocop-rspec (1.44.1) + rubocop (~> 0.87) + rubocop-ast (>= 0.7.1) + ruby-oembed (0.15.0) ruby-openid (2.9.2) - ruby-progressbar (1.10.1) + ruby-progressbar (1.11.0) ruby-rc4 (0.1.5) - ruby-vips (2.0.17) - ffi (~> 1.9) + ruby-vips (2.1.0) + ffi (~> 1.12) ruby2_keywords (0.0.4) - ruby_dep (1.5.0) - ruby_parser (3.11.0) + ruby_parser (3.15.1) sexp_processor (~> 4.9) - rubyzip (1.3.0) + rubyzip (2.3.0) rugged (1.0.1) - safe_yaml (1.0.4) - sass (3.7.2) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - sassc (2.0.1) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.4.0) ffi (~> 1.9) - rake + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) selectize-rails (0.12.6) - selenium-webdriver (3.142.6) + selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sentry-delayed_job (4.2.1) - sentry-ruby-core (~> 4.2.0) - sentry-rails (4.2.2) - rails (>= 5.0) - sentry-ruby-core (~> 4.2.0) - sentry-ruby (4.2.2) + sentry-delayed_job (4.3.1) + sentry-ruby-core (~> 4.3.0) + sentry-rails (4.3.4) + railties (>= 5.0) + sentry-ruby-core (~> 4.3.0) + sentry-ruby (4.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) faraday (>= 1.0) - sentry-ruby-core (= 4.2.2) - sentry-ruby-core (4.2.2) + sentry-ruby-core (= 4.3.2) + sentry-ruby-core (4.3.2) concurrent-ruby faraday - sexp_processor (4.11.0) + sexp_processor (4.15.2) shellany (0.0.1) - shoulda-matchers (4.1.2) + shoulda-matchers (4.5.1) activesupport (>= 4.2.0) simplecov (0.21.2) docile (~> 1.1) @@ -593,17 +602,14 @@ GEM simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) sixarm_ruby_unaccent (1.2.0) - skylight (3.1.5) - skylight-core (= 3.1.5) - skylight-core (3.1.5) - activesupport (>= 4.2.0) - slop (3.6.0) + skylight (5.0.1) + activesupport (>= 5.2.0) sort_alphabetical (1.1.0) unicode_utils (>= 1.2.2) - spring (1.6.3) + spring (2.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.7.2) + sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.2) @@ -612,19 +618,19 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.4.2) ssrf_filter (1.0.7) - stripe (5.14.0) + stripe (5.32.1) stripe-ruby-mock (3.0.1) dante (>= 0.2.0) multi_json (~> 1.0) stripe (> 5, < 6) sysexits (1.2.0) - temple (0.8.0) + temple (0.8.2) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thor (1.1.0) thread_safe (0.3.6) - tilt (2.0.9) - timecop (0.9.1) + tilt (2.0.10) + timecop (0.9.4) transitions (1.2.1) ttfunk (1.7.0) turbolinks (5.2.1) @@ -632,12 +638,12 @@ GEM turbolinks-source (5.2.0) tzinfo (1.2.9) thread_safe (~> 0.1) - uglifier (4.1.20) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.5) - unicode-display_width (1.6.0) + unf_ext (0.0.7.7) + unicode-display_width (1.7.0) unicode_utils (1.4.0) unobtrusive_flash (3.3.1) railties @@ -648,21 +654,22 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webdrivers (4.1.3) + webdrivers (4.6.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) - webmock (3.5.1) + webmock (3.12.2) addressable (>= 2.3.6) crack (>= 0.3.2) - hashdiff + hashdiff (>= 0.4.0, < 2.0.0) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - whenever (0.10.0) + whenever (1.0.0) chronic (>= 0.6.3) xpath (3.2.0) nokogiri (~> 1.8) + zeitwerk (2.4.2) PLATFORMS ruby From 5edb1ce4916792198c54926ca9dcffbb5d41d748 Mon Sep 17 00:00:00 2001 From: rajavi-mishra Date: Thu, 29 Apr 2021 22:37:09 -0700 Subject: [PATCH 11/12] gemfile changes to pass the hakiri check --- Gemfile.lock | 395 +++++++++++++++++++++++++-------------------------- 1 file changed, 194 insertions(+), 201 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2bf85cfb..faebeac8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - Ascii85 (1.1.0) + Ascii85 (1.0.3) actioncable (5.2.5) actionpack (= 5.2.5) nio4r (~> 2.0) @@ -53,27 +53,27 @@ GEM activerecord (>= 4.0) activesupport (>= 4.0) awesome_nested_set (>= 3.0) - acts_as_list (1.0.4) - activerecord (>= 4.2) + acts_as_list (0.9.19) + activerecord (>= 3.0) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - ajax-datatables-rails (1.3.1) - zeitwerk + ajax-datatables-rails (0.4.3) + railties (>= 4.0) annotate (3.1.1) activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) archive-zip (0.12.0) io-like (~> 0.3.0) arel (9.0.0) - ast (2.4.2) - autoprefixer-rails (10.2.4.0) + ast (2.4.0) + autoprefixer-rails (9.6.4) execjs awesome_nested_set (3.4.0) activerecord (>= 4.0.0, < 7.0) aws_cf_signer (0.1.3) bcrypt (3.1.16) - bindex (0.8.1) + bindex (0.6.0) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) @@ -82,7 +82,7 @@ GEM momentjs-rails (>= 2.8.1) builder (3.2.4) byebug (11.1.3) - cancancan (3.2.1) + cancancan (2.3.0) capybara (3.35.3) addressable mini_mime (>= 0.1.3) @@ -91,12 +91,12 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - carrierwave (2.2.1) + carrierwave (2.1.1) activemodel (>= 5.0.0) activesupport (>= 5.0.0) addressable (~> 2.6) image_processing (~> 1.1) - marcel (~> 1.0.0) + mimemagic (>= 0.3.0) mini_mime (>= 0.1.3) ssrf_filter (~> 1.0) carrierwave-bombshelter (0.2.2) @@ -113,44 +113,39 @@ GEM caxlsx_rails (0.6.2) actionpack (>= 3.1) caxlsx (>= 3.0) - chartkick (4.0.3) + chartkick (3.4.2) childprocess (3.0.0) chronic (0.10.2) - chunky_png (1.4.0) - climate_control (1.0.0) - cloudinary (1.20.0) + chunky_png (1.3.11) + climate_control (0.2.0) + cloudinary (1.11.1) aws_cf_signer - rest-client (>= 2.0.0) + rest-client cocoon (1.2.15) - coderay (1.1.3) + coderay (1.1.1) concurrent-ruby (1.1.8) countable-rails (0.0.1) railties (>= 3.1) - countries (3.1.0) - i18n_data (~> 0.11.0) + countries (3.0.0) + i18n_data (~> 0.8.0) sixarm_ruby_unaccent (~> 1.1) unicode_utils (~> 1.4) - country_select (5.0.1) + country_select (4.0.0) countries (~> 3.0) - sort_alphabetical (~> 1.1) - crack (0.4.5) - rexml + sort_alphabetical (~> 1.0) + crack (0.4.3) + safe_yaml (~> 1.0.0) crass (1.0.6) daemons (1.3.1) dalli (2.7.11) dante (0.2.0) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.0) - activerecord (>= 5.a) - database_cleaner-core (~> 2.0.0) - database_cleaner-core (2.0.1) + database_cleaner (1.7.0) delayed_job (4.1.9) activesupport (>= 3.0, < 6.2) - delayed_job_active_record (4.1.6) + delayed_job_active_record (4.1.5) activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) - devise (4.8.0) + devise (4.7.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -158,9 +153,9 @@ GEM warden (~> 1.2.3) devise_ichain_authenticatable (0.3.2) devise (>= 2.2) - diff-lcs (1.4.4) + diff-lcs (1.3) docile (1.3.5) - domain_name (0.5.20190701) + domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) dotenv-rails (2.7.6) @@ -169,25 +164,21 @@ GEM erubi (1.10.0) erubis (2.7.0) execjs (2.7.0) - factory_bot (6.1.0) - activesupport (>= 5.0.0) - factory_bot_rails (6.1.0) - factory_bot (~> 6.1.0) - railties (>= 5.0.0) - faker (2.17.0) - i18n (>= 1.6, < 2) - faraday (1.4.1) - faraday-excon (~> 1.1) + factory_bot (4.11.1) + activesupport (>= 3.0.0) + factory_bot_rails (4.11.1) + factory_bot (~> 4.11.1) + railties (>= 3.0.0) + faker (1.9.3) + i18n (>= 0.7) + faraday (1.3.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) - ruby2_keywords (>= 0.0.4) - faraday-excon (1.1.0) + ruby2_keywords faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) - fastimage (2.2.3) + fastimage (2.1.4) feature (1.4.0) - ffi (1.15.0) + ffi (1.10.0) flay (2.12.1) erubis (~> 2.7.0) path_expander (~> 1.0) @@ -200,7 +191,7 @@ GEM actionpack (>= 3.2.13) formtastic-bootstrap (3.1.1) formtastic (>= 3.0) - geckodriver-helper (0.24.0) + geckodriver-helper (0.23.0) archive-zip (~> 0.7) gitlab (4.17.0) httparty (~> 0.18) @@ -208,10 +199,10 @@ GEM globalid (0.4.2) activesupport (>= 4.2.0) gravtastic (3.2.6) - guard (2.16.2) + guard (2.14.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) - lumberjack (>= 1.0.12, < 2.0) + lumberjack (~> 1.0) nenv (~> 0.1) notiffany (~> 0.0) pry (>= 0.9.12) @@ -222,24 +213,24 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - haml (5.2.1) + haml (5.0.4) temple (>= 0.8.0) tilt haml-lint (0.999.999) haml_lint - haml-rails (2.0.1) - actionpack (>= 5.1) - activesupport (>= 5.1) + haml-rails (1.0.0) + actionpack (>= 4.0.1) + activesupport (>= 4.0.1) haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) - railties (>= 5.1) - haml_lint (0.37.0) - haml (>= 4.0, < 5.3) - parallel (~> 1.10) + railties (>= 4.0.1) + haml_lint (0.28.0) + haml (>= 4.0, < 5.1) rainbow + rake (>= 10, < 13) rubocop (>= 0.50.0) sysexits (~> 1.1) - hashdiff (1.0.1) + hashdiff (0.3.7) hashery (2.1.2) hashie (4.1.0) html2haml (2.2.0) @@ -248,7 +239,6 @@ GEM nokogiri (>= 1.6.0) ruby_parser (~> 3.5) htmlentities (4.3.4) - http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) httparty (0.18.1) @@ -256,17 +246,18 @@ GEM multi_xml (>= 0.5.2) i18n (1.8.10) concurrent-ruby (~> 1.0) - i18n_data (0.11.0) + i18n_data (0.8.0) icalendar (2.7.1) ice_cube (~> 0.16) ice_cube (0.16.3) image_processing (1.12.1) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - io-like (0.3.1) - iso-639 (0.3.5) + io-like (0.3.0) + iso-639 (0.2.8) + jaro_winkler (1.5.3) jquery-datatables (1.10.20) - jquery-rails (4.4.0) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -276,10 +267,10 @@ GEM json-schema (2.8.1) addressable (>= 2.4) jsonapi-renderer (0.2.2) - jwt (2.2.3) - launchy (2.5.0) - addressable (~> 2.7) - leaflet-rails (1.7.0) + jwt (2.2.2) + launchy (2.4.3) + addressable (~> 2.3) + leaflet-rails (1.5.1) rails (>= 4.2.0) letter_opener (1.7.0) launchy (~> 2.2) @@ -287,37 +278,38 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - listen (3.5.1) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.9.1) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lumberjack (1.2.8) + lumberjack (1.0.12) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) - method_source (1.0.0) + marcel (1.0.0) + method_source (0.8.2) mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2021.0225) - mimemagic (0.3.10) + mimemagic (0.4.3) nokogiri (~> 1) rake mina (1.2.3) open4 (~> 1.3.4) rake - mini_magick (4.11.0) - mini_mime (1.1.0) - mini_portile2 (2.5.1) + mini_magick (4.9.5) + mini_mime (1.0.3) + mini_portile2 (2.5.0) minitest (5.14.4) momentjs-rails (2.20.1) railties (>= 3.1) - monetize (1.9.4) + monetize (1.9.2) money (~> 6.12) - money (6.13.8) + money (6.13.4) i18n (>= 0.6.4, <= 2) - money-rails (1.14.0) + money-rails (1.13.3) activesupport (>= 3.0) monetize (~> 1.9.0) money (~> 6.13.2) @@ -328,19 +320,19 @@ GEM nenv (0.3.0) netrc (0.11.0) nio4r (2.5.7) - nokogiri (1.11.3) + nokogiri (1.11.2) mini_portile2 (~> 2.5.0) racc (~> 1.4) - notiffany (0.1.3) + notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) - oauth2 (1.4.7) + oauth2 (1.4.4) faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.21.0) + octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.9.1) @@ -353,32 +345,32 @@ GEM omniauth-github (1.4.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.8.2) + omniauth-google-oauth2 (0.8.1) jwt (>= 2.0) oauth2 (~> 1.1) - omniauth (~> 1.1) + omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.6) omniauth-oauth2 (1.7.1) oauth2 (~> 1.4) omniauth (>= 1.9, < 3) - omniauth-openid (2.0.1) - omniauth (>= 1.0, < 3.0) - rack-openid (~> 1.4.0) + omniauth-openid (1.0.1) + omniauth (~> 1.0) + rack-openid (~> 1.3.1) open4 (1.3.4) orm_adapter (0.5.0) - pagy (3.13.0) - paper_trail (12.0.0) - activerecord (>= 5.2) + pagy (3.12.0) + paper_trail (10.3.1) + activerecord (>= 4.2) request_store (~> 1.1) - parallel (1.20.1) - parser (3.0.1.0) - ast (~> 2.4.1) + parallel (1.18.0) + parser (2.6.5.0) + ast (~> 2.4.0) path_expander (1.1.0) pdf-core (0.9.0) pdf-inspector (1.3.0) pdf-reader (>= 1.0, < 3.0.a) - pdf-reader (2.4.2) - Ascii85 (~> 1.0) + pdf-reader (2.2.0) + Ascii85 (~> 1.0.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 @@ -391,13 +383,13 @@ GEM prawn (2.4.0) pdf-core (~> 0.9.0) ttfunk (~> 1.7) - prawn-qrcode (0.5.2) + prawn-qrcode (0.3.1) prawn (>= 1) - rqrcode (>= 1.0.0) - prawn-rails (1.4.0) + rqrcode (>= 0.4.1) + prawn-rails (1.3.0) prawn prawn-table - railties (>= 3.1.0) + rails (>= 3.1.0) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) pronto (0.11.0) @@ -418,9 +410,10 @@ GEM pronto-rubocop (0.11.1) pronto (~> 0.11.0) rubocop (>= 0.63.1, < 2.0) - pry (0.14.1) - coderay (~> 1.1) - method_source (~> 1.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) pry-byebug (3.8.0) byebug (~> 11.0) pry (~> 0.10) @@ -429,7 +422,7 @@ GEM nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) - rack-openid (1.4.2) + rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (1.1.0) @@ -447,16 +440,16 @@ GEM bundler (>= 1.3.0) railties (= 5.2.5) sprockets-rails (>= 2.0.0) - rails-assets-bootstrap (3.4.1) - rails-assets-jquery (>= 1.9.1, < 4) + rails-assets-bootstrap (3.3.6) + rails-assets-jquery (>= 1.9.1, < 3) rails-assets-bootstrap-markdown (2.10.0) rails-assets-bootstrap (~> 3) - rails-assets-bootstrap-select (1.13.10) + rails-assets-bootstrap-select (1.13.3) rails-assets-bootstrap (>= 3.0.0) rails-assets-jquery (>= 1.9.1, < 4) rails-assets-date.format (1.2.3) rails-assets-holderjs (2.9.6) - rails-assets-jquery (3.4.1) + rails-assets-jquery (2.2.4) rails-assets-jquery-smooth-scroll (2.2.0) rails-assets-jquery (>= 1.7.0) rails-assets-markdown (0.5.0) @@ -466,7 +459,7 @@ GEM rails-assets-tinycolor (1.4.1) rails-assets-to-markdown (3.1.1) rails-assets-trianglify (1.2.0) - rails-assets-waypoints (4.0.1) + rails-assets-waypoints (4.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -486,112 +479,110 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (13.0.3) - rb-fsevent (0.10.4) - rb-inotify (0.10.1) + rake (12.3.3) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) ffi (~> 1.0) - recaptcha (5.7.0) + recaptcha (4.14.0) json redcarpet (3.5.1) regexp_parser (2.1.1) - request_store (1.5.0) + request_store (1.4.1) rack (>= 1.4) responders (2.4.1) actionpack (>= 4.2.0, < 6.0) railties (>= 4.2.0, < 6.0) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) + rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.5) - rolify (6.0.0) - rqrcode (1.2.0) + rexml (3.2.4) + rolify (5.2.0) + rqrcode (0.10.1) chunky_png (~> 1.0) - rqrcode_core (~> 0.2) - rqrcode_core (0.2.0) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) + rspec (3.6.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) rspec-activemodel-mocks (1.1.0) activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-rails (5.0.1) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.10.2) - rubocop (0.93.1) + rspec-support (~> 3.6.0) + rspec-rails (3.6.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) + rubocop (0.75.1) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) - rexml - rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.4.1) - parser (>= 2.7.1.5) - rubocop-rspec (1.44.1) - rubocop (~> 0.87) - rubocop-ast (>= 0.7.1) - ruby-oembed (0.15.0) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-rspec (1.36.0) + rubocop (>= 0.68.1) + ruby-oembed (0.12.0) ruby-openid (2.9.2) - ruby-progressbar (1.11.0) + ruby-progressbar (1.10.1) ruby-rc4 (0.1.5) - ruby-vips (2.1.0) - ffi (~> 1.12) - ruby2_keywords (0.0.4) - ruby_parser (3.15.1) - sexp_processor (~> 4.9) - rubyzip (2.3.0) - rugged (1.0.1) - sass-rails (6.0.0) - sassc-rails (~> 2.1, >= 2.1.1) - sassc (2.4.0) + ruby-vips (2.0.17) ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt + ruby2_keywords (0.0.4) + ruby_dep (1.5.0) + ruby_parser (3.11.0) + sexp_processor (~> 4.9) + rubyzip (1.3.0) + rugged (1.0.1) + safe_yaml (1.0.4) + sass (3.7.2) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sassc (2.0.1) + ffi (~> 1.9) + rake sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) selectize-rails (0.12.6) - selenium-webdriver (3.142.7) + selenium-webdriver (3.142.6) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sentry-delayed_job (4.3.1) - sentry-ruby-core (~> 4.3.0) - sentry-rails (4.3.4) - railties (>= 5.0) - sentry-ruby-core (~> 4.3.0) - sentry-ruby (4.3.2) + sentry-delayed_job (4.2.1) + sentry-ruby-core (~> 4.2.0) + sentry-rails (4.2.2) + rails (>= 5.0) + sentry-ruby-core (~> 4.2.0) + sentry-ruby (4.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) faraday (>= 1.0) - sentry-ruby-core (= 4.3.2) - sentry-ruby-core (4.3.2) + sentry-ruby-core (= 4.2.2) + sentry-ruby-core (4.2.2) concurrent-ruby faraday - sexp_processor (4.15.2) + sexp_processor (4.11.0) shellany (0.0.1) - shoulda-matchers (4.5.1) + shoulda-matchers (4.1.2) activesupport (>= 4.2.0) simplecov (0.21.2) docile (~> 1.1) @@ -602,14 +593,17 @@ GEM simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) sixarm_ruby_unaccent (1.2.0) - skylight (5.0.1) - activesupport (>= 5.2.0) + skylight (3.1.5) + skylight-core (= 3.1.5) + skylight-core (3.1.5) + activesupport (>= 4.2.0) + slop (3.6.0) sort_alphabetical (1.1.0) unicode_utils (>= 1.2.2) - spring (2.1.1) + spring (1.6.3) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (4.0.2) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.2) @@ -618,19 +612,19 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.4.2) ssrf_filter (1.0.7) - stripe (5.32.1) + stripe (5.14.0) stripe-ruby-mock (3.0.1) dante (>= 0.2.0) multi_json (~> 1.0) stripe (> 5, < 6) sysexits (1.2.0) - temple (0.8.2) + temple (0.8.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thor (1.1.0) thread_safe (0.3.6) - tilt (2.0.10) - timecop (0.9.4) + tilt (2.0.9) + timecop (0.9.1) transitions (1.2.1) ttfunk (1.7.0) turbolinks (5.2.1) @@ -638,12 +632,12 @@ GEM turbolinks-source (5.2.0) tzinfo (1.2.9) thread_safe (~> 0.1) - uglifier (4.2.0) + uglifier (4.1.20) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unf_ext (0.0.7.5) + unicode-display_width (1.6.0) unicode_utils (1.4.0) unobtrusive_flash (3.3.1) railties @@ -654,22 +648,21 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webdrivers (4.6.0) + webdrivers (4.1.3) nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) - webmock (3.12.2) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) + hashdiff websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - whenever (1.0.0) + whenever (0.10.0) chronic (>= 0.6.3) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.4.2) PLATFORMS ruby @@ -802,4 +795,4 @@ RUBY VERSION ruby 2.6.6p146 BUNDLED WITH - 1.17.3 + 1.17.3 \ No newline at end of file From ed723239fd51e2aec101479ee58b1e84fa2a0004 Mon Sep 17 00:00:00 2001 From: rajavi-mishra Date: Thu, 29 Apr 2021 22:56:47 -0700 Subject: [PATCH 12/12] gemfile changes for hakiri fix --- Gemfile.lock | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index faebeac8..24bc65a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -171,11 +171,15 @@ GEM railties (>= 3.0.0) faker (1.9.3) i18n (>= 0.7) - faraday (1.3.0) + faraday (1.4.1) + faraday-excon (~> 1.1) faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) - ruby2_keywords + ruby2_keywords (>= 0.0.4) + faraday-excon (1.1.0) faraday-net_http (1.0.1) + faraday-net_http_persistent (1.1.0) fastimage (2.1.4) feature (1.4.0) ffi (1.10.0) @@ -293,7 +297,7 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2021.0225) - mimemagic (0.4.3) + mimemagic (0.3.10) nokogiri (~> 1) rake mina (1.2.3) @@ -301,7 +305,7 @@ GEM rake mini_magick (4.9.5) mini_mime (1.0.3) - mini_portile2 (2.5.0) + mini_portile2 (2.5.1) minitest (5.14.4) momentjs-rails (2.20.1) railties (>= 3.1) @@ -320,7 +324,7 @@ GEM nenv (0.3.0) netrc (0.11.0) nio4r (2.5.7) - nokogiri (1.11.2) + nokogiri (1.11.3) mini_portile2 (~> 2.5.0) racc (~> 1.4) notiffany (0.1.1) @@ -332,7 +336,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.20.0) + octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.9.1) @@ -496,7 +500,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.4) + rexml (3.2.5) rolify (5.2.0) rqrcode (0.10.1) chunky_png (~> 1.0) @@ -637,7 +641,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.6.0) + unicode-display_width (1.6.1) unicode_utils (1.4.0) unobtrusive_flash (3.3.1) railties @@ -795,4 +799,4 @@ RUBY VERSION ruby 2.6.6p146 BUNDLED WITH - 1.17.3 \ No newline at end of file + 1.17.3