diff --git a/Gemfile b/Gemfile index cad426e4..9c89ebf4 100644 --- a/Gemfile +++ b/Gemfile @@ -87,7 +87,7 @@ group :development, :test do # Environment configuration. gem 'dotenv-rails' # Use a sqlite database in test and development. - gem 'sqlite3', '~> 1.3' + gem 'sqlite3', '~> 1.3.6' end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 3bcd53c3..097f1c68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,61 +1,61 @@ GEM remote: https://rubygems.org/ specs: - action-cable-testing (0.3.1) - actioncable (~> 5.0) - actioncable (5.0.7) - actionpack (= 5.0.7) + action-cable-testing (0.5.0) + actioncable (>= 5.0) + actioncable (5.0.7.2) + actionpack (= 5.0.7.2) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) + actionmailer (5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7) - actionview (= 5.0.7) - activesupport (= 5.0.7) + actionpack (5.0.7.2) + actionview (= 5.0.7.2) + activesupport (= 5.0.7.2) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7) - activesupport (= 5.0.7) + actionview (5.0.7.2) + activesupport (= 5.0.7.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.7) - activesupport (= 5.0.7) + activejob (5.0.7.2) + activesupport (= 5.0.7.2) globalid (>= 0.3.6) - activemodel (5.0.7) - activesupport (= 5.0.7) - activerecord (5.0.7) - activemodel (= 5.0.7) - activesupport (= 5.0.7) + activemodel (5.0.7.2) + activesupport (= 5.0.7.2) + activerecord (5.0.7.2) + activemodel (= 5.0.7.2) + activesupport (= 5.0.7.2) arel (~> 7.0) - activesupport (5.0.7) + activesupport (5.0.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) arel (7.1.4) ast (2.4.0) - autoprefixer-rails (9.4.9) + autoprefixer-rails (9.5.1.1) execjs bcrypt (3.1.12) bigbluebutton-api-ruby (1.7.0) xml-simple (~> 1.1) - bindex (0.5.0) + bindex (0.7.0) bootstrap (4.3.1) autoprefixer-rails (>= 9.1.0) popper_js (>= 1.14.3, < 2) sassc-rails (>= 2.0.0) builder (3.2.3) - byebug (10.0.2) + byebug (11.0.1) cancancan (2.3.0) coffee-rails (4.2.2) coffee-script (>= 2.2.0) @@ -64,105 +64,96 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) - coveralls (0.7.1) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor + concurrent-ruby (1.1.5) + coveralls (0.8.23) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) + term-ansicolor (~> 1.3) + thor (>= 0.19.4, < 2.0) + tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) diff-lcs (1.3) docile (1.3.1) - domain_name (0.5.20180417) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.5.0) - dotenv-rails (2.5.0) - dotenv (= 2.5.0) - railties (>= 3.2, < 6.0) + dotenv (2.7.2) + dotenv-rails (2.7.2) + dotenv (= 2.7.2) + railties (>= 3.2, < 6.1) erubis (2.7.0) execjs (2.7.0) - factory_bot (4.10.0) - activesupport (>= 3.0.0) - factory_bot_rails (4.10.0) - factory_bot (~> 4.10.0) - railties (>= 3.0.0) - faker (1.8.7) - i18n (>= 0.7) - faraday (0.12.2) - multipart-post (>= 1.2, < 3) - ffi (1.9.25) - globalid (0.4.1) + factory_bot (5.0.2) activesupport (>= 4.2.0) - hashdiff (0.3.7) - hashie (3.5.7) + factory_bot_rails (5.0.2) + factory_bot (~> 5.0.2) + railties (>= 4.2.0) + faker (1.9.3) + i18n (>= 0.7) + faraday (0.15.4) + multipart-post (>= 1.2, < 3) + ffi (1.11.1) + globalid (0.4.2) + activesupport (>= 4.2.0) + hashdiff (0.3.9) + hashie (3.6.0) health_check (3.0.0) railties (>= 5.0) - http-cookie (1.0.3) - domain_name (~> 0.5) http_accept_language (2.1.1) - i18n (1.0.1) + i18n (1.6.0) concurrent-ruby (~> 1.0) jaro_winkler (1.5.2) - jbuilder (2.7.0) + jbuilder (2.9.1) activesupport (>= 4.2.0) - multi_json (>= 1.2) jquery-rails (4.3.3) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.1.0) - jwt (1.5.6) - libv8 (6.7.288.46.1) + json (2.2.0) + jwt (2.1.0) + libv8 (7.3.492.27.1) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) - method_source (0.9.0) - mime-types (3.2.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) - mini_mime (1.0.0) - mini_portile2 (2.3.0) - mini_racer (0.2.4) - libv8 (>= 6.3) + method_source (0.9.2) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + mini_racer (0.2.6) + libv8 (>= 6.9.411) minitest (5.11.3) multi_json (1.13.1) multi_xml (0.6.0) - multipart-post (2.0.0) + multipart-post (2.1.1) net-ldap (0.16.1) - netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) oauth (0.5.4) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + oauth2 (1.4.1) + faraday (>= 0.8, < 0.16.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.8.1) - hashie (>= 3.4.6, < 3.6.0) + omniauth (1.9.0) + hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) omniauth-bn-launcher (0.1.0) omniauth (~> 1.3, >= 1.3.2) omniauth-oauth2 (= 1.5.0) - omniauth-google-oauth2 (0.5.3) - jwt (>= 1.5) + omniauth-google-oauth2 (0.6.1) + jwt (>= 2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) - omniauth-ldap (2.0.0) - net-ldap (~> 0.16) - omniauth (~> 1.8.1) - pyu-ruby-sasl (~> 0.0.3.3) - rubyntlm (~> 0.6.2) + omniauth-ldap (1.0.5) + net-ldap (~> 0.12) + omniauth (~> 1.0) + pyu-ruby-sasl (~> 0.0.3.2) + rubyntlm (~> 0.3.4) omniauth-microsoft-office365 (0.0.7) omniauth omniauth-oauth2 @@ -175,90 +166,86 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - pagy (2.1.5) + pagy (3.2.0) parallel (1.17.0) parser (2.6.3.0) ast (~> 2.4.0) pg (0.21.0) popper_js (1.14.5) public_suffix (3.0.3) - puma (3.11.4) + puma (3.12.1) pyu-ruby-sasl (0.0.3.3) - rack (2.0.6) + rack (2.0.7) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.7) - actioncable (= 5.0.7) - actionmailer (= 5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) - activemodel (= 5.0.7) - activerecord (= 5.0.7) - activesupport (= 5.0.7) + rails (5.0.7.2) + actioncable (= 5.0.7.2) + actionmailer (= 5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) + activemodel (= 5.0.7.2) + activerecord (= 5.0.7.2) + activesupport (= 5.0.7.2) bundler (>= 1.3.0) - railties (= 5.0.7) + railties (= 5.0.7.2) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.2) - actionpack (~> 5.x, >= 5.0.1) - actionview (~> 5.x, >= 5.0.1) - activesupport (~> 5.x) + rails-controller-testing (1.0.4) + actionpack (>= 5.0.1.x) + actionview (>= 5.0.1.x) + activesupport (>= 5.0.1.x) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (5.0.7) - actionpack (= 5.0.7) - activesupport (= 5.0.7) + railties (5.0.7.2) + actionpack (= 5.0.7.2) + activesupport (= 5.0.7.2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - rake (12.3.1) + rake (12.3.2) random_password (0.1.1) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rb-inotify (0.10.0) + ffi (~> 1.0) recaptcha (4.14.0) json redcarpet (3.4.0) redis (3.3.5) remote_syslog_logger (1.0.4) syslog_protocol - rest-client (2.0.2) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) rolify (5.2.0) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-rails (3.7.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.1) - rubocop (0.68.1) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + rubocop (0.70.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.6) + unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.0) - rubyntlm (0.6.2) - safe_yaml (1.0.4) - sass (3.5.6) + rubyntlm (0.3.4) + safe_yaml (1.0.5) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -272,13 +259,13 @@ GEM sassc (2.0.1) ffi (~> 1.9) rake - sassc-rails (2.1.0) + sassc-rails (2.1.1) railties (>= 4.0.0) sassc (>= 2.0) sprockets (> 3.0) sprockets-rails tilt - shoulda-matchers (3.1.2) + shoulda-matchers (3.1.3) activesupport (>= 4.0.0) simplecov (0.16.1) docile (~> 1.1) @@ -299,31 +286,28 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.3.13) syslog_protocol (0.9.2) - tabler-rubygem (0.1.2) + tabler-rubygem (0.1.4) autoprefixer-rails (>= 6.0.3) - term-ansicolor (1.6.0) + term-ansicolor (1.7.1) tins (~> 1.0) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.8) - tins (1.16.3) - turbolinks (5.1.1) - turbolinks-source (~> 5.1) - turbolinks-source (5.1.0) + tilt (2.0.9) + tins (1.20.2) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.12) + uglifier (4.1.20) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.5) - unicode-display_width (1.5.0) - web-console (3.6.2) + unicode-display_width (1.6.0) + web-console (3.7.0) actionview (>= 5.0) activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webmock (3.4.2) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -376,7 +360,7 @@ DEPENDENCIES shoulda-matchers (~> 3.1) spring spring-watcher-listen (~> 2.0.0) - sqlite3 (~> 1.3) + sqlite3 (~> 1.3.6) tabler-rubygem turbolinks (~> 5) tzinfo-data @@ -385,4 +369,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.17.1 + 2.0.1 diff --git a/scripts/image_build.sh b/scripts/image_build.sh index 09ee975f..fa100280 100755 --- a/scripts/image_build.sh +++ b/scripts/image_build.sh @@ -59,7 +59,7 @@ if [ "$CD_REF_NAME" != "master" ] && [[ "$CD_REF_NAME" != *"release"* ]] && ( [ fi # Include sqlite for production -sed -i "/^group :production do/a\ \ gem 'sqlite3', '~> 1.3'" Gemfile +sed -i "/^group :production do/a\ \ gem 'sqlite3', '~> 1.3.6'" Gemfile # Set the version tag when it is a release or the commit sha was included. if [[ "$CD_REF_NAME" == *"release"* ]]; then sed -i "s/VERSION =.*/VERSION = \"${CD_REF_NAME:8}\"/g" config/initializers/version.rb