gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2691 from digitaltom/update_codecov_dependency

Browse source 
Update gems with security issues - make CI green
This commit is contained in:
Stella Rouzi 2020-10-29 09:40:17 +02:00 • committed by GitHub
commit 87144caeb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 71 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -10,7 +10,7 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4')
end end
# as web framework # as web framework
gem 'rails', '~> 5.2.3' gem 'rails', '~> 5.2'
# Use Puma as the app server # Use Puma as the app server
gem 'puma', '~> 3.0' gem 'puma', '~> 3.0'
@ -82,7 +82,7 @@ gem 'formtastic-bootstrap'
# as the JavaScript library # as the JavaScript library
gem 'jquery-rails' gem 'jquery-rails'
gem 'jquery-ui-rails', '~> 4.2.1' gem 'jquery-ui-rails', '~> 6.0.1'
# for languages validation # for languages validation
gem 'iso-639' gem 'iso-639'

125
Gemfile.lock
View file

@ -13,25 +13,25 @@ GEM
remote: https://rails-assets.org/ remote: https://rails-assets.org/
specs: specs:
Ascii85 (1.0.3) Ascii85 (1.0.3)
actioncable (5.2.3) actioncable (5.2.4.4)
actionpack (= 5.2.3) actionpack (= 5.2.4.4)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailer (5.2.3) actionmailer (5.2.4.4)
actionpack (= 5.2.3) actionpack (= 5.2.4.4)
actionview (= 5.2.3) actionview (= 5.2.4.4)
activejob (= 5.2.3) activejob (= 5.2.4.4)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.2.3) actionpack (5.2.4.4)
actionview (= 5.2.3) actionview (= 5.2.4.4)
activesupport (= 5.2.3) activesupport (= 5.2.4.4)
rack (~> 2.0) rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.3) actionview (5.2.4.4)
activesupport (= 5.2.3) activesupport (= 5.2.4.4)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
@ -41,20 +41,20 @@ GEM
activemodel (>= 4.1, < 6.1) activemodel (>= 4.1, < 6.1)
case_transform (>= 0.2) case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3) jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (5.2.3) activejob (5.2.4.4)
activesupport (= 5.2.3) activesupport (= 5.2.4.4)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.2.3) activemodel (5.2.4.4)
activesupport (= 5.2.3) activesupport (= 5.2.4.4)
activerecord (5.2.3) activerecord (5.2.4.4)
activemodel (= 5.2.3) activemodel (= 5.2.4.4)
activesupport (= 5.2.3) activesupport (= 5.2.4.4)
arel (>= 9.0) arel (>= 9.0)
activestorage (5.2.3) activestorage (5.2.4.4)
actionpack (= 5.2.3) actionpack (= 5.2.4.4)
activerecord (= 5.2.3) activerecord (= 5.2.4.4)
marcel (~> 0.3.1) marcel (~> 0.3.1)
activesupport (5.2.3) activesupport (5.2.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@ -94,7 +94,7 @@ GEM
bootstrap-switch-rails (3.0.2) bootstrap-switch-rails (3.0.2)
bootstrap3-datetimepicker-rails (4.17.47) bootstrap3-datetimepicker-rails (4.17.47)
momentjs-rails (>= 2.8.1) momentjs-rails (>= 2.8.1)
builder (3.2.3) builder (3.2.4)
byebug (11.0.1) byebug (11.0.1)
cancancan (2.3.0) cancancan (2.3.0)
capybara (3.26.0) capybara (3.26.0)
@ -115,7 +115,7 @@ GEM
fastimage fastimage
case_transform (0.2) case_transform (0.2)
activesupport activesupport
chartkick (3.3.0) chartkick (3.4.0)
childprocess (3.0.0) childprocess (3.0.0)
chronic (0.10.2) chronic (0.10.2)
chunky_png (1.3.11) chunky_png (1.3.11)
@ -124,12 +124,11 @@ GEM
aws_cf_signer aws_cf_signer
rest-client rest-client
cocoon (1.2.14) cocoon (1.2.14)
codecov (0.1.14) codecov (0.2.11)
json json
simplecov simplecov
url
coderay (1.1.1) coderay (1.1.1)
concurrent-ruby (1.1.5) concurrent-ruby (1.1.7)
connection_pool (2.2.2) connection_pool (2.2.2)
countable-rails (0.0.1) countable-rails (0.0.1)
railties (>= 3.1) railties (>= 3.1)
@ -142,7 +141,7 @@ GEM
sort_alphabetical (~> 1.0) sort_alphabetical (~> 1.0)
crack (0.4.3) crack (0.4.3)
safe_yaml (~> 1.0.0) safe_yaml (~> 1.0.0)
crass (1.0.5) crass (1.0.6)
daemons (1.3.1) daemons (1.3.1)
dalli (2.7.10) dalli (2.7.10)
dante (0.2.0) dante (0.2.0)
@ -161,7 +160,7 @@ GEM
devise_ichain_authenticatable (0.3.2) devise_ichain_authenticatable (0.3.2)
devise (>= 2.2) devise (>= 2.2)
diff-lcs (1.3) diff-lcs (1.3)
docile (1.3.1) docile (1.3.2)
domain_name (0.5.20180417) domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.5) dotenv (2.7.5)
@ -235,7 +234,7 @@ GEM
htmlentities (4.3.4) htmlentities (4.3.4)
http-cookie (1.0.3) http-cookie (1.0.3)
domain_name (~> 0.5) domain_name (~> 0.5)
i18n (1.7.0) i18n (1.8.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
i18n_data (0.8.0) i18n_data (0.8.0)
inversion (1.1.1) inversion (1.1.1)
@ -252,9 +251,9 @@ GEM
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (4.2.1) jquery-ui-rails (6.0.1)
railties (>= 3.2.16) railties (>= 3.2.16)
json (2.3.0) json (2.3.1)
json-schema (2.8.1) json-schema (2.8.1)
addressable (>= 2.4) addressable (>= 2.4)
jsonapi-renderer (0.2.2) jsonapi-renderer (0.2.2)
@ -270,7 +269,7 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2) ruby_dep (~> 1.2)
loggability (0.14.0) loggability (0.14.0)
loofah (2.4.0) loofah (2.7.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lumberjack (1.0.12) lumberjack (1.0.12)
@ -282,14 +281,14 @@ GEM
mime-types (3.2.2) mime-types (3.2.2)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812) mime-types-data (3.2018.0812)
mimemagic (0.3.3) mimemagic (0.3.5)
mina (1.2.3) mina (1.2.3)
open4 (~> 1.3.4) open4 (~> 1.3.4)
rake rake
mini_magick (4.9.5) mini_magick (4.9.5)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.4.0)
minitest (5.13.0) minitest (5.14.2)
momentjs-rails (2.20.1) momentjs-rails (2.20.1)
railties (>= 3.1) railties (>= 3.1)
monetize (1.9.2) monetize (1.9.2)
@ -309,8 +308,8 @@ GEM
net-http-persistent (3.0.1) net-http-persistent (3.0.1)
connection_pool (~> 2.2) connection_pool (~> 2.2)
netrc (0.11.0) netrc (0.11.0)
nio4r (2.5.2) nio4r (2.5.4)
nokogiri (1.10.8) nokogiri (1.10.10)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
notiffany (0.1.1) notiffany (0.1.1)
nenv (~> 0.1) nenv (~> 0.1)
@ -379,24 +378,24 @@ GEM
slop (~> 3.4) slop (~> 3.4)
public_suffix (3.1.1) public_suffix (3.1.1)
puma (3.12.6) puma (3.12.6)
rack (2.1.4) rack (2.2.3)
rack-openid (1.3.1) rack-openid (1.3.1)
rack (>= 1.1.0) rack (>= 1.1.0)
ruby-openid (>= 2.1.8) ruby-openid (>= 2.1.8)
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (5.2.3) rails (5.2.4.4)
actioncable (= 5.2.3) actioncable (= 5.2.4.4)
actionmailer (= 5.2.3) actionmailer (= 5.2.4.4)
actionpack (= 5.2.3) actionpack (= 5.2.4.4)
actionview (= 5.2.3) actionview (= 5.2.4.4)
activejob (= 5.2.3) activejob (= 5.2.4.4)
activemodel (= 5.2.3) activemodel (= 5.2.4.4)
activerecord (= 5.2.3) activerecord (= 5.2.4.4)
activestorage (= 5.2.3) activestorage (= 5.2.4.4)
activesupport (= 5.2.3) activesupport (= 5.2.4.4)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 5.2.3) railties (= 5.2.4.4)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-assets-bootstrap (3.3.6) rails-assets-bootstrap (3.3.6)
rails-assets-jquery (>= 1.9.1, < 3) rails-assets-jquery (>= 1.9.1, < 3)
@ -430,9 +429,9 @@ GEM
rails-i18n (5.1.3) rails-i18n (5.1.3)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 5.0, < 6) railties (>= 5.0, < 6)
railties (5.2.3) railties (5.2.4.4)
actionpack (= 5.2.3) actionpack (= 5.2.4.4)
activesupport (= 5.2.3) activesupport (= 5.2.4.4)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0) thor (>= 0.19.0, < 2.0)
@ -529,11 +528,10 @@ GEM
shellany (0.0.1) shellany (0.0.1)
shoulda-matchers (4.1.2) shoulda-matchers (4.1.2)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
simplecov (0.16.1) simplecov (0.19.0)
docile (~> 1.1) docile (~> 1.1)
json (>= 1.8, < 3) simplecov-html (~> 0.11)
simplecov-html (~> 0.10.0) simplecov-html (0.12.3)
simplecov-html (0.10.2)
sixarm_ruby_unaccent (1.2.0) sixarm_ruby_unaccent (1.2.0)
skylight (3.1.5) skylight (3.1.5)
skylight-core (= 3.1.5) skylight-core (= 3.1.5)
@ -548,7 +546,7 @@ GEM
sprockets (3.7.2) sprockets (3.7.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.2.1) sprockets-rails (3.2.2)
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
@ -562,7 +560,7 @@ GEM
stripe (>= 2.0.3) stripe (>= 2.0.3)
sysexits (1.2.0) sysexits (1.2.0)
temple (0.8.0) temple (0.8.0)
thor (0.20.3) thor (1.0.1)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.9) tilt (2.0.9)
timecop (0.9.1) timecop (0.9.1)
@ -573,7 +571,7 @@ GEM
turbolinks (5.2.1) turbolinks (5.2.1)
turbolinks-source (~> 5.2) turbolinks-source (~> 5.2)
turbolinks-source (5.2.0) turbolinks-source (5.2.0)
tzinfo (1.2.5) tzinfo (1.2.7)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (4.1.20) uglifier (4.1.20)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
@ -584,7 +582,6 @@ GEM
unicode_utils (1.4.0) unicode_utils (1.4.0)
unobtrusive_flash (3.3.1) unobtrusive_flash (3.3.1)
railties railties
url (0.3.2)
warden (1.2.8) warden (1.2.8)
rack (>= 2.0.6) rack (>= 2.0.6)
web-console (3.7.0) web-console (3.7.0)
@ -600,7 +597,7 @@ GEM
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff hashdiff
websocket-driver (0.7.1) websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
whenever (0.10.0) whenever (0.10.0)
@ -658,7 +655,7 @@ DEPENDENCIES
iso-639 iso-639
jquery-datatables-rails jquery-datatables-rails
jquery-rails jquery-rails
jquery-ui-rails (~> 4.2.1) jquery-ui-rails (~> 6.0.1)
json-schema json-schema
leaflet-rails leaflet-rails
letter_opener letter_opener
@ -679,7 +676,7 @@ DEPENDENCIES
prawn-qrcode prawn-qrcode
prawn-rails prawn-rails
puma (~> 3.0) puma (~> 3.0)
rails (~> 5.2.3) rails (~> 5.2)
rails-assets-bootstrap-markdown! rails-assets-bootstrap-markdown!
rails-assets-bootstrap-select! rails-assets-bootstrap-select!
rails-assets-date.format! rails-assets-date.format!

4
app/assets/javascripts/application.js
View file

@ -13,8 +13,8 @@
//= require jquery //= require jquery
//= require jquery_ujs //= require jquery_ujs
//= require jquery.mobile.custom.min //= require jquery.mobile.custom.min
//= require jquery.ui.draggable //= require jquery-ui/widgets/draggable
//= require jquery.ui.droppable //= require jquery-ui/widgets/droppable
//= require waypoints/jquery.waypoints //= require waypoints/jquery.waypoints
//= require dataTables/jquery.dataTables //= require dataTables/jquery.dataTables
//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap

12
spec/spec_helper.rb
View file

@ -78,12 +78,12 @@ RSpec.configure do |config|
end end
Capybara.register_driver :chrome_headless do |app| Capybara.register_driver :chrome_headless do |app|
capabilities = Selenium::WebDriver::Remote::Capabilities.chrome( options = ::Selenium::WebDriver::Chrome::Options.new
chromeOptions: { args: %w(headless disable-gpu window-size=1920x1080 no-sandbox) } options.args << '--window-size=1920x1080'
) options.args << '--headless'
Capybara::Selenium::Driver.new( options.args << '--no-sandbox'
app, browser: :chrome, desired_capabilities: capabilities options.args << '--disable-gpu'
) Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
end end
Capybara.default_max_wait_time = 10 # seconds Capybara.default_max_wait_time = 10 # seconds