Merge OSEM updates

Gemfile.lock

@@ -85,7 +85,7 @@ GEM
     axlsx_rails (0.5.2)
       actionpack (>= 3.1)
       axlsx (>= 2.0.1)
-    bcrypt (3.1.13)
+    bcrypt (3.1.16)
     bindex (0.6.0)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
@@ -104,7 +104,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (~> 1.5)
       xpath (~> 3.2)
-    carrierwave (2.2.0)
+    carrierwave (2.1.1)
       activemodel (>= 5.0.0)
       activesupport (>= 5.0.0)
       addressable (~> 2.6)
@@ -126,11 +126,12 @@ GEM
     cloudinary (1.11.1)
       aws_cf_signer
       rest-client
-    cocoon (1.2.14)
+    cocoon (1.2.15)
     codecov (0.5.0)
       simplecov (>= 0.15, < 0.22)
     coderay (1.1.1)
     concurrent-ruby (1.1.8)
+    connection_pool (2.2.2)
     countable-rails (0.0.1)
       railties (>= 3.1)
     countries (3.0.0)
@@ -144,7 +145,7 @@ GEM
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
     daemons (1.3.1)
-    dalli (2.7.10)
+    dalli (2.7.11)
     dante (0.2.0)
     database_cleaner (1.7.0)
     delayed_job (4.1.8)
@@ -152,7 +153,7 @@ GEM
     delayed_job_active_record (4.1.4)
       activerecord (>= 3.0, < 6.1)
       delayed_job (>= 3.0, < 5)
-    devise (4.7.1)
+    devise (4.7.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -254,6 +255,9 @@ GEM
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     i18n_data (0.8.0)
+    icalendar (2.7.0)
+      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)
@@ -300,7 +304,7 @@ GEM
     method_source (0.8.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0212)
+    mime-types-data (3.2021.0225)
     mimemagic (0.3.5)
     mina (1.2.3)
       open4 (~> 1.3.4)
@@ -370,8 +374,7 @@ GEM
     parallel (1.18.0)
     parser (2.6.5.0)
       ast (~> 2.4.0)
-    path_expander (1.1.0)
-    pdf-core (0.7.0)
+    pdf-core (0.9.0)
     pdf-inspector (1.3.0)
       pdf-reader (>= 1.0, < 3.0.a)
     pdf-reader (2.2.0)
@@ -385,13 +388,13 @@ GEM
       actionpack
       activesupport
       rails (>= 3.0.0)
-    prawn (2.2.2)
-      pdf-core (~> 0.7.0)
-      ttfunk (~> 1.5)
+    prawn (2.4.0)
+      pdf-core (~> 0.9.0)
+      ttfunk (~> 1.7)
     prawn-qrcode (0.3.1)
       prawn (>= 1)
       rqrcode (>= 0.4.1)
-    prawn-rails (1.2.0)
+    prawn-rails (1.3.0)
       prawn
       prawn-table
       rails (>= 3.1.0)
@@ -599,6 +602,8 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
+    simplecov-cobertura (1.4.2)
+      simplecov (~> 0.8)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
     sixarm_ruby_unaccent (1.2.0)
@@ -635,7 +640,7 @@ GEM
     tilt (2.0.9)
     timecop (0.9.1)
     transitions (1.2.1)
-    ttfunk (1.5.1)
+    ttfunk (1.7.0)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -650,8 +655,8 @@ GEM
     unicode_utils (1.4.0)
     unobtrusive_flash (3.3.1)
       railties
-    warden (1.2.8)
-      rack (>= 2.0.6)
+    warden (1.2.9)
+      rack (>= 2.0.9)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
@@ -672,7 +677,6 @@ GEM
       chronic (>= 0.6.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yajl-ruby (1.4.1)
 
 PLATFORMS
   ruby
@@ -699,7 +703,6 @@ DEPENDENCIES
   climate_control
   cloudinary
   cocoon
-  codecov
   countable-rails
   country_select
   daemons
@@ -719,7 +722,9 @@ DEPENDENCIES
   gravtastic
   guard-rspec
   haml-lint
+  haml_lint
   haml-rails
+  icalendar
   iso-639
   jquery-datatables
   jquery-rails
@@ -766,7 +771,6 @@ DEPENDENCIES
   rails-assets-waypoints!
   rails-controller-testing
   rails-i18n
-  rdoc-generator-fivefish
   recaptcha
   redcarpet
   responders (~> 2.0)
@@ -782,6 +786,7 @@ DEPENDENCIES
   sentry-rails
   sentry-ruby
   shoulda-matchers
+  simplecov-cobertura
   skylight
   spring-commands-rspec
   sprockets-rails