mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-12-09 21:56:32 +08:00
Update Canaid and Rails [SCI-4597]
This commit is contained in:
Oleksii Kriuchykhin
parent
25f9c5bc7d
commit
17cd991868
2 changed files with 69 additions and 66 deletions
132
Gemfile.lock
132
Gemfile.lock
|
|
@ -1,6 +1,6 @@
|
||||||
GIT
|
GIT
|
||||||
remote: https://github.com/biosistemika/canaid
|
remote: https://github.com/biosistemika/canaid
|
||||||
revision: 2ac3004d728adbf1be7f4271689b83464f612b23
|
revision: f595a096f402900e184bf51298dca38fbb7e0820
|
||||||
branch: rails_6
|
branch: rails_6
|
||||||
specs:
|
specs:
|
||||||
canaid (1.0.4)
|
canaid (1.0.4)
|
||||||
|
|
@ -42,38 +42,38 @@ GIT
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (6.0.0)
|
actioncable (6.0.3)
|
||||||
actionpack (= 6.0.0)
|
actionpack (= 6.0.3)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
websocket-driver (>= 0.6.1)
|
websocket-driver (>= 0.6.1)
|
||||||
actionmailbox (6.0.0)
|
actionmailbox (6.0.3)
|
||||||
actionpack (= 6.0.0)
|
actionpack (= 6.0.3)
|
||||||
activejob (= 6.0.0)
|
activejob (= 6.0.3)
|
||||||
activerecord (= 6.0.0)
|
activerecord (= 6.0.3)
|
||||||
activestorage (= 6.0.0)
|
activestorage (= 6.0.3)
|
||||||
activesupport (= 6.0.0)
|
activesupport (= 6.0.3)
|
||||||
mail (>= 2.7.1)
|
mail (>= 2.7.1)
|
||||||
actionmailer (6.0.0)
|
actionmailer (6.0.3)
|
||||||
actionpack (= 6.0.0)
|
actionpack (= 6.0.3)
|
||||||
actionview (= 6.0.0)
|
actionview (= 6.0.3)
|
||||||
activejob (= 6.0.0)
|
activejob (= 6.0.3)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (6.0.0)
|
actionpack (6.0.3)
|
||||||
actionview (= 6.0.0)
|
actionview (= 6.0.3)
|
||||||
activesupport (= 6.0.0)
|
activesupport (= 6.0.3)
|
||||||
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.2.0)
|
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||||
actiontext (6.0.0)
|
actiontext (6.0.3)
|
||||||
actionpack (= 6.0.0)
|
actionpack (= 6.0.3)
|
||||||
activerecord (= 6.0.0)
|
activerecord (= 6.0.3)
|
||||||
activestorage (= 6.0.0)
|
activestorage (= 6.0.3)
|
||||||
activesupport (= 6.0.0)
|
activesupport (= 6.0.3)
|
||||||
nokogiri (>= 1.8.5)
|
nokogiri (>= 1.8.5)
|
||||||
actionview (6.0.0)
|
actionview (6.0.3)
|
||||||
activesupport (= 6.0.0)
|
activesupport (= 6.0.3)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubi (~> 1.4)
|
erubi (~> 1.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
|
|
@ -83,27 +83,27 @@ 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 (6.0.0)
|
activejob (6.0.3)
|
||||||
activesupport (= 6.0.0)
|
activesupport (= 6.0.3)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (6.0.0)
|
activemodel (6.0.3)
|
||||||
activesupport (= 6.0.0)
|
activesupport (= 6.0.3)
|
||||||
activerecord (6.0.0)
|
activerecord (6.0.3)
|
||||||
activemodel (= 6.0.0)
|
activemodel (= 6.0.3)
|
||||||
activesupport (= 6.0.0)
|
activesupport (= 6.0.3)
|
||||||
activerecord-import (1.0.4)
|
activerecord-import (1.0.4)
|
||||||
activerecord (>= 3.2)
|
activerecord (>= 3.2)
|
||||||
activestorage (6.0.0)
|
activestorage (6.0.3)
|
||||||
actionpack (= 6.0.0)
|
actionpack (= 6.0.3)
|
||||||
activejob (= 6.0.0)
|
activejob (= 6.0.3)
|
||||||
activerecord (= 6.0.0)
|
activerecord (= 6.0.3)
|
||||||
marcel (~> 0.3.1)
|
marcel (~> 0.3.1)
|
||||||
activesupport (6.0.0)
|
activesupport (6.0.3)
|
||||||
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)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
zeitwerk (~> 2.1, >= 2.1.8)
|
zeitwerk (~> 2.2, >= 2.2.2)
|
||||||
addressable (2.7.0)
|
addressable (2.7.0)
|
||||||
public_suffix (>= 2.0.2, < 5.0)
|
public_suffix (>= 2.0.2, < 5.0)
|
||||||
aes_key_wrap (1.0.1)
|
aes_key_wrap (1.0.1)
|
||||||
|
|
@ -159,7 +159,7 @@ GEM
|
||||||
bootstrap3-datetimepicker-rails (4.17.47)
|
bootstrap3-datetimepicker-rails (4.17.47)
|
||||||
momentjs-rails (>= 2.8.1)
|
momentjs-rails (>= 2.8.1)
|
||||||
bootstrap_form (2.7.0)
|
bootstrap_form (2.7.0)
|
||||||
builder (3.2.3)
|
builder (3.2.4)
|
||||||
bullet (6.0.2)
|
bullet (6.0.2)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
uniform_notifier (~> 1.11)
|
uniform_notifier (~> 1.11)
|
||||||
|
|
@ -195,10 +195,10 @@ GEM
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.12.2)
|
coffee-script-source (1.12.2)
|
||||||
commit_param_routing (0.0.1)
|
commit_param_routing (0.0.1)
|
||||||
concurrent-ruby (1.1.5)
|
concurrent-ruby (1.1.6)
|
||||||
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)
|
||||||
cucumber (3.1.2)
|
cucumber (3.1.2)
|
||||||
builder (>= 2.1.2)
|
builder (>= 2.1.2)
|
||||||
cucumber-core (~> 3.2.0)
|
cucumber-core (~> 3.2.0)
|
||||||
|
|
@ -250,7 +250,7 @@ GEM
|
||||||
railties (>= 5)
|
railties (>= 5)
|
||||||
down (5.0.0)
|
down (5.0.0)
|
||||||
addressable (~> 2.5)
|
addressable (~> 2.5)
|
||||||
erubi (1.8.0)
|
erubi (1.9.0)
|
||||||
et-orbi (1.2.2)
|
et-orbi (1.2.2)
|
||||||
tzinfo
|
tzinfo
|
||||||
execjs (2.7.0)
|
execjs (2.7.0)
|
||||||
|
|
@ -330,7 +330,7 @@ GEM
|
||||||
logging (2.0.0)
|
logging (2.0.0)
|
||||||
little-plugger (~> 1.1)
|
little-plugger (~> 1.1)
|
||||||
multi_json (~> 1.10)
|
multi_json (~> 1.10)
|
||||||
loofah (2.3.1)
|
loofah (2.5.0)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
mail (2.7.1)
|
mail (2.7.1)
|
||||||
|
|
@ -341,7 +341,7 @@ GEM
|
||||||
mime-types (3.3)
|
mime-types (3.3)
|
||||||
mime-types-data (~> 3.2015)
|
mime-types-data (~> 3.2015)
|
||||||
mime-types-data (3.2019.0904)
|
mime-types-data (3.2019.0904)
|
||||||
mimemagic (0.3.3)
|
mimemagic (0.3.5)
|
||||||
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)
|
||||||
|
|
@ -359,7 +359,7 @@ GEM
|
||||||
rails (>= 3.2.0)
|
rails (>= 3.2.0)
|
||||||
newrelic_rpm (6.6.0.358)
|
newrelic_rpm (6.6.0.358)
|
||||||
nio4r (2.5.2)
|
nio4r (2.5.2)
|
||||||
nokogiri (1.10.8)
|
nokogiri (1.10.9)
|
||||||
mini_portile2 (~> 2.4.0)
|
mini_portile2 (~> 2.4.0)
|
||||||
nokogumbo (2.0.1)
|
nokogumbo (2.0.1)
|
||||||
nokogiri (~> 1.8, >= 1.8.4)
|
nokogiri (~> 1.8, >= 1.8.4)
|
||||||
|
|
@ -407,27 +407,27 @@ GEM
|
||||||
puma (4.3.3)
|
puma (4.3.3)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
raabro (1.1.6)
|
raabro (1.1.6)
|
||||||
rack (2.0.8)
|
rack (2.2.2)
|
||||||
rack-attack (6.1.0)
|
rack-attack (6.1.0)
|
||||||
rack (>= 1.0, < 3)
|
rack (>= 1.0, < 3)
|
||||||
rack-proxy (0.6.5)
|
rack-proxy (0.6.5)
|
||||||
rack
|
rack
|
||||||
rack-test (1.1.0)
|
rack-test (1.1.0)
|
||||||
rack (>= 1.0, < 3)
|
rack (>= 1.0, < 3)
|
||||||
rails (6.0.0)
|
rails (6.0.3)
|
||||||
actioncable (= 6.0.0)
|
actioncable (= 6.0.3)
|
||||||
actionmailbox (= 6.0.0)
|
actionmailbox (= 6.0.3)
|
||||||
actionmailer (= 6.0.0)
|
actionmailer (= 6.0.3)
|
||||||
actionpack (= 6.0.0)
|
actionpack (= 6.0.3)
|
||||||
actiontext (= 6.0.0)
|
actiontext (= 6.0.3)
|
||||||
actionview (= 6.0.0)
|
actionview (= 6.0.3)
|
||||||
activejob (= 6.0.0)
|
activejob (= 6.0.3)
|
||||||
activemodel (= 6.0.0)
|
activemodel (= 6.0.3)
|
||||||
activerecord (= 6.0.0)
|
activerecord (= 6.0.3)
|
||||||
activestorage (= 6.0.0)
|
activestorage (= 6.0.3)
|
||||||
activesupport (= 6.0.0)
|
activesupport (= 6.0.3)
|
||||||
bundler (>= 1.3.0)
|
bundler (>= 1.3.0)
|
||||||
railties (= 6.0.0)
|
railties (= 6.0.3)
|
||||||
sprockets-rails (>= 2.0.0)
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-controller-testing (1.0.4)
|
rails-controller-testing (1.0.4)
|
||||||
actionpack (>= 5.0.1.x)
|
actionpack (>= 5.0.1.x)
|
||||||
|
|
@ -436,8 +436,8 @@ GEM
|
||||||
rails-dom-testing (2.0.3)
|
rails-dom-testing (2.0.3)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
nokogiri (>= 1.6)
|
nokogiri (>= 1.6)
|
||||||
rails-html-sanitizer (1.2.0)
|
rails-html-sanitizer (1.3.0)
|
||||||
loofah (~> 2.2, >= 2.2.2)
|
loofah (~> 2.3)
|
||||||
rails_12factor (0.0.3)
|
rails_12factor (0.0.3)
|
||||||
rails_serve_static_assets
|
rails_serve_static_assets
|
||||||
rails_stdout_logging
|
rails_stdout_logging
|
||||||
|
|
@ -445,9 +445,9 @@ GEM
|
||||||
rails (> 3.1)
|
rails (> 3.1)
|
||||||
rails_serve_static_assets (0.0.5)
|
rails_serve_static_assets (0.0.5)
|
||||||
rails_stdout_logging (0.0.5)
|
rails_stdout_logging (0.0.5)
|
||||||
railties (6.0.0)
|
railties (6.0.3)
|
||||||
actionpack (= 6.0.0)
|
actionpack (= 6.0.3)
|
||||||
activesupport (= 6.0.0)
|
activesupport (= 6.0.3)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.20.3, < 2.0)
|
thor (>= 0.20.3, < 2.0)
|
||||||
|
|
@ -541,7 +541,7 @@ GEM
|
||||||
simplecov-html (0.10.2)
|
simplecov-html (0.10.2)
|
||||||
spinjs-rails (1.4)
|
spinjs-rails (1.4)
|
||||||
rails (>= 3.1)
|
rails (>= 3.1)
|
||||||
sprockets (3.7.2)
|
sprockets (4.0.0)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
rack (> 1, < 3)
|
rack (> 1, < 3)
|
||||||
sprockets-rails (3.2.1)
|
sprockets-rails (3.2.1)
|
||||||
|
|
@ -558,7 +558,7 @@ GEM
|
||||||
turbolinks (5.1.1)
|
turbolinks (5.1.1)
|
||||||
turbolinks-source (~> 5.1)
|
turbolinks-source (~> 5.1)
|
||||||
turbolinks-source (5.2.0)
|
turbolinks-source (5.2.0)
|
||||||
tzinfo (1.2.6)
|
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 +584,7 @@ GEM
|
||||||
wkhtmltopdf-heroku (2.12.5.0)
|
wkhtmltopdf-heroku (2.12.5.0)
|
||||||
xpath (3.2.0)
|
xpath (3.2.0)
|
||||||
nokogiri (~> 1.8)
|
nokogiri (~> 1.8)
|
||||||
zeitwerk (2.2.2)
|
zeitwerk (2.3.0)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
|
||||||
3
app/assets/config/manifest.js
Normal file
3
app/assets/config/manifest.js
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
//= link_tree ../images
|
||||||
|
//= link application.js
|
||||||
|
//= link application.css
|
||||||
Loading…
Add table
Reference in a new issue