# HG changeset patch # User Nattee Niparnan # Date 2022-01-14 02:53:17 # Node ID 225968e53d89eef4b54e83a2dabdea105a54b397 # Parent a7823c56c058b3b76961142779591e0a77219b87 upgrade to 5.2.6 diff --git a/Gemfile.lock b/Gemfile.lock --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,211 +1,215 @@ GEM remote: https://rubygems.org/ specs: - RubyInline (3.12.4) + RubyInline (3.12.5) ZenTest (~> 4.3) - ZenTest (4.11.2) - ace-rails-ap (4.2) - actioncable (5.2.4.2) - actionpack (= 5.2.4.2) + ZenTest (4.12.0) + ace-rails-ap (4.4) + actioncable (5.2.6) + actionpack (= 5.2.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.2) - actionpack (= 5.2.4.2) - actionview (= 5.2.4.2) - activejob (= 5.2.4.2) + actionmailer (5.2.6) + actionpack (= 5.2.6) + actionview (= 5.2.6) + activejob (= 5.2.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.2) - actionview (= 5.2.4.2) - activesupport (= 5.2.4.2) + actionpack (5.2.6) + actionview (= 5.2.6) + activesupport (= 5.2.6) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.4.2) - activesupport (= 5.2.4.2) + actionview (5.2.6) + activesupport (= 5.2.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.4.2) - activesupport (= 5.2.4.2) + activejob (5.2.6) + activesupport (= 5.2.6) globalid (>= 0.3.6) - activemodel (5.2.4.2) - activesupport (= 5.2.4.2) - activerecord (5.2.4.2) - activemodel (= 5.2.4.2) - activesupport (= 5.2.4.2) + activemodel (5.2.6) + activesupport (= 5.2.6) + activerecord (5.2.6) + activemodel (= 5.2.6) + activesupport (= 5.2.6) arel (>= 9.0) - activerecord-session_store (1.1.3) - actionpack (>= 4.0) - activerecord (>= 4.0) + activerecord-session_store (2.0.0) + actionpack (>= 5.2.4.1) + activerecord (>= 5.2.4.1) multi_json (~> 1.11, >= 1.11.2) - rack (>= 1.5.2, < 3) - railties (>= 4.0) - activestorage (5.2.4.2) - actionpack (= 5.2.4.2) - activerecord (= 5.2.4.2) - marcel (~> 0.3.1) - activesupport (5.2.4.2) + rack (>= 2.0.8, < 3) + railties (>= 5.2.4.1) + activestorage (5.2.6) + actionpack (= 5.2.6) + activerecord (= 5.2.6) + marcel (~> 1.0.0) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) ansi (1.5.0) arel (9.0.0) - autoprefixer-rails (9.5.1) - execjs + autoprefixer-rails (10.4.2.0) + execjs (~> 2) best_in_place (3.0.3) actionpack (>= 3.2) railties (>= 3.2) bindex (0.8.1) - bootsnap (1.4.6) + bootsnap (1.9.4) msgpack (~> 1.0) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) - bootstrap-switch-rails (3.3.4) + bootstrap-switch-rails (3.3.5) bootstrap-toggle-rails (2.2.1.0) bootstrap3-datetimepicker-rails (4.17.47) momentjs-rails (>= 2.8.1) builder (3.2.4) - byebug (11.0.1) - capybara (3.15.1) + byebug (11.1.3) + capybara (3.36.0) addressable + matrix mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.2) + regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - childprocess (3.0.0) - coffee-rails (4.2.2) + childprocess (4.1.0) + coffee-rails (5.0.0) coffee-script (>= 2.2.0) - railties (>= 4.0.0) + railties (>= 5.2.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.9) crass (1.0.6) dynamic_form (1.1.4) - erubi (1.9.0) + erubi (1.10.0) erubis (2.7.0) - execjs (2.7.0) - ffi (1.10.0) + execjs (2.8.1) + ffi (1.15.5) fuzzy-string-match (1.0.1) RubyInline (>= 3.8.6) - globalid (0.4.2) - activesupport (>= 4.2.0) - haml (5.0.4) + globalid (1.0.0) + activesupport (>= 5.0) + haml (5.2.2) temple (>= 0.8.0) tilt - 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) + railties (>= 5.1) html2haml (2.2.0) erubis (~> 2.7.0) haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - i18n (1.8.2) + i18n (1.8.11) concurrent-ruby (~> 1.0) in_place_editing (1.2.0) - jbuilder (2.10.0) + jbuilder (2.11.5) + actionview (>= 5.0.0) activesupport (>= 5.0.0) jquery-countdown-rails (2.0.2) - jquery-rails (4.3.3) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-tablesorter (1.26.1) - railties (>= 3.2, < 6) + jquery-tablesorter (1.27.2) + railties (>= 3.2) jquery-ui-rails (6.0.1) railties (>= 3.2.16) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.4.0) + loofah (2.13.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.2) + matrix (0.4.2) method_source (1.0.0) - mimemagic (0.3.4) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.0) - minitest-reporters (1.3.6) + mini_mime (1.1.2) + mini_portile2 (2.7.1) + minitest (5.15.0) + minitest-reporters (1.4.3) ansi builder minitest (>= 5.0) ruby-progressbar - momentjs-rails (2.20.1) + momentjs-rails (2.29.1.1) railties (>= 3.1) - msgpack (1.3.3) - multi_json (1.13.1) - mysql2 (0.5.2) - nio4r (2.5.2) - nokogiri (1.10.9) - mini_portile2 (~> 2.4.0) - public_suffix (4.0.3) - puma (4.3.3) + msgpack (1.4.2) + multi_json (1.15.0) + mysql2 (0.5.3) + nio4r (2.5.8) + nokogiri (1.13.1) + mini_portile2 (~> 2.7.0) + racc (~> 1.4) + public_suffix (4.0.6) + puma (5.5.2) nio4r (~> 2.0) - rack (2.2.2) + racc (1.6.0) + rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.2) - actioncable (= 5.2.4.2) - actionmailer (= 5.2.4.2) - actionpack (= 5.2.4.2) - actionview (= 5.2.4.2) - activejob (= 5.2.4.2) - activemodel (= 5.2.4.2) - activerecord (= 5.2.4.2) - activestorage (= 5.2.4.2) - activesupport (= 5.2.4.2) + rails (5.2.6) + actioncable (= 5.2.6) + actionmailer (= 5.2.6) + actionpack (= 5.2.6) + actionview (= 5.2.6) + activejob (= 5.2.6) + activemodel (= 5.2.6) + activerecord (= 5.2.6) + activestorage (= 5.2.6) + activesupport (= 5.2.6) bundler (>= 1.3.0) - railties (= 5.2.4.2) + railties (= 5.2.6) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.4) - actionpack (>= 5.0.1.x) - actionview (>= 5.0.1.x) - activesupport (>= 5.0.1.x) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) - rails_bootstrap_sortable (2.0.6) + rails_bootstrap_sortable (2.0.7) momentjs-rails (>= 2.8.3) - railties (5.2.4.2) - actionpack (= 5.2.4.2) - activesupport (= 5.2.4.2) + railties (5.2.6) + actionpack (= 5.2.6) + activesupport (= 5.2.6) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.1) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rake (13.0.6) + rb-fsevent (0.11.0) + rb-inotify (0.10.1) ffi (~> 1.0) - rdiscount (2.2.0.1) - regexp_parser (1.7.0) - rouge (3.3.0) - ruby-progressbar (1.10.0) + rdiscount (2.2.0.2) + regexp_parser (2.2.0) + rexml (3.2.5) + rouge (3.27.0) + ruby-progressbar (1.11.0) ruby_dep (1.5.0) - ruby_parser (3.13.1) - sexp_processor (~> 4.9) - rubyzip (1.3.0) - sassc (2.2.1) + ruby_parser (3.18.1) + sexp_processor (~> 4.16) + rubyzip (2.3.2) + sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) @@ -213,45 +217,44 @@ sprockets (> 3.0) sprockets-rails tilt - select2-rails (4.0.3) - thor (~> 0.14) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) + select2-rails (4.0.13) + selenium-webdriver (4.1.0) + childprocess (>= 0.5, < 5.0) + rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) - sexp_processor (4.12.0) - simple_form (5.0.2) - actionpack (>= 5.0) - activemodel (>= 5.0) - spring (2.0.2) - activesupport (>= 4.2) + sexp_processor (4.16.0) + simple_form (5.1.0) + actionpack (>= 5.2) + activemodel (>= 5.2) + spring (2.1.1) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (3.7.2) + sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.4.1) - temple (0.8.1) - thor (0.20.3) + sqlite3 (1.4.2) + temple (0.8.2) + thor (1.2.1) thread_safe (0.3.6) - tilt (2.0.9) - tzinfo (1.2.7) + tilt (2.0.10) + tzinfo (1.2.9) thread_safe (~> 0.1) - uglifier (4.1.20) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) web-console (3.7.0) actionview (>= 5.0) activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webdriver (0.5.0) - websocket-driver (0.7.1) + webdriver (0.19.0) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) yaml_db (0.7.0) diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,4 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css + diff --git a/app/assets/stylesheets/graders.css b/app/assets/stylesheets/graders.css deleted file mode 100644 --- a/app/assets/stylesheets/graders.css +++ /dev/null @@ -1,17 +0,0 @@ - -table.graders tr.active { - border: 1px solid black; - background: lightgreen; - text-align: center; -} - -table.graders tr.inactive { - border: 1px solid black; - background: #ffcccc; - text-align: center; -} - -.submitbox .item { - padding-right: 5px; - float: left; -} diff --git a/app/assets/stylesheets/graders.css.scss b/app/assets/stylesheets/graders.css.scss --- a/app/assets/stylesheets/graders.css.scss +++ b/app/assets/stylesheets/graders.css.scss @@ -0,0 +1,18 @@ +table.graders tr { + &.active { + border: 1px solid black; + background: lightgreen; + text-align: center; + } + + &.inactive { + border: 1px solid black; + background: #ffcccc; + text-align: center; + } +} + +.submitbox .item { + padding-right: 5px; + float: left; +} diff --git a/app/assets/stylesheets/problems.css b/app/assets/stylesheets/problems.css deleted file mode 100644 --- a/app/assets/stylesheets/problems.css +++ /dev/null @@ -1,14 +0,0 @@ - -tr.available { - background: #c0ffc0; -} - -tr.not-available { - background: #ffc0c0; -} - -.import-log { - background: lightgray; - border: solid black 1px; - padding: 10px; -} \ No newline at end of file diff --git a/app/assets/stylesheets/problems.css.scss b/app/assets/stylesheets/problems.css.scss --- a/app/assets/stylesheets/problems.css.scss +++ b/app/assets/stylesheets/problems.css.scss @@ -0,0 +1,15 @@ +tr { + &.available { + background: #c0ffc0; + } + + &.not-available { + background: #ffc0c0; + } +} + +.import-log { + background: lightgray; + border: solid black 1px; + padding: 10px; +}