diff --git a/.gitignore b/.gitignore index 2cdf2b3db4899ae66fc90f5751914a1f9934b343..d543d7bd48c4f9e8c85fd8f8824f08824913defe 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ /test/tmp/ /test/version_tmp/ /tmp/ -/public/wdn/ +/public/wdn /db/scripts/private/ ## Documentation cache and generated files: diff --git a/Gemfile.lock b/Gemfile.lock index 1ed0e8135c1b2eadece81e64e8e02ea0177a72fe..bdc578cd5df2c35c092cbbd8c23ed6a55b4702d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,7 +42,7 @@ GEM http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.8.1) + i18n (1.8.2) concurrent-ruby (~> 1.0) icalendar (2.6.1) ice_cube (~> 0.16) @@ -54,7 +54,7 @@ GEM listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - lumberjack (1.1.0) + lumberjack (1.1.1) mail (2.7.1) mini_mime (>= 0.1.1) method_source (0.9.2) @@ -63,7 +63,7 @@ GEM mime-types-data (3.2019.1009) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.13.0) + minitest (5.14.0) multi_json (1.14.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -81,7 +81,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (4.0.3) - rack (2.0.8) + rack (2.1.1) rack-cas (0.16.1) addressable (~> 2.3) nokogiri (~> 1.5) @@ -158,4 +158,4 @@ RUBY VERSION ruby 2.6.5p114 BUNDLED WITH - 1.17.3 + 2.0.2 diff --git a/Gemfile.lock.old b/Gemfile.lock.old new file mode 100644 index 0000000000000000000000000000000000000000..c9030cb059973021d1a6501144f1e192428ef6e2 --- /dev/null +++ b/Gemfile.lock.old @@ -0,0 +1,161 @@ +GEM + remote: https://rubygems.org/ + specs: + activemodel (6.0.2.1) + activesupport (= 6.0.2.1) + activerecord (6.0.2.1) + activemodel (= 6.0.2.1) + activesupport (= 6.0.2.1) + activesupport (6.0.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + backports (3.15.0) + bcrypt (3.1.13) + coderay (1.1.2) + commonjs (0.2.7) + concurrent-ruby (1.1.5) + daemons (1.3.1) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + eventmachine (1.2.7) + ffi (1.11.3) + formatador (0.2.5) + guard (2.16.1) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-less (2.0.0) + guard (~> 2.0) + guard-compat (~> 1.2) + less (~> 2.3) + http-accept (1.7.0) + http-cookie (1.0.3) + domain_name (~> 0.5) + i18n (1.8.1) + concurrent-ruby (~> 1.0) + icalendar (2.6.1) + ice_cube (~> 0.16) + ice_cube (0.16.3) + kgio (2.11.3) + less (2.6.0) + commonjs (~> 0.2.7) + libv8 (3.16.14.19) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + lumberjack (1.1.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.2) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.1009) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.13.0) + multi_json (1.14.1) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + mysql2 (0.5.3) + nenv (0.3.0) + netrc (0.11.0) + nokogiri (1.10.7) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pony (1.13.1) + mail (>= 2.0) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + public_suffix (4.0.3) + rack (2.1.0) + rack-cas (0.16.1) + addressable (~> 2.3) + nokogiri (~> 1.5) + rack (>= 1.3) + rack-protection (2.0.8.1) + rack + raindrops (0.19.1) + rb-fsevent (0.10.3) + rb-inotify (0.10.1) + ffi (~> 1.0) + ref (2.0.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) + ruby2_keywords (0.0.2) + shellany (0.0.1) + shotgun (0.9.2) + rack (>= 1.0) + sinatra (2.0.8.1) + mustermann (~> 1.0) + rack (~> 2.0) + rack-protection (= 2.0.8.1) + tilt (~> 2.0) + sinatra-contrib (2.0.8.1) + backports (>= 2.8.2) + multi_json + mustermann (~> 1.0) + rack-protection (= 2.0.8.1) + sinatra (= 2.0.8.1) + tilt (~> 2.0) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) + ref + thin (1.7.2) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (1.0.1) + thread_safe (0.3.6) + tilt (2.0.10) + tzinfo (1.2.6) + thread_safe (~> 0.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.6) + unicorn (5.5.2) + kgio (~> 2.6) + raindrops (~> 0.7) + zeitwerk (2.2.2) + +PLATFORMS + ruby + +DEPENDENCIES + activerecord + bcrypt + guard + guard-less + icalendar + mysql2 + pony + rack-cas + rest-client + shotgun + sinatra + sinatra-contrib + therubyracer + thin + unicorn + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 1.17.3 diff --git a/views/fixed.erb b/views/fixed.erb index 71c6fd4a8c40dd4ffd8a61736187ee4b95c81046..53fe5c5e115436ee9961be931a6c5029010ca3b7 100644 --- a/views/fixed.erb +++ b/views/fixed.erb @@ -1,8 +1,8 @@ -<% template_dep_version = '5.0.6' %> - +<% template_dep_version = '5.1.0' %> +
- <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/head-1.html"))).result %> + <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/head-1.html"))).result %>