Merge pull request #424 from ZeusWPI/ruby-3

update to ruby 3.0.0
This commit is contained in:
redfast00 2021-01-07 16:47:17 +01:00 committed by GitHub
commit 2070b285f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 61 additions and 44 deletions

View file

@ -1,2 +1,3 @@
--- ---
BUNDLE_PATH: "vendor/bundle"
BUNDLE_WITH: "production" BUNDLE_WITH: "production"

2
.gitignore vendored
View file

@ -24,3 +24,5 @@ crash.log*
.author-information .author-information
.fb_token .fb_token
/vendor/

View file

@ -1 +1 @@
2.6.5 3.0.0

View file

@ -27,8 +27,6 @@ branches:
only: only:
- master - master
rvm:
- 2.6.5
notifications: notifications:
slack: slack:
secure: tej68wbYns4DYg488iz+4ncU3/CHJvG/5c1qntGcEjti6vZp24atuH32BzNMY+gqa5ftZtcRfqIiJ0I0tkbiFWEDzjSk89bgjG4sgwXq1gMqi/Fj4bqEpjU5m7QLa786q4UfYyTF+srca1fHPLVS5REdGjRr2wxX+bcFnTRxreGCIrlNdWhoZPPJyS37R4RR9k+l5ZWZnqWgUN6bD448O8EzMRVRWoUSxQcJ6+u4QLpinEvem4iXe+WcHOyFfsNmavxGGMMpkOSed/tzA1l+gNpl224qOJl3yAk2qrGi4N6SOnSkeJFfUO5RzX56KDC/tcCL1oJpamhDmzDvRrbDNnCjSriv+g+PkXEjiwBF/tkZwIe7nMKyc9QF698Zvdgb6Ffbq21obsRnkkddkxijthdbUKMAIREPQuU7pXRL4ykPkBeB5GkNjPlErOooxvUHvQEVElJ8NMD4ychQqW6relaYJ0W0uy0QMvrtS+cHkpprZAOZzWLa3AdEOvD50kiS2hDhJway5JHJg/LMl3I6XVVMx6fNGdNWBcezeCqkDZM+nuMJqgAtQ+Tz8bwrHLCJgS5u0lQq/MbrDkYdpmmzvA5LXxn2SpjfOAlgiFKnSIwKSuuuwzW/zCEGdPo1pfBba2VfYAN4y1l863j5ph+eMtlHf7JG8mzIWTo3k+Jx8lQ= secure: tej68wbYns4DYg488iz+4ncU3/CHJvG/5c1qntGcEjti6vZp24atuH32BzNMY+gqa5ftZtcRfqIiJ0I0tkbiFWEDzjSk89bgjG4sgwXq1gMqi/Fj4bqEpjU5m7QLa786q4UfYyTF+srca1fHPLVS5REdGjRr2wxX+bcFnTRxreGCIrlNdWhoZPPJyS37R4RR9k+l5ZWZnqWgUN6bD448O8EzMRVRWoUSxQcJ6+u4QLpinEvem4iXe+WcHOyFfsNmavxGGMMpkOSed/tzA1l+gNpl224qOJl3yAk2qrGi4N6SOnSkeJFfUO5RzX56KDC/tcCL1oJpamhDmzDvRrbDNnCjSriv+g+PkXEjiwBF/tkZwIe7nMKyc9QF698Zvdgb6Ffbq21obsRnkkddkxijthdbUKMAIREPQuU7pXRL4ykPkBeB5GkNjPlErOooxvUHvQEVElJ8NMD4ychQqW6relaYJ0W0uy0QMvrtS+cHkpprZAOZzWLa3AdEOvD50kiS2hDhJway5JHJg/LMl3I6XVVMx6fNGdNWBcezeCqkDZM+nuMJqgAtQ+Tz8bwrHLCJgS5u0lQq/MbrDkYdpmmzvA5LXxn2SpjfOAlgiFKnSIwKSuuuwzW/zCEGdPo1pfBba2VfYAN4y1l863j5ph+eMtlHf7JG8mzIWTo3k+Jx8lQ=

View file

@ -13,10 +13,11 @@ gem 'builder'
# Word counting gem (which takes special characters into account) # Word counting gem (which takes special characters into account)
# for reading time # for reading time
gem 'words_counted' gem 'words_counted', git: 'https://github.com/werthen/words_counted'
group :development do group :development do
gem 'adsf' gem 'adsf'
gem 'thin'
gem 'highline' gem 'highline'
gem 'terminal-notifier' gem 'terminal-notifier'
gem 'terminal-notifier-guard' gem 'terminal-notifier-guard'

View file

@ -1,26 +1,34 @@
GIT
remote: https://github.com/werthen/words_counted
revision: 735357e4d530c99d5c4c366d0c246ebffffd80de
specs:
words_counted (1.0.2)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
addressable (2.7.0) addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
adsf (1.4.3) adsf (1.4.5)
rack (>= 1.0.0, < 3.0.0) rack (>= 1.0.0, < 3.0.0)
autoprefixer-rails (9.8.6.3) autoprefixer-rails (10.1.0.0)
execjs execjs
builder (3.2.4) builder (3.2.4)
clonefile (0.5.3)
coderay (1.1.3) coderay (1.1.3)
colored (1.2) colored (1.2)
concurrent-ruby (1.1.7) concurrent-ruby (1.1.7)
cri (2.15.10) cri (2.15.11)
daemons (1.3.1)
ddmemoize (1.0.0) ddmemoize (1.0.0)
ddmetrics (~> 1.0) ddmetrics (~> 1.0)
ref (~> 2.0) ref (~> 2.0)
ddmetrics (1.0.1) ddmetrics (1.0.1)
ddplugin (1.0.2) ddplugin (1.0.3)
diff-lcs (1.4.4) diff-lcs (1.4.4)
equatable (0.6.1) eventmachine (1.2.7)
execjs (2.7.0) execjs (2.7.0)
ffi (1.13.1) ffi (1.14.2)
formatador (0.2.5) formatador (0.2.5)
guard (2.16.2) guard (2.16.2)
formatador (>= 0.2.4) formatador (>= 0.2.4)
@ -41,41 +49,41 @@ GEM
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
highline (2.0.3) highline (2.0.3)
htmlcompressor (0.4.0) htmlcompressor (0.4.0)
icalendar (2.6.1) icalendar (2.7.0)
ice_cube (~> 0.16) ice_cube (~> 0.16)
ice_cube (0.16.3) ice_cube (0.16.3)
json (2.3.1) json (2.5.1)
json_schema (0.20.9) json_schema (0.20.9)
kramdown (2.3.0) kramdown (2.3.0)
rexml rexml
libv8 (8.4.255.0) libv8 (8.4.255.0)
listen (3.2.1) listen (3.4.0)
rb-fsevent (~> 0.10, >= 0.10.3) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10) rb-inotify (~> 0.9, >= 0.9.10)
lumberjack (1.2.7) lumberjack (1.2.8)
method_source (1.0.0) method_source (1.0.0)
mini_portile2 (2.4.0) mini_portile2 (2.5.0)
mini_racer (0.3.1) mini_racer (0.3.1)
libv8 (~> 8.4.255) libv8 (~> 8.4.255)
nanoc (4.11.18) nanoc (4.11.22)
addressable (~> 2.5) addressable (~> 2.5)
colored (~> 1.2) colored (~> 1.2)
nanoc-checking (~> 1.0) nanoc-checking (~> 1.0)
nanoc-cli (= 4.11.18) nanoc-cli (= 4.11.22)
nanoc-core (= 4.11.18) nanoc-core (= 4.11.22)
nanoc-deploying (~> 1.0) nanoc-deploying (~> 1.0)
parallel (~> 1.12) parallel (~> 1.12)
tty-command (~> 0.8) tty-command (~> 0.8)
tty-which (~> 0.4) tty-which (~> 0.4)
nanoc-checking (1.0.0) nanoc-checking (1.0.1)
nanoc-cli (~> 4.11, >= 4.11.15) nanoc-cli (~> 4.11, >= 4.11.15)
nanoc-core (~> 4.11, >= 4.11.15) nanoc-core (~> 4.11, >= 4.11.15)
nanoc-cli (4.11.18) nanoc-cli (4.11.22)
cri (~> 2.15) cri (~> 2.15)
diff-lcs (~> 1.3) diff-lcs (~> 1.3)
nanoc-core (= 4.11.18) nanoc-core (= 4.11.22)
zeitwerk (~> 2.1) zeitwerk (~> 2.1)
nanoc-core (4.11.18) nanoc-core (4.11.22)
concurrent-ruby (~> 1.1) concurrent-ruby (~> 1.1)
ddmemoize (~> 1.0) ddmemoize (~> 1.0)
ddmetrics (~> 1.0) ddmetrics (~> 1.0)
@ -86,25 +94,26 @@ GEM
tomlrb (~> 1.2) tomlrb (~> 1.2)
tty-platform (~> 0.2) tty-platform (~> 0.2)
zeitwerk (~> 2.1) zeitwerk (~> 2.1)
nanoc-deploying (1.0.0) nanoc-deploying (1.0.1)
nanoc-checking (~> 1.0) nanoc-checking (~> 1.0)
nanoc-cli (~> 4.11, >= 4.11.15) nanoc-cli (~> 4.11, >= 4.11.15)
nanoc-core (~> 4.11, >= 4.11.15) nanoc-core (~> 4.11, >= 4.11.15)
nenv (0.3.0) nenv (0.3.0)
nokogiri (1.10.10) nokogiri (1.11.0)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4)
notiffany (0.1.3) notiffany (0.1.3)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
pandoc-ruby (2.1.4) pandoc-ruby (2.1.4)
parallel (1.19.2) parallel (1.20.1)
pastel (0.7.4) pastel (0.8.0)
equatable (~> 0.6)
tty-color (~> 0.5) tty-color (~> 0.5)
pry (0.13.1) pry (0.13.1)
coderay (~> 1.1) coderay (~> 1.1)
method_source (~> 1.0) method_source (~> 1.0)
public_suffix (4.0.5) public_suffix (4.0.6)
racc (1.5.2)
rack (2.2.3) rack (2.2.3)
rainpress (1.0.1) rainpress (1.0.1)
rb-fsevent (0.10.4) rb-fsevent (0.10.4)
@ -119,23 +128,27 @@ GEM
slow_enumerator_tools (1.1.0) slow_enumerator_tools (1.1.0)
terminal-notifier (2.0.0) terminal-notifier (2.0.0)
terminal-notifier-guard (1.7.0) terminal-notifier-guard (1.7.0)
thin (1.8.0)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (1.0.1) thor (1.0.1)
tomlrb (1.3.0) tomlrb (1.3.0)
tty-color (0.5.2) tty-color (0.6.0)
tty-command (0.9.0) tty-command (0.10.0)
pastel (~> 0.7.0) pastel (~> 0.8)
tty-platform (0.3.0) tty-platform (0.3.0)
tty-which (0.4.2) tty-which (0.4.2)
typogruby (1.0.18) typogruby (1.0.18)
rubypants rubypants
uglifier (4.2.0) uglifier (4.2.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
w3c_validators (1.3.5) w3c_validators (1.3.6)
json (>= 1.8) json (>= 1.8)
nokogiri (~> 1.6) nokogiri (~> 1.6)
words_counted (1.0.2) rexml (~> 3.2)
yui-compressor (0.12.0) yui-compressor (0.12.0)
zeitwerk (2.4.0) zeitwerk (2.4.2)
PLATFORMS PLATFORMS
ruby ruby
@ -144,6 +157,7 @@ DEPENDENCIES
adsf adsf
autoprefixer-rails autoprefixer-rails
builder builder
clonefile
guard-nanoc guard-nanoc
highline highline
htmlcompressor htmlcompressor
@ -156,11 +170,12 @@ DEPENDENCIES
sassc sassc
terminal-notifier terminal-notifier
terminal-notifier-guard terminal-notifier-guard
thin
typogruby typogruby
uglifier (>= 4.0.0) uglifier (>= 4.0.0)
w3c_validators w3c_validators
words_counted words_counted!
yui-compressor yui-compressor
BUNDLED WITH BUNDLED WITH
2.0.2 2.2.3

2
drive

@ -1 +1 @@
Subproject commit c68d3ec27af5953c11bf0e980e44f0799b073c31 Subproject commit f6007ae9e25aea6bd2c6ab8ae12270ff01961402

View file

@ -35,7 +35,7 @@ function performRequest(url, success_callback) {
request.send(); request.send();
} }
performRequest("https://photon.komoot.de/api/?limit=1&q=<%= URI::encode(@location) %>", function(data) { performRequest("https://photon.komoot.de/api/?limit=1&q=<%= URI::encode_www_form_component(@location) %>", function(data) {
var lat, lon; var lat, lon;
if(data.features.length < 1) { if(data.features.length < 1) {
lat = 51.0538286; lat = 51.0538286;

View file

@ -7,7 +7,7 @@
"license": "MIT", "license": "MIT",
"repository": "https://github.com/ZeusWPI/zeus.ugent.be", "repository": "https://github.com/ZeusWPI/zeus.ugent.be",
"dependencies": { "dependencies": {
"bulma": "0.9.0", "bulma": "0.9.1",
"bulma-divider": "~0.2.0", "bulma-divider": "~0.2.0",
"bulma-timeline": "^3.0.4" "bulma-timeline": "^3.0.4"
} }

View file

@ -12,7 +12,7 @@ bulma-timeline@^3.0.4:
resolved "https://registry.yarnpkg.com/bulma-timeline/-/bulma-timeline-3.0.4.tgz#494f458098a06dcf8dcc7fe8f2f158b63d1d1ef2" resolved "https://registry.yarnpkg.com/bulma-timeline/-/bulma-timeline-3.0.4.tgz#494f458098a06dcf8dcc7fe8f2f158b63d1d1ef2"
integrity sha512-gCUOcSUuzHoeVMkCpLF49j5Z5yl78XQ+KgJcT+1ju5WIGgBgVytRUob/dw5NHAxPLO2rmcvwYNbCJFp7w4WT4Q== integrity sha512-gCUOcSUuzHoeVMkCpLF49j5Z5yl78XQ+KgJcT+1ju5WIGgBgVytRUob/dw5NHAxPLO2rmcvwYNbCJFp7w4WT4Q==
bulma@0.9.0: bulma@0.9.1:
version "0.9.0" version "0.9.1"
resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.0.tgz#948c5445a49e9d7546f0826cb3820d17178a814f" resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.1.tgz#2bf0e25062a22166db5c92e8c3dcb4605ab040d8"
integrity sha512-rV75CJkubNUroAt0qCRkjznZLoaXq/ctfMXsMvKSL84UetbSyx5REl96e8GoQ04G4Tkw0XF3STECffTOQrbzOQ== integrity sha512-LSF69OumXg2HSKl2+rN0/OEXJy7WFEb681wtBlNS/ulJYR27J3rORHibdXZ6GVb/vyUzzYK/Arjyh56wjbFedA==