diff --git a/Gemfile b/Gemfile index 314c6c0..bc7b5d1 100644 --- a/Gemfile +++ b/Gemfile @@ -8,12 +8,12 @@ end ruby "~> 2.6" # Bundle edge Rails instead: gem "rails", github: "rails/rails" -gem "rails", "~> 5.2.2" +gem "rails", "~> 5.2.4" gem "bootsnap", require: false # Use postgresql as the database for Active Record gem "pg", "~> 0.18" # Use Puma as the app server -gem "puma", "~> 3.0" +gem "puma", "~> 4.0" # Bootstrap : css framework gem "bootstrap-sass", "~> 3.4.1" # Fontawesome @@ -61,7 +61,7 @@ gem "dotenv-rails" gem "rest-client" # Backup files and database -gem "backup", git: "https://github.com/backup/backup.git" +# gem "backup", git: "https://github.com/backup/backup.git" # Background and reccurent gem "whenever", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 4df93c3..7e77ad8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,118 +1,80 @@ -GIT - remote: https://github.com/backup/backup.git - revision: 64370f925e859f858766b674717a3dbee0de7a26 - specs: - backup (5.0.0.beta.2) - aws-sdk (~> 2) - dogapi (= 1.11.0) - dropbox-sdk (= 1.6.5) - excon (~> 0.44) - flowdock (= 0.4.0) - fog (~> 1.28) - hipchat (= 1.0.1) - mail (~> 2.6, >= 2.6.6) - net-scp (= 1.2.1) - net-sftp (= 2.1.2) - net-ssh (= 3.2.0) - nokogiri (~> 1.8, >= 1.8.1) - open4 (= 1.3.0) - pagerduty (= 2.0.0) - qiniu (~> 6.5) - thor (~> 0.18, >= 0.18.1) - twitter (~> 5.5) - unf (= 0.1.3) - GIT remote: https://github.com/seuros/capistrano-puma.git - revision: acbadc8a655d43152cb74129e86a58796c8f300f + revision: 87bfd747bd43a19b5d214e0272b76fb723cf1f5f specs: - capistrano3-puma (3.1.1) + capistrano3-puma (4.0.0) capistrano (~> 3.7) capistrano-bundler - puma (~> 3.4) + puma (~> 4.0) GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.6) - actioncable (5.2.2.1) - actionpack (= 5.2.2.1) + actioncable (5.2.4.2) + actionpack (= 5.2.4.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.2.1) - actionpack (= 5.2.2.1) - actionview (= 5.2.2.1) - activejob (= 5.2.2.1) + actionmailer (5.2.4.2) + actionpack (= 5.2.4.2) + actionview (= 5.2.4.2) + activejob (= 5.2.4.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.2.1) - actionview (= 5.2.2.1) - activesupport (= 5.2.2.1) - rack (~> 2.0) + actionpack (5.2.4.2) + actionview (= 5.2.4.2) + activesupport (= 5.2.4.2) + 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.2.1) - activesupport (= 5.2.2.1) + actionview (5.2.4.2) + activesupport (= 5.2.4.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.2.1) - activesupport (= 5.2.2.1) + activejob (5.2.4.2) + activesupport (= 5.2.4.2) globalid (>= 0.3.6) - activemodel (5.2.2.1) - activesupport (= 5.2.2.1) - activerecord (5.2.2.1) - activemodel (= 5.2.2.1) - activesupport (= 5.2.2.1) + 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) arel (>= 9.0) - activestorage (5.2.2.1) - actionpack (= 5.2.2.1) - activerecord (= 5.2.2.1) + activestorage (5.2.4.2) + actionpack (= 5.2.4.2) + activerecord (= 5.2.4.2) marcel (~> 0.3.1) - activesupport (5.2.2.1) + activesupport (5.2.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - airbrussh (1.3.1) + airbrussh (1.4.0) sshkit (>= 1.6.1, != 1.7.0) - annotate (2.7.4) - activerecord (>= 3.2, < 6.0) - rake (>= 10.4, < 13.0) + annotate (3.1.1) + activerecord (>= 3.2, < 7.0) + rake (>= 10.4, < 14.0) arel (9.0.0) - autoprefixer-rails (9.5.0) + autoprefixer-rails (9.7.6) execjs - aws-eventstream (1.0.2) - aws-sdk (2.11.246) - aws-sdk-resources (= 2.11.246) - aws-sdk-core (2.11.246) - aws-sigv4 (~> 1.0) - jmespath (~> 1.0) - aws-sdk-resources (2.11.246) - aws-sdk-core (= 2.11.246) - aws-sigv4 (1.1.0) - aws-eventstream (~> 1.0, >= 1.0.2) - bcrypt (3.1.12) + bcrypt (3.1.13) betterlorem (0.1.2) - bindex (0.5.0) - bootsnap (1.4.1) + bindex (0.8.1) + bootsnap (1.4.6) msgpack (~> 1.0) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) - buftok (0.2.0) - builder (3.2.3) - byebug (11.0.1) - capistrano (3.11.0) + builder (3.2.4) + byebug (11.1.1) + capistrano (3.13.0) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.5.0) + capistrano-bundler (1.6.0) capistrano (~> 3.1) capistrano-rails (1.4.0) capistrano (~> 3.1) @@ -123,7 +85,7 @@ GEM capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - charlock_holmes (0.7.6) + charlock_holmes (0.7.7) chronic (0.10.2) climate_control (0.2.0) cocaine (0.5.8) @@ -135,272 +97,83 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) - crass (1.0.4) - devise (4.6.1) + concurrent-ruby (1.1.6) + crass (1.0.6) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) - dogapi (1.11.0) - json (>= 1.5.1) - domain_name (0.5.20180417) + domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.1) - dotenv-rails (2.7.1) - dotenv (= 2.7.1) + dotenv (2.7.5) + dotenv-rails (2.7.5) + dotenv (= 2.7.5) railties (>= 3.2, < 6.1) - dropbox-sdk (1.6.5) - json - dry-inflector (0.1.2) - equalizer (0.0.10) - erubi (1.8.0) - excon (0.62.0) + erubi (1.9.0) execjs (2.7.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - ffi (1.10.0) - fission (0.5.0) - CFPropertyList (~> 2.2) - flowdock (0.4.0) - httparty (~> 0.7) - multi_json - fog (1.41.0) - fog-aliyun (>= 0.1.0) - fog-atmos - fog-aws (>= 0.6.0) - fog-brightbox (~> 0.4) - fog-cloudatcost (~> 0.1.0) - fog-core (~> 1.45) - fog-digitalocean (>= 0.3.0) - fog-dnsimple (~> 1.0) - fog-dynect (~> 0.0.2) - fog-ecloud (~> 0.1) - fog-google (<= 0.1.0) - fog-internet-archive - fog-joyent - fog-json - fog-local - fog-openstack - fog-powerdns (>= 0.1.1) - fog-profitbricks - fog-rackspace - fog-radosgw (>= 0.0.2) - fog-riakcs - fog-sakuracloud (>= 0.0.4) - fog-serverlove - fog-softlayer - fog-storm_on_demand - fog-terremark - fog-vmfusion - fog-voxel - fog-vsphere (>= 0.4.0) - fog-xenserver - fog-xml (~> 0.1.1) - ipaddress (~> 0.5) - json (>= 1.8, < 2.0) - fog-aliyun (0.3.3) - fog-core - fog-json - ipaddress (~> 0.8) - xml-simple (~> 1.1) - fog-atmos (0.1.0) - fog-core - fog-xml - fog-aws (2.0.1) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-brightbox (0.16.1) - dry-inflector - fog-core - fog-json - mime-types - fog-cloudatcost (0.1.2) - fog-core (~> 1.36) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-core (1.45.0) - builder - excon (~> 0.58) - formatador (~> 0.2) - fog-digitalocean (0.4.0) - fog-core - fog-json - fog-xml - ipaddress (>= 0.5) - fog-dnsimple (1.0.0) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-dynect (0.0.3) - fog-core - fog-json - fog-xml - fog-ecloud (0.3.0) - fog-core - fog-xml - fog-google (0.1.0) - fog-core - fog-json - fog-xml - fog-internet-archive (0.0.1) - fog-core - fog-json - fog-xml - fog-joyent (0.0.1) - fog-core (~> 1.42) - fog-json (>= 1.0) - fog-json (1.2.0) - fog-core - multi_json (~> 1.10) - fog-local (0.6.0) - fog-core (>= 1.27, < 3.0) - fog-openstack (0.3.10) - fog-core (>= 1.45, <= 2.1.0) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-powerdns (0.2.0) - fog-core - fog-json - fog-xml - fog-profitbricks (4.1.1) - fog-core (~> 1.42) - fog-json (~> 1.0) - fog-rackspace (0.1.6) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) - fog-radosgw (0.0.5) - fog-core (>= 1.21.0) - fog-json - fog-xml (>= 0.0.1) - fog-riakcs (0.1.0) - fog-core - fog-json - fog-xml - fog-sakuracloud (1.7.5) - fog-core - fog-json - fog-serverlove (0.1.2) - fog-core - fog-json - fog-softlayer (1.1.4) - fog-core - fog-json - fog-storm_on_demand (0.1.1) - fog-core - fog-json - fog-terremark (0.1.0) - fog-core - fog-xml - fog-vmfusion (0.1.0) - fission - fog-core - fog-voxel (0.1.0) - fog-core - fog-xml - fog-vsphere (3.0.0) - fog-core - rbvmomi (>= 1.9, < 3) - fog-xenserver (1.0.0) - fog-core - fog-xml - xmlrpc - fog-xml (0.1.3) - fog-core - nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.4) - railties (>= 3.2, < 6.0) - formatador (0.2.5) + ffi (1.12.2) + font-awesome-rails (4.7.0.5) + railties (>= 3.2, < 6.1) globalid (0.4.2) activesupport (>= 4.2.0) - haml (5.0.4) + haml (5.1.2) temple (>= 0.8.0) tilt - hipchat (1.0.1) - httparty - http (1.0.4) - addressable (~> 2.3) - http-cookie (~> 1.0) - http-form_data (~> 1.0.1) - http_parser.rb (~> 0.6.0) + http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.3) - http_parser.rb (0.6.0) - httparty (0.16.4) - mime-types (~> 3.0) - multi_xml (>= 0.5.2) - i18n (1.6.0) + i18n (1.8.2) concurrent-ruby (~> 1.0) - ipaddress (0.8.3) - jbuilder (2.8.0) - activesupport (>= 4.2.0) - multi_json (>= 1.2) - jmespath (1.4.0) - jquery-rails (4.3.3) + jbuilder (2.10.0) + activesupport (>= 5.0.0) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (1.8.6) - kaminari (1.1.1) + kaminari (1.2.0) activesupport (>= 4.1.0) - kaminari-actionview (= 1.1.1) - kaminari-activerecord (= 1.1.1) - kaminari-core (= 1.1.1) - kaminari-actionview (1.1.1) + kaminari-actionview (= 1.2.0) + kaminari-activerecord (= 1.2.0) + kaminari-core (= 1.2.0) + kaminari-actionview (1.2.0) actionview - kaminari-core (= 1.1.1) - kaminari-activerecord (1.1.1) + kaminari-core (= 1.2.0) + kaminari-activerecord (1.2.0) activerecord - kaminari-core (= 1.1.1) - kaminari-core (1.1.1) + kaminari-core (= 1.2.0) + kaminari-core (1.2.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.2.3) + loofah (2.5.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) - memoizable (0.4.2) - thread_safe (~> 0.3, >= 0.3.1) - method_source (0.9.2) - mime-types (3.2.2) + method_source (1.0.0) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) - mimemagic (0.3.3) - mini_mime (1.0.1) + mime-types-data (3.2019.1009) + mimemagic (0.3.4) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) - msgpack (1.2.9) - multi_json (1.13.1) - multi_xml (0.6.0) - multipart-post (2.0.0) - naught (1.1.0) + minitest (5.14.0) + msgpack (1.3.3) nested_form (0.3.2) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - net-ssh (3.2.0) + net-scp (2.0.0) + net-ssh (>= 2.6.5, < 6.0.0) + net-ssh (5.2.0) netrc (0.11.0) - nio4r (2.3.1) - nokogiri (1.10.1) + nio4r (2.5.2) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - open4 (1.3.0) - optimist (3.0.0) orm_adapter (0.5.0) - pagerduty (2.0.0) - json (>= 1.7.7) paperclip (5.2.1) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -408,36 +181,33 @@ GEM mime-types mimemagic (~> 0.3.0) pg (0.21.0) - public_suffix (3.0.3) - puma (3.12.1) - qiniu (6.9.0) - mime-types (~> 3.1) - rest-client (~> 2.0) - rack (2.0.6) - rack-pjax (1.0.0) + puma (4.3.3) + nio4r (~> 2.0) + rack (2.2.2) + rack-pjax (1.1.0) nokogiri (~> 1.5) rack (>= 1.1) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.2.1) - actioncable (= 5.2.2.1) - actionmailer (= 5.2.2.1) - actionpack (= 5.2.2.1) - actionview (= 5.2.2.1) - activejob (= 5.2.2.1) - activemodel (= 5.2.2.1) - activerecord (= 5.2.2.1) - activestorage (= 5.2.2.1) - activesupport (= 5.2.2.1) + 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) bundler (>= 1.3.0) - railties (= 5.2.2.1) + railties (= 5.2.4.2) sprockets-rails (>= 2.0.0) 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) - rails_admin (1.4.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + rails_admin (1.4.3) builder (~> 3.1) coffee-rails (~> 4.0) font-awesome-rails (>= 3.0, < 5) @@ -455,51 +225,44 @@ GEM rails (>= 3.2) rails_admin (>= 0.6.6) simple_xlsx_reader (~> 1.0) - railties (5.2.2.1) - actionpack (= 5.2.2.1) - activesupport (= 5.2.2.1) + railties (5.2.4.2) + actionpack (= 5.2.4.2) + activesupport (= 5.2.4.2) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (12.3.2) + rake (13.0.1) rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-inotify (0.10.1) ffi (~> 1.0) - rbvmomi (2.0.1) - builder (~> 3.0) - json (>= 1.8) - nokogiri (~> 1.5) - optimist (~> 3.0) - redcarpet (3.4.0) - remotipart (1.4.2) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) - rest-client (2.0.2) + redcarpet (3.5.0) + remotipart (1.4.4) + responders (3.0.0) + actionpack (>= 5.0) + railties (>= 5.0) + 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) - rubyzip (1.2.2) - sass (3.7.3) + rubyzip (2.3.0) + sass (3.7.4) 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-rails (5.1.0) + railties (>= 5.2.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (2.0.1) + sassc (2.2.1) ffi (~> 1.9) - rake - simple_oauth (0.3.1) simple_xlsx_reader (1.0.4) nokogiri rubyzip - spring (2.0.2) - activesupport (>= 4.2) + spring (2.1.0) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) @@ -510,36 +273,25 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.18.2) + sshkit (1.21.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) sshkit-interactive (0.3.0) sshkit (~> 1.12) - temple (0.8.1) - thor (0.20.3) + temple (0.8.2) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.9) - turbolinks (5.2.0) + tilt (2.0.10) + turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - twitter (5.17.0) - addressable (~> 2.3) - buftok (~> 0.2.0) - equalizer (= 0.0.10) - faraday (~> 0.9.0) - http (~> 1.0) - http_parser.rb (~> 0.6.0) - json (~> 1.8) - memoizable (~> 0.4.0) - naught (~> 1.0) - simple_oauth (~> 0.3.0) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) - uglifier (4.1.20) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unf (0.1.3) + unf (0.1.4) unf_ext - unf_ext (0.0.7.5) + unf_ext (0.0.7.7) warden (1.2.8) rack (>= 2.0.6) web-console (3.7.0) @@ -547,20 +299,17 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - websocket-driver (0.7.0) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - whenever (0.10.0) + websocket-extensions (0.1.4) + whenever (1.0.0) chronic (>= 0.6.3) - xml-simple (1.1.5) - xmlrpc (0.3.0) PLATFORMS ruby DEPENDENCIES annotate - backup! betterlorem bootsnap bootstrap-sass (~> 3.4.1) @@ -579,8 +328,8 @@ DEPENDENCIES listen (~> 3.0.5) paperclip (~> 5.2.0) pg (~> 0.18) - puma (~> 3.0) - rails (~> 5.2.2) + puma (~> 4.0) + rails (~> 5.2.4) rails_admin (~> 1.2) rails_admin_import (~> 2.0) redcarpet @@ -598,4 +347,4 @@ RUBY VERSION ruby 2.6.3p62 BUNDLED WITH - 1.17.2 + 1.17.3 diff --git a/config/deploy.rb b/config/deploy.rb index cd9cd88..73f4ceb 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,5 @@ # config valid for current version and patch releases of Capistrano -lock "~> 3.11.0" +lock "~> 3.13.0" set :application, "teacher_den" set :repo_url, "https://github.com/alxckn/teacher_den.git"