From 8b833201e26b7d6ebac94e8d3219a9d4b321c514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Thu, 5 Dec 2019 13:34:47 +0300 Subject: [PATCH 001/216] Update .gitallowed list --- .gitallowed | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitallowed b/.gitallowed index d7ea6edab..e0c36b9ff 100644 --- a/.gitallowed +++ b/.gitallowed @@ -2,8 +2,10 @@ \byarn\.lock \bGemfile\.lock ^app/lib/nokul/database_url\.rb -^README.md:[6-7]: +^README.md:[6-8]: ^lib/templates/ldap/.* +^test/controllers/accounts/settings/emails_controller_test.rb:23: +^test/controllers/accounts/settings/passwords_controller_test.rb:25: ^test/fixtures/users.yml:(1|6|11|16): ^test/system/account_settings_page_flow_test.rb:20: ^test/system/login_page_flow_test.rb:15: From 625eb0a35f5d88eb7e2173201c46582880e2114c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Thu, 5 Dec 2019 14:50:41 +0300 Subject: [PATCH 002/216] =?UTF-8?q?SSO=20=C3=A7al=C4=B1=C5=9Fma=20ortam?= =?UTF-8?q?=C4=B1n=C4=B1=20haz=C4=B1rla?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Vagrantfile | 12 ++ lib/scripts/deploy.sh | 2 +- lib/scripts/ldap.sh | 2 + lib/scripts/sso.sh | 174 ++++++++++++++++++ lib/templates/ldap/config/import.ldif | 45 +---- lib/templates/sso/etc/nginx/dhparam.pem | 13 ++ lib/templates/sso/etc/nginx/portal-nginx.conf | 97 ++++++++++ .../sso/etc/nginx/snippets/ssl-params.conf | 18 ++ lib/templates/sso/etc/oidc.key | 51 +++++ lib/templates/sso/etc/oidc_pub.key | 14 ++ .../sso/portal/customLoginFooter.tpl | 9 + .../sso/portal/customLoginHeader.tpl | 7 + lib/templates/sso/portal/customfooter.tpl | 8 + lib/templates/sso/portal/customhead.tpl | 1 + lib/templates/sso/portal/customheader.tpl | 4 + 15 files changed, 414 insertions(+), 43 deletions(-) create mode 100644 lib/scripts/sso.sh create mode 100644 lib/templates/sso/etc/nginx/dhparam.pem create mode 100644 lib/templates/sso/etc/nginx/portal-nginx.conf create mode 100644 lib/templates/sso/etc/nginx/snippets/ssl-params.conf create mode 100644 lib/templates/sso/etc/oidc.key create mode 100644 lib/templates/sso/etc/oidc_pub.key create mode 100644 lib/templates/sso/portal/customLoginFooter.tpl create mode 100644 lib/templates/sso/portal/customLoginHeader.tpl create mode 100644 lib/templates/sso/portal/customfooter.tpl create mode 100644 lib/templates/sso/portal/customhead.tpl create mode 100644 lib/templates/sso/portal/customheader.tpl diff --git a/Vagrantfile b/Vagrantfile index a10e0871e..194e2f4b6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -21,6 +21,7 @@ Vagrant.configure('2') do |config| dev.vm.provider :lxc do |lxc| lxc.customize 'cgroup.memory.limit_in_bytes', '2048M' + lxc.customize 'net.0.ipv4.address', '10.0.3.15' # other.vagrant.ga end dev.vm.provision 'shell', name: 'environment', env: env, path: 'lib/scripts/environment.sh' @@ -50,6 +51,17 @@ Vagrant.configure('2') do |config| ldap.vm.provision 'shell', path: 'lib/scripts/ldap.sh' end + config.vm.define 'sso', autostart: true do |sso| + sso.vm.box = 'omu/debian-stable-server' + + sso.vm.provider :lxc do |lxc| + lxc.customize 'cgroup.memory.limit_in_bytes', '1024M' + lxc.customize 'net.0.ipv4.address', '10.0.3.19' # auth.sso.vagrant.ga + end + + sso.vm.provision 'shell', name: 'sso-deploy', path: 'lib/scripts/sso.sh' + end + config.vm.define 'paas', autostart: false do |paas| paas.vm.box = 'omu/debian-stable-paas' diff --git a/lib/scripts/deploy.sh b/lib/scripts/deploy.sh index d0555fe0c..efccba840 100644 --- a/lib/scripts/deploy.sh +++ b/lib/scripts/deploy.sh @@ -66,4 +66,4 @@ sudo -EH -u "$operator" bash -xs <<-'EOF' fi EOF -systemctl disable ufw +ufw disable diff --git a/lib/scripts/ldap.sh b/lib/scripts/ldap.sh index 7917dae0d..4a53db38f 100644 --- a/lib/scripts/ldap.sh +++ b/lib/scripts/ldap.sh @@ -49,3 +49,5 @@ ldapmodify -Q -Y EXTERNAL -H ldapi:// -f 08-acl.ldif ldapadd -x -D "cn=admin,dc=acme,dc=omu,dc=sh" -w 12345 -f import.ldif touch /var/lib/ldap/bootstrapped + +ufw disable diff --git a/lib/scripts/sso.sh b/lib/scripts/sso.sh new file mode 100644 index 000000000..c6b6e38b4 --- /dev/null +++ b/lib/scripts/sso.sh @@ -0,0 +1,174 @@ +#!/bin/bash +# shellcheck disable=SC2016 disable=SC1117 + +set -euo pipefail; [[ -z ${TRACE:-} ]] || set -x + +export DEBIAN_FRONTEND=noninteractive + +if [[ ! -f /etc/apt/sources.list.d/lemonldap-ng.list ]]; then + cat >/etc/apt/sources.list.d/lemonldap-ng.list <<-EOF + deb https://lemonldap-ng.org/deb 2.0 main + EOF + curl -fsSL https://lemonldap-ng.org/_media/rpm-gpg-key-ow2 | apt-key add - + + apt-get -y update +fi + +ufw disable + +apt-get -y install lemonldap-ng \ + lemonldap-ng-fastcgi-server \ + lemonldap-ng-doc \ + perlmagick \ + liblasso-perl \ + libio-string-perl \ + libxml-libxslt-perl \ + libxml-simple-perl \ + libunicode-string-perl \ + libsoap-lite-perl \ + libregexp-common-perl \ + libnet-ldap-perl \ + libmime-tools-perl \ + libgd-securityimage-perl \ + libemail-sender-perl \ + libdigest-hmac-perl \ + libdbi-perl \ + libredis-perl \ + libstring-random-perl \ + libapache-session-browseable-perl \ + libcgi-emulate-psgi-perl \ + libcgi-compile-perl \ + cpanminus + +sed -i 's/example\.com/sso\.vagrant\.ga/g' /etc/lemonldap-ng/* /var/lib/lemonldap-ng/conf/lmConf-1.json +sed -i -e 's/^;checkTime.*/checkTime = 1/' /etc/lemonldap-ng/lemonldap-ng.ini +sed -i -e "s/^logLevel.*/logLevel=debug/" /etc/lemonldap-ng/lemonldap-ng.ini + +# allow sso vagrant ip for reload +# shellcheck disable=SC2117 +sed -i -e "35i \ \ \ \ allow 10.0.3.19;" /etc/nginx/sites-available/handler-nginx.conf + +# for vagrant +ln -s /vagrant/lib/templates/sso/etc/nginx/dhparam.pem /etc/nginx/dhparam.pem +ln -s /vagrant/lib/templates/sso/etc/nginx/snippets/ssl-params.conf /etc/nginx/snippets/ssl-params.conf +ln -s /vagrant/lib/templates/sso/etc/nginx/portal-nginx.conf /etc/nginx/sites-enabled/ + +ln -s /etc/nginx/sites-available/handler-nginx.conf /etc/nginx/sites-enabled/ +ln -s /etc/nginx/sites-available/manager-nginx.conf /etc/nginx/sites-enabled/ +ln -s /etc/nginx/sites-available/test-nginx.conf /etc/nginx/sites-enabled/ + +systemctl restart lemonldap-ng-fastcgi-server +systemctl restart nginx + +systemctl enable redis-server +systemctl start redis-server + +cpanm Apache::Session::Redis + +ln -s /usr/share/lemonldap-ng/bin/lemonldap-ng-cli /usr/local/bin + +# CSP Configuration +lemonldap-ng-cli -yes 1 set \ + cspDefault "'self' https://other.vagrant.ga:3000" \ + cspImg "'self' https://other.vagrant.ga:3000" \ + cspScript "'self' https://other.vagrant.ga:3000" \ + cspStyle "'self' https://other.vagrant.ga:3000" \ + cspFont "'self' https://other.vagrant.ga:3000" \ + cspFormAction "'self' https://other.vagrant.ga:3000" \ + cspConnect "'self' https://other.vagrant.ga:3000" + +# security +lemonldap-ng-cli -yes 1 set portalAntiFrame '0' + +# register +lemonldap-ng-cli -yes 1 set registerUrl "https://other.vagrant.ga:3000/activation" + +# Reload Configuration +lemonldap-ng-cli -yes 1 delKey reloadUrls localhost +lemonldap-ng-cli -yes 1 addKey reloadUrls 'reload.sso.vagrant.ga' 'http://reload.sso.vagrant.ga/reload' + +# Session Storage Configuration +lemonldap-ng-cli -yes 1 delKey globalStorageOptions Directory persistentStorageOptions LockDirectory +lemonldap-ng-cli -yes 1 set globalStorage 'Apache::Session::Browseable::Redis' +lemonldap-ng-cli -yes 1 addKey globalStorageOptions 'server' '127.0.0.1:6379' + +# LDAP configuration +lemonldap-ng-cli -yes 1 set \ + authentication 'LDAP' \ + passwordDB 'LDAP' \ + registerDB 'Null' \ + ldapServer 'ldap://ldap.vagrant.ga' \ + ldapPort 389 \ + ldapBase 'dc=acme,dc=omu,dc=sh' \ + managerDn 'cn=admin,dc=acme,dc=omu,dc=sh' \ + managerPassword '12345' \ + AuthLDAPFilter '(&(uid=$user)(objectClass=eduPerson))' \ + mailLDAPFilter '(&(mail=$mail)(objectClass=eduPerson))' + +# LDAP Exported Vars +lemonldap-ng-cli -yes 1 addKey \ + ldapExportedVars uid uid \ + ldapExportedVars cn cn \ + ldapExportedVars sn sn \ + ldapExportedVars mobile mobile \ + ldapExportedVars mail mail \ + ldapExportedVars givenName givenName + +# manager portal auth config +lemonldap-ng-cli -yes 1 addKey \ + 'locationRules/manager.sso.vagrant.ga' 'default' '$uid eq "cezmi"' \ + 'locationRules/manager.sso.vagrant.ga' '(?#Sessions)/(.*?\.(fcgi|psgi)/)?sessions' '$uid eq "cezmi"' \ + 'locationRules/manager.sso.vagrant.ga' '(?#Configuration)^/(.*?\.(fcgi|psgi)/)?(manager\.html|confs/|$)' '$uid eq "cezmi"' \ + 'locationRules/manager.sso.vagrant.ga' '(?#Notifications)/(.*?\.(fcgi|psgi)/)?notifications' '$uid eq "cezmi"' + +# OIDC configuration +lemonldap-ng-cli -yes 1 set \ + issuerDBOpenIDConnectActivation 1 \ + oidcServiceMetaDataIssuer 'https://auth.sso.vagrant.ga' \ + oidcServicePrivateKeySig "$(cat /vagrant/lib/templates/sso/etc/oidc.key)" \ + oidcServicePublicKeySig "$(cat /vagrant/lib/templates/sso/etc/oidc_pub.key)" \ + oidcServiceKeyIdSig "$(genpasswd)" \ + oidcServiceAllowHybridFlow 1 \ + oidcServiceAllowAuthorizationCodeFlow 1 \ + oidcServiceAllowImplicitFlow 1 + +# OIDC RP configuration +# Nokul +lemonldap-ng-cli -yes 1 addKey \ + oidcRPMetaDataExportedVars/nokul email mail \ + oidcRPMetaDataExportedVars/nokul family_name sn \ + oidcRPMetaDataExportedVars/nokul name cn \ + oidcRPMetaDataExportedVars/nokul sub uid + +lemonldap-ng-cli -yes 1 addKey \ + oidcRPMetaDataOptions/nokul oidcRPMetaDataOptionsClientID testclientid \ + oidcRPMetaDataOptions/nokul oidcRPMetaDataOptionsClientSecret testclientsecret + +lemonldap-ng-cli -yes 1 addKey \ + oidcRPMetaDataOptions/nokul oidcRPMetaDataOptionsDisplayName 'Nokul' \ + oidcRPMetaDataOptions/nokul oidcRPMetaDataOptionsRedirectUris 'https://other.vagrant.ga:3000/users/auth/openid_connect/callback' \ + oidcRPMetaDataOptions/nokul oidcRPMetaDataOptionsPostLogoutRedirectUris 'https://other.vagrant.ga:3000' \ + oidcRPMetaDataOptions/nokul oidcRPMetaDataOptionsLogoutUrl 'https://other.vagrant.ga:3000/logout' \ + oidcRPMetaDataOptions/nokul oidcRPMetaDataOptionsLogoutType 'front' + +# Portal customization +STATIC_DIR=/usr/share/lemonldap-ng/portal/htdocs/static +TEMPLATE_DIR=/usr/share/lemonldap-ng/portal/templates + +# static data +mkdir -p $STATIC_DIR/acme/images +pushd $STATIC_DIR/acme +cp -a $STATIC_DIR/bootstrap/js/ $STATIC_DIR/acme +cp -a $STATIC_DIR/bootstrap/css/ $STATIC_DIR/acme +ln -s /vagrant/plugins/tenant/acme/app/assets/images/logos/acme-logo.svg $STATIC_DIR/acme/images/acme-logo.svg + +ln -s /vagrant/plugins/tenant/acme/app/assets/images/backgrounds/background.jpg /usr/share/lemonldap-ng/portal/htdocs/static/common/backgrounds/acme-bg.jpg + +# customized pages +ln -s /vagrant/lib/templates/sso/portal $TEMPLATE_DIR/acme + +# apply changes +lemonldap-ng-cli -yes 1 set portalSkin 'acme' portalSkinBackground 'acme-bg.jpg' + +lemonldap-ng-cli update-cache +reboot diff --git a/lib/templates/ldap/config/import.ldif b/lib/templates/ldap/config/import.ldif index 71676f3e1..50c7bf5a5 100644 --- a/lib/templates/ldap/config/import.ldif +++ b/lib/templates/ldap/config/import.ldif @@ -8,46 +8,7 @@ ou: groups description: All groups in organisation objectclass: organizationalunit -dn: uid=emrecan.1234,ou=people,dc=acme,dc=omu,dc=sh -cn: Emre Can Yılmaz -displayName: Emre Can Yılmaz -eduPersonAffiliation: member -eduPersonAffiliation: employee -eduPersonAffiliation: faculty -eduPersonPrimaryAffiliation: faculty -eduPersonPrincipalName: emrecan@acme.omu.sh -eduPersonPrincipalNamePrior: emrecan.old@acme.omu.sh -eduPersonScopedAffiliation: faculty@_.bilgisayar-pr.bilgisayar.muhendislik.acme.omu.sh -givenName: Emre Can -jpegPhoto: base64ilebiseylerbiseyler -mail: emrecan@acme.omu.sh -mobile: +90 362 312 1919 -preferredLanguage: tr -schacCountryOfCitizenship: tr -schacExpiryDate: 20051231125959Z -schacPersonalUniqueCode: urn:schac:personalUniqueCode:tr:employeeID:acme.omu.sh:12345 -schacPersonalUniqueID: urn:schac:personalUniqueID:tr:NIN:10570898198 -schacUserStatus: urn:schac:userStatus:tr:acme.omu.sh:affiliation:expired -schacDateOfBirth: 19910128 -schacGender: 2 -schacHomeOrganization: acme.omu.sh -schacPlaceOfBirth: Samsun, Türkiye -schacYearOfBirth: 1991 -sn: Yılmaz -uid: emrecan.1234 -userPassword: {BCRYPT}$2b$10$P9c9uTcr5RjqOhmf1ZcYvO255n/q6SknPA3ERvaAqqEoDSGLer3sy -objectClass: person -objectClass: organizationalPerson -objectClass: inetOrgPerson -objectClass: eduPerson -objectClass: schacPersonalCharacteristics -objectClass: schacContactLocation -objectClass: schacLinkageIdentifiers -objectClass: schacEntryMetadata -objectClass: schacUserEntitlements -objectClass: schacExperimentalOC - -dn: uid=cezmi.5678,ou=people,dc=acme,dc=omu,dc=sh +dn: uid=cezmi,ou=people,dc=acme,dc=omu,dc=sh cn: Cezmi Seha Sahir displayName: Cezmi Seha Sahir eduPersonAffiliation: member @@ -73,8 +34,8 @@ schacHomeOrganization: acme.omu.sh schacPlaceOfBirth: Samsun, Türkiye schacYearOfBirth: 1991 sn: Sahir -uid: cezmi.5678 -userPassword: {BCRYPT}$2b$10$P9c9uTcr5RjqOhmf1ZcYvO255n/q6SknPA3ERvaAqqEoDSGLer3sy +uid: cezmi +userPassword: {BCRYPT}$2b$10$tFrK0DCl5AzcAJqMIJck9ejLiy1yE4fOo5Xxl3OJd0V5gdKXNwhHO objectClass: person objectClass: organizationalPerson objectClass: inetOrgPerson diff --git a/lib/templates/sso/etc/nginx/dhparam.pem b/lib/templates/sso/etc/nginx/dhparam.pem new file mode 100644 index 000000000..28d20a378 --- /dev/null +++ b/lib/templates/sso/etc/nginx/dhparam.pem @@ -0,0 +1,13 @@ +-----BEGIN DH PARAMETERS----- +MIICCAKCAgEA/X5geG0MFgSA7OPpEPXqs6MOfUjRexKi8GG20MuITqoRxkIEx0Sp +Yop0PAuQyDaf4YnnEgr4znc/BI2227Sl38fICX/Ukh48GmwctSKt9bUtcdWjeUpo +T6uixUap348PT46vN2eUzC+qFlWFme7TDPepK4vO8ZUCpnFTMb5z2er5yM3m240h +6E10u4joFe1mpEI3z8Hwd7xU/UuFMfjdZ05SWZ4xKD2bBbO2Uh4U+SA/uzJD+JgN +2gHXGOtcm+M//ff7BHpj3VzYIJqJ6JSRKy352B8119ntHxnzxyuGsYZaeGSHlRsM +nF73MBv08unFlNyIAWxEWkNYPD4oLvyiq2iE7Mbb7LMWVlAjqdfSb4Q1Lo5ZlJgj +PwVJPpZb//kFtZS+9PtU/K8NzDqpkEfNE02goY0jvWt7iKn6svHrxt0XXudxO3Lf +Tb+4SQtY9EezRRC3E8A7OrjnPnNiUdikT7jzx0LiPfeW80r46RWLkt7SliBuHOnF +9vz/WXjnvLSDy45yhC2q/wvqJRPJxj8WOxEqVJgqpOctWGcT6s9GiUZ8C2SPvdl3 +mvgCyU1i5O52EgKyogGHpuiP7TqqsrXMcwXF7gl3CRj1vQwodtW0/ymdPYrt8mSa +VKGIQ3V9Y/bZnvr81xOZ//mQXarT+IJeUixqyCVm/vaMiV5gnGsB7QsCAQI= +-----END DH PARAMETERS----- diff --git a/lib/templates/sso/etc/nginx/portal-nginx.conf b/lib/templates/sso/etc/nginx/portal-nginx.conf new file mode 100644 index 000000000..a18742625 --- /dev/null +++ b/lib/templates/sso/etc/nginx/portal-nginx.conf @@ -0,0 +1,97 @@ +server { + listen 80; + listen [::]:80; + + server_name auth.sso.vagrant.ga; + + return 302 https://$server_name$request_uri; +} + +server { + listen 443 ssl; + ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + include snippets/ssl-params.conf; + + server_name auth.sso.vagrant.ga; + root /usr/share/lemonldap-ng/portal/htdocs/; + # Use "lm_app" format to get username in nginx.log (see nginx-lmlog.conf) + #access_log /var/log/nginx/portal.log lm_app; + + # Uncomment this if you are running behind a reverse proxy and want + # LemonLDAP::NG to see the real IP address of the end user + # Adjust the settings to match the IP address of your reverse proxy + # and the header containing the original IP address + # As an alternative, you can use the PROXY protocol + # + #set_real_ip_from 127.0.0.1; + #real_ip_header X-Forwarded-For; + + if ($uri !~ ^/((static|javascript|favicon).*|.*\.psgi)) { + rewrite ^/(.*)$ /index.psgi/$1 break; + } + + location ~ ^(?/.*\.psgi)(?:$|/) { + # Note that Content-Security-Policy header is generated by portal itself + + # FastCGI configuration + include /etc/nginx/fastcgi_params; + fastcgi_pass unix:/var/run/llng-fastcgi-server/llng-fastcgi.sock; + fastcgi_param LLTYPE psgi; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_split_path_info ^(.*\.psgi)(/.*)$; + fastcgi_param PATH_INFO $fastcgi_path_info; + # Uncomment this if you use Auth SSL: + #map $ssl_client_s_dn $ssl_client_s_dn_cn { + # default ""; + # ~/CN=(?[^/]+) $CN; + #} + #fastcgi_param SSL_CLIENT_S_DN_CN $ssl_client_s_dn_cn + + # OR TO USE uWSGI + #include /etc/nginx/uwsgi_params; + #uwsgi_pass 127.0.0.1:5000; + #uwsgi_param LLTYPE psgi; + #uwsgi_param SCRIPT_FILENAME $document_root$sc; + #uwsgi_param SCRIPT_NAME $sc; + + } + + index index.psgi; + location / { + try_files $uri $uri/ =404; + + # Uncomment this if you use https only + #add_header Strict-Transport-Security "15768000"; + } + + location /static/ { + alias /usr/share/lemonldap-ng/portal/htdocs/static/; + } + + # REST/SOAP functions for sessions management (disabled by default) + location /index.psgi/adminSessions { + deny all; + } + + # REST/SOAP functions for sessions access (disabled by default) + location /index.psgi/sessions { + deny all; + } + + # REST/SOAP functions for configuration access (disabled by default) + location /index.psgi/config { + deny all; + } + + # REST/SOAP functions for notification insertion (disabled by default) + location /index.psgi/notification { + deny all; + } + + # DEBIAN + # If install was made with USEDEBIANLIBS (official releases), uncomment this + #location /javascript/ { + # alias /usr/share/javascript/; + #} +} diff --git a/lib/templates/sso/etc/nginx/snippets/ssl-params.conf b/lib/templates/sso/etc/nginx/snippets/ssl-params.conf new file mode 100644 index 000000000..dbc82f746 --- /dev/null +++ b/lib/templates/sso/etc/nginx/snippets/ssl-params.conf @@ -0,0 +1,18 @@ +ssl_protocols TLSv1.2; +ssl_prefer_server_ciphers on; +ssl_dhparam /etc/nginx/dhparam.pem; +ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384; +ssl_ecdh_curve secp384r1; # Requires nginx >= 1.1.0 +ssl_session_timeout 10m; +ssl_session_cache shared:SSL:10m; +ssl_session_tickets off; # Requires nginx >= 1.5.9 +ssl_stapling on; # Requires nginx >= 1.3.7 +ssl_stapling_verify on; # Requires nginx => 1.3.7 +resolver 8.8.8.8 8.8.4.4 valid=300s; +resolver_timeout 5s; +# Disable strict transport security for now. You can uncomment the following +# line if you understand the implications. +# add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"; +add_header X-Frame-Options DENY; +add_header X-Content-Type-Options nosniff; +add_header X-XSS-Protection "1; mode=block"; diff --git a/lib/templates/sso/etc/oidc.key b/lib/templates/sso/etc/oidc.key new file mode 100644 index 000000000..b7d6a8381 --- /dev/null +++ b/lib/templates/sso/etc/oidc.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKQIBAAKCAgEA6kyWSkwryf5YA6aR0GBOrgZRykVh38mEDGbvO4LUQHC+9qB/ +RKve8Rw9O0YO9U0Jl/jg804LnXgmd6xo3enNvwXbGdGkD1PBpGToJyQtwY/2x3AF +yExKQkyPCamZYKDTkcZM7QqcvCE1gZd4yzPY0aABiEu68FfC2+GLkVxI6PgS75zL ++dxhg0gtIGO+vFlEi1GbG4xXoEczp6y1e3wsIMiWAj1PPTeXN3d7VHUHua0iuf05 +2Bj0jCzbvtvjSnvk24Z9ri1a6/jWeO1smhg3ZaaEPFqiqfGvJTA7fz5WXBqqpw0k +MQsW1w/P6cwpNV/aJVUIDz8bsFpCr36eS7vNm1NckgkeW8r8q25Pd0lgcRr0nVQM +TPP5SDCPQJVHvQ5Z0juHnreUjqaWk+bV6mxN33Eux0w9mEyH5U5SbWLvh9hiz0vA +H9LoJ24p8YOFoqHK3Ovth+rxHyRciwJNUobp5Quumtzzze43vF2NE1x5ujqa3H+W +28cq3WxyNwWxrI3wEn2vDrBg/Q4hGEBPwFpR/LjIBSpVlCO7/tqUBDuggL4Jx1nE +4vPuOVP5GaC6nFnUwfJuMLbm2/evyGfta+626KaJBlx9wnLKORfJ/w4C2OOGyXij +7YzdojNqLqxSZ9fN2Zm3r95pKFz5pqeOATQw3h5LntrOqtuGSM2RvWpf6w0CAwEA +AQKCAgB1m+Yg+2VLqqmBg55UC9PS1Qc/Ul6T1/K5yv2xULW8dxvUbrITxXZOb09p +LnyZs4bqSxqX5wg7jjE5B0lIg3EsvwLBThNdQjzEiYZjB20UaXCFofy1E15/MzDl +t8Vu1Kv+05yPrDEK2lyiZWdUEP14FCpQwTrgJB2DBA9r8vgCQWw37OwSywYDwTot +tQPsRZ77lAYY6PSfVr5eH3qltqnr9uQd0aqx3vK/+/Djby9mi7sPw0XC7JvstSPF +BVltbQ1vCG6T/N5T7v+xifRm0VsVYmWkahaW2eOB9lkXQTJWX2hkHFubZqabY6uI +/1t8GFZHQQyfop0Cg/xPXW6WM3o71NCB5qzqB6a1N8J+0hrnKMhf5Jl5vG01D+i7 +9AxI/3PnF1prSPTDVXHfg5FZCHsmRrpiLZyZCOovSK6pu0QtmjAsFY5hgJAUB5l5 +Z44E+DhQDqN7O8vCUZA5On8ic818wUN042AkHXBgSoHXPeHvbusb+hUnkoJnsozM +2ggvc9kR2qeKX9wD8RRElP2THoQiUHzi9+YidwIWs876YnZwdManvL/dj4+Ein0G +845VDnhTU+AWIb5z6gPtx6rYrPkNIgb1raaM0jYzsZYVhgAizbOfWbOfgWJEWPVH +jJhr3vkYyHXb3X9KCUTi121NT1ON/j0kb3BJO1R59o+jOheWYQKCAQEA+K18WSzt +FKzJmcWnFes5++u7FpkLYyuE6+fo0B9bxEiltDVcx7dB+M7IpnPUll23atS7Aoxf +byHK5oER6S/XsPZayyh7WLMkp1YEiEOADb/JtAFA2oLcFVGa7IOevq/Jrq3zqsCC +VwdJ22oTw8bQBDBlw4oKiqqtusJFs2HloJyG4PwBUKCVS7Yty+/RrpmRU3FbUrti +rVWpPW5PbtPpqUuJE3UN4leLmm7w4zYwai3isreIrD+pHiVDrJ7fBI6W7zAQLj4d +3JBukpkGGSxoeIO2d6PFOEjxG3ANX7uOsYV2eX0tdIP+XXnXF5wFF5zlONq1eJl0 +DrEil3nH5W7M+QKCAQEA8TK3mGeGSWwlm0wTQqxu8WfNOq1QYhD6jLUiJaKr81jF +SNwvp4oX9IAblIuK2llYf75jWfVG/CSt8WTQCmoSs1/cpizWAGiZmXig+8q/2RDy +vr9SoDlcJR2br2goMQiaI7vyIwKLvWD6I63uFOdis0eKJBuu8buVa0HtZJtD4VSX +J55CRaPw2BKsELwJoF9ZgCFCv+3YbdfZyiT/IQITVxUppknmbT4mvZD3AHpe1z60 +okKDFD5dL+/DG0CaSQs80EGsPYvE7B0vic7DtlQeJj+F+nrIVVBocr1nfBsFA0m4 +RU3cQqJsMatnaEmqRcyzFjV961mO1OGfDjruslu3tQKCAQEAzw9dL795tLJettxd +0KFpSXsx75IFalCtP+R89PZ3aYt39gJMu7q6gtpjNj3SMFXeSGTTRj7to9JGaQHl +kP2WIjIuzWRquCOKDI9R/Mf/kvMzlt9ISemWKWYmknLRtkMWso0DDBV5Mc/OzpSX +2nbrc+F8ioGhX27Yc14ZvVBxa/eJU0JiMelUBpOttFZ+iFw0Jn+Ho+6FLoDaB12X +ZFetAprzizD3G5T7l95yUy4mx/JnBZpOgeYMAh7TJ6OtXNUBli21+1sbcDEO8J/b +9RAF+Prq7tl9eO07XTZC3IiGOwg+6s+xDohtPxYZY/40O0IXlux9F+rmOOmDPQ9Y +w5AruQKCAQEA4ExKwZacIZFJk5Z2Xs1dym6+Qm/Dzb5+UPVs0NTq1Lzbkfr48fOQ +fVXY0BXIRW9Kxli1qYVXwskVXONkOBsWUuq1lW8if3TGShsMkbqlF+YT52CiJM/S +qc1T5xWUMq0OMmboMLiAXNdfJmjre1MFzTSc+SEpWjEYLYs8iQ9+W4A/pJ8egAaJ +xVXv3wwOY63n3CiSG0vCtbtCFCK9guOcOqI6fiJA/5wJiMXTfQVPRxlP/4icvumT +3S05IhG8qGqj3gMEeqOMuAoYGC5IgDjPZMA0Bo/B1tyUlQcfwiCaU8ltbD2QtAK5 +XKNJ4YiHqKtIa0HJXGCHW96I/EG/keuK9QKCAQAw06x4uRUdh5TYtyZOvXuhrJi/ +DFhBRtBflM40DUIc6eXak5ZFJwLqjI9dUp0q/yEBYnrRaZ+KzdQFGT3NAzW7Hpnl +BJ8Xkt2f6ZRJVv+8IgT3G2i1ii3RJuLwOQrI98uXXSDLtWIHm2L4QM1SRvLJCpaK +8DRVopFoHrC76fIhRIfM8agjomlZF6WaklAsRsnhQ8XqPQzTF2bGYPwngvJ28/lj +ZVIthGmAbmMsOxTsdloRPZPgrp616KplQhsRgvvkyNrTLbhDM2h/B4HKNf9zPOlW +RWk4cR+v2bVu1oXRGUFNGy0jW8KNoSL4boY4NcKC1D5kFnqw4MOYYD35R+KT +-----END RSA PRIVATE KEY----- diff --git a/lib/templates/sso/etc/oidc_pub.key b/lib/templates/sso/etc/oidc_pub.key new file mode 100644 index 000000000..3bf9404f9 --- /dev/null +++ b/lib/templates/sso/etc/oidc_pub.key @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA6kyWSkwryf5YA6aR0GBO +rgZRykVh38mEDGbvO4LUQHC+9qB/RKve8Rw9O0YO9U0Jl/jg804LnXgmd6xo3enN +vwXbGdGkD1PBpGToJyQtwY/2x3AFyExKQkyPCamZYKDTkcZM7QqcvCE1gZd4yzPY +0aABiEu68FfC2+GLkVxI6PgS75zL+dxhg0gtIGO+vFlEi1GbG4xXoEczp6y1e3ws +IMiWAj1PPTeXN3d7VHUHua0iuf052Bj0jCzbvtvjSnvk24Z9ri1a6/jWeO1smhg3 +ZaaEPFqiqfGvJTA7fz5WXBqqpw0kMQsW1w/P6cwpNV/aJVUIDz8bsFpCr36eS7vN +m1NckgkeW8r8q25Pd0lgcRr0nVQMTPP5SDCPQJVHvQ5Z0juHnreUjqaWk+bV6mxN +33Eux0w9mEyH5U5SbWLvh9hiz0vAH9LoJ24p8YOFoqHK3Ovth+rxHyRciwJNUobp +5Quumtzzze43vF2NE1x5ujqa3H+W28cq3WxyNwWxrI3wEn2vDrBg/Q4hGEBPwFpR +/LjIBSpVlCO7/tqUBDuggL4Jx1nE4vPuOVP5GaC6nFnUwfJuMLbm2/evyGfta+62 +6KaJBlx9wnLKORfJ/w4C2OOGyXij7YzdojNqLqxSZ9fN2Zm3r95pKFz5pqeOATQw +3h5LntrOqtuGSM2RvWpf6w0CAwEAAQ== +-----END PUBLIC KEY----- diff --git a/lib/templates/sso/portal/customLoginFooter.tpl b/lib/templates/sso/portal/customLoginFooter.tpl new file mode 100644 index 000000000..58b2cb09d --- /dev/null +++ b/lib/templates/sso/portal/customLoginFooter.tpl @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/lib/templates/sso/portal/customLoginHeader.tpl b/lib/templates/sso/portal/customLoginHeader.tpl new file mode 100644 index 000000000..0a2ce4a62 --- /dev/null +++ b/lib/templates/sso/portal/customLoginHeader.tpl @@ -0,0 +1,7 @@ + + + \ No newline at end of file diff --git a/lib/templates/sso/portal/customfooter.tpl b/lib/templates/sso/portal/customfooter.tpl new file mode 100644 index 000000000..758424e08 --- /dev/null +++ b/lib/templates/sso/portal/customfooter.tpl @@ -0,0 +1,8 @@ + +

+ + + BAUM + +

+ diff --git a/lib/templates/sso/portal/customhead.tpl b/lib/templates/sso/portal/customhead.tpl new file mode 100644 index 000000000..cff7e7172 --- /dev/null +++ b/lib/templates/sso/portal/customhead.tpl @@ -0,0 +1 @@ + diff --git a/lib/templates/sso/portal/customheader.tpl b/lib/templates/sso/portal/customheader.tpl new file mode 100644 index 000000000..77b438145 --- /dev/null +++ b/lib/templates/sso/portal/customheader.tpl @@ -0,0 +1,4 @@ + + + acme/images/acme-logo.svg" class="img-fluid rounded mx-auto d-block" /> + From 9b1fa5442683dc12b1af3cf6c257ae9c83a4fb09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Thu, 5 Dec 2019 14:52:56 +0300 Subject: [PATCH 003/216] =?UTF-8?q?OpenID=20Connect=20provider'=C4=B1=20ek?= =?UTF-8?q?le?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 1 + Gemfile.lock | 45 +++++++++++++++++++ .../account/omniauth_callbacks_controller.rb | 9 ++++ .../account/sessions_controller.rb | 10 +++-- app/models/user.rb | 6 +++ app/views/layouts/shared/_header.html.erb | 10 ++++- config/environments/development.rb | 5 ++- config/initializers/devise.rb | 8 ++++ config/initializers/ssl.rb | 7 +++ config/routes/account.rb | 7 +-- .../config/credentials/development.yml.enc | 2 +- .../config/credentials/production.yml.enc | 2 +- .../dummy/config/credentials/test.yml.enc | 2 +- .../config/credentials/development.yml.enc | 2 +- .../config/credentials/production.yml.enc | 2 +- .../dummy/config/credentials/test.yml.enc | 2 +- 16 files changed, 105 insertions(+), 15 deletions(-) create mode 100644 config/initializers/ssl.rb diff --git a/Gemfile b/Gemfile index 8183c51eb..633c86b28 100644 --- a/Gemfile +++ b/Gemfile @@ -29,6 +29,7 @@ gem 'ruby-vips', '~> 2.0.16' # authentication gem 'authy' gem 'devise' +gem 'omniauth_openid_connect' # authorization gem 'pundit' diff --git a/Gemfile.lock b/Gemfile.lock index aef4681f6..2c4fc7d0e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,9 +84,11 @@ GEM zeitwerk (~> 2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) + aes_key_wrap (1.0.1) ancestry (3.0.7) activerecord (>= 3.2.0) ast (2.4.0) + attr_required (1.0.1) authy (2.7.5) httpclient (>= 2.5.3.3) aws-eventstream (1.0.3) @@ -114,6 +116,7 @@ GEM html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties + bindata (2.4.4) bindex (0.8.1) bootsnap (1.4.5) msgpack (~> 1.0) @@ -179,6 +182,7 @@ GEM groupdate (4.2.0) activesupport (>= 5) hashdiff (1.0.0) + hashie (3.6.0) html_tokenizer (0.0.7) httpclient (2.8.3) i18n (1.7.0) @@ -191,6 +195,10 @@ GEM activesupport (>= 4.2.0) jmespath (1.4.0) json (2.2.0) + json-jwt (1.11.0) + activesupport (>= 4.2) + aes_key_wrap + bindata jwt (2.2.1) launchy (2.4.3) addressable (~> 2.3) @@ -232,6 +240,23 @@ GEM nio4r (2.5.2) nokogiri (1.10.5) mini_portile2 (~> 2.4.0) + omniauth (1.9.0) + hashie (>= 3.4.6, < 3.7.0) + rack (>= 1.6.2, < 3) + omniauth_openid_connect (0.3.3) + addressable (~> 2.5) + omniauth (~> 1.9) + openid_connect (~> 1.1) + openid_connect (1.1.8) + activemodel + attr_required (>= 1.0.0) + json-jwt (>= 1.5.0) + rack-oauth2 (>= 1.6.1) + swd (>= 1.0.0) + tzinfo + validate_email + validate_url + webfinger (>= 1.0.1) orm_adapter (0.5.0) pagy (3.7.0) parallel (1.19.1) @@ -259,6 +284,12 @@ GEM rack (>= 1.0, < 3) rack-mini-profiler (1.1.3) rack (>= 1.2.0) + rack-oauth2 (1.10.1) + activesupport + attr_required + httpclient + json-jwt (>= 1.11.0) + rack rack-protection (2.0.7) rack rack-proxy (0.6.5) @@ -364,6 +395,10 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + swd (1.1.2) + activesupport (>= 3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) swearjar (1.3.1) telephone_number (1.4.3) thor (0.20.3) @@ -382,6 +417,12 @@ GEM valid_email2 (3.1.2) activemodel (>= 3.2) mail (~> 2.5) + validate_email (0.1.6) + activemodel (>= 3.0) + mail (>= 2.2.5) + validate_url (1.0.8) + activemodel (>= 3.0.0) + public_suffix warden (1.2.8) rack (>= 2.0.6) web-console (4.0.1) @@ -393,6 +434,9 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) + webfinger (1.1.0) + activesupport + httpclient (>= 2.4) webmock (3.7.6) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -447,6 +491,7 @@ DEPENDENCIES nokul-tenant! nokul-tenant-acme! nokul-tenant-omu! + omniauth_openid_connect pagy pg pg_search diff --git a/app/controllers/account/omniauth_callbacks_controller.rb b/app/controllers/account/omniauth_callbacks_controller.rb index b6ba88702..278b166c2 100644 --- a/app/controllers/account/omniauth_callbacks_controller.rb +++ b/app/controllers/account/omniauth_callbacks_controller.rb @@ -2,6 +2,15 @@ module Account class OmniauthCallbacksController < Devise::OmniauthCallbacksController + def openid_connect + @user = User.from_omniauth(request.env['omniauth.auth']) + if @user.persisted? + flash[:notice] = I18n.t 'devise.omniauth_callbacks.success', kind: 'OpenID Connect' + sign_in_and_redirect @user, event: :authentication + else + redirect_to root_path, alert: @user.errors.full_messages.join("\n") + end + end # You should configure your model like this: # devise :omniauthable, omniauth_providers: [:twitter] diff --git a/app/controllers/account/sessions_controller.rb b/app/controllers/account/sessions_controller.rb index 2345fce48..4fd3502f1 100644 --- a/app/controllers/account/sessions_controller.rb +++ b/app/controllers/account/sessions_controller.rb @@ -6,9 +6,13 @@ class SessionsController < Devise::SessionsController # before_action :configure_sign_in_params, only: [:create] # GET /resource/sign_in - # def new - # super - # end + def new + if ENV.fetch('NOKUL_SSO_ENABLED', false) + redirect_to(user_openid_connect_omniauth_authorize_path) + else + super + end + end # POST /resource/sign_in # def create diff --git a/app/models/user.rb b/app/models/user.rb index 92bf42590..3c2cc4559 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -29,6 +29,8 @@ class User < ApplicationRecord # authentication devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :lockable, :timeoutable + devise :omniauthable, omniauth_providers: %i[openid_connect] + devise :timeoutable, timeout_in: 5.minutes # relations has_one_attached :avatar @@ -106,6 +108,10 @@ class User < ApplicationRecord extend FriendlyId friendly_id :permalink, use: :slugged + def self.from_omniauth(auth) + find_or_initialize_by(id_number: auth.uid) + end + def permalink username, domain = email.split('@') if email username if domain.eql?(Tenant.configuration.email.domain) diff --git a/app/views/layouts/shared/_header.html.erb b/app/views/layouts/shared/_header.html.erb index 5c930e660..d36aea102 100644 --- a/app/views/layouts/shared/_header.html.erb +++ b/app/views/layouts/shared/_header.html.erb @@ -24,8 +24,14 @@ <%= link_to :settings, class: 'dropdown-item' do %> <%= fa_icon('shield', text: t('.account_settings')) %> <% end %> - <%= link_to :logout, class: 'dropdown-item', method: :delete do %> - <%= fa_icon('lock', text: t('.logout')) %> + <% if ENV.fetch('NOKUL_SSO_ENABLED', false) %> + <%= link_to "#{Tenant.credentials.lemonldap[:issuer]}/oauth2/logout", class: 'dropdown-item' do %> + <%= fa_icon('lock', text: t('.logout')) %> + <% end %> + <% else %> + <%= link_to :logout, class: 'dropdown-item', method: :delete do %> + <%= fa_icon('lock', text: t('.logout')) %> + <% end %> <% end %> diff --git a/config/environments/development.rb b/config/environments/development.rb index 722dbc3a5..1e3cc5800 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -3,7 +3,7 @@ Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. - %w[.ngrok.io .serveo.net .localtunnel.me].each { |host| config.hosts << host } + %w[.ngrok.io .serveo.net .localtunnel.me other.vagrant.ga].each { |host| config.hosts << host } # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development @@ -65,4 +65,7 @@ # Use an evented file watcher to asynchronously detect changes in source code, # routes, locales, etc. This feature depends on the listen gem. config.file_watcher = ActiveSupport::EventedFileUpdateChecker + + # Web console permissions + config.web_console.permissions = '10.0.3.0/16' end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 93f6ac9e0..de08fd2e8 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -277,4 +277,12 @@ # When using OmniAuth, Devise cannot automatically set OmniAuth path, # so you need to do it manually. For the users scope, it would be: # config.omniauth_path_prefix = '/my_engine/users/auth' + + config.omniauth :openid_connect, + name: :openid_connect, + scope: %i[openid email], + response_type: :code, + issuer: Tenant.credentials.lemonldap[:issuer], + discovery: true, + client_options: Tenant.credentials.lemonldap[:client_options] end diff --git a/config/initializers/ssl.rb b/config/initializers/ssl.rb new file mode 100644 index 000000000..074fc639c --- /dev/null +++ b/config/initializers/ssl.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +if Rails.env.development? + OpenIDConnect.http_config do |config| + config.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE + end +end diff --git a/config/routes/account.rb b/config/routes/account.rb index 79541208b..571c036d6 100644 --- a/config/routes/account.rb +++ b/config/routes/account.rb @@ -1,9 +1,10 @@ # frozen_string_literal: true devise_for :users, skip: :registrations, controllers: { - passwords: 'account/passwords', - sessions: 'account/sessions', - unlocks: 'account/unlocks' + passwords: 'account/passwords', + sessions: 'account/sessions', + unlocks: 'account/unlocks', + omniauth_callbacks: 'account/omniauth_callbacks' } devise_scope :user do diff --git a/plugins/tenant/acme/test/dummy/config/credentials/development.yml.enc b/plugins/tenant/acme/test/dummy/config/credentials/development.yml.enc index db4b8d180..1de671b26 100644 --- a/plugins/tenant/acme/test/dummy/config/credentials/development.yml.enc +++ b/plugins/tenant/acme/test/dummy/config/credentials/development.yml.enc @@ -1 +1 @@ -qz5+6C+1nR5rDfFY3fDnoqgAIqHa++XCn5jWsU+SBg/C+cIGTngFoyTEta1IITfkRUDlr3u4FdywH7zcrVKr5wE0snkliS0O8DwpYZ5KsYLDd/qp8oj3KCvxbQZBRQL6yPcKSXZNYu65kcRMzHFdEQNZ1LsuXVjEhM/V0rOnGbC8p1BWcjxGx3FuPhf/1R4lAGdiqkKXZdjsIgVHiOCN3rD4voOQKlezBdwFKNAjSdeZ+8MV2C2kI2SvZ15Z+hrGLl6Hy53UwN/lZMk3BPien2163YHmUPsuPvc/j7KRBg/TdoQ0WW/0DsvAsdp2M97j3ugf8IydAAQRjBzItTMLaueJnSTKOqx97P3BPxQdrF3mYn0INiXHiXnflGO0Fckg1T9MpZcbKthbXrUdU1SYrgUhYFm5jSvSfFZ/HSHbyq+xVXxNEmjZqkbyKU3ZZwDj7ok1kpGIKkPIusAe7BKW5nVDgXN33mZY58lzwS908t1S6Lxojp7gWUaEmkJWZEW/HZKIShF4dp2Peob7Lmd+Zd/YB9RF7e67NCcf4P1fy3qKQ+OYLQSRatMS+BSx428rT3NVJmTBXE7g1uGAXkqll5QwnVFhzXysffKpxSvLhk0NBeHz137345QDPqECx/FthCrQqEp+7aKNI4zM1ogsFRj9Frm5Dbb6qXyJW2z/MxRE033SwSZD5SQR2FBjtNzIi967L9AzRQeJrDcE/iB5JL63mb5kpMQdpVo7MCXxPIJOEHmqLf165ClAxkqdNBG3edjtkz5ilw0ddPOt7c73rvxDJ1zxOYLqJH9wV8nBNQR6LIvgjtMu1p+QJBkvtlB2eXtCj2MRDF+xOUuvv4P/I+Ebd+1iB9FTUbDyGEmAGsuBjnak/zWyoGivPqd9XYa4otGYT4V9M+z5FIWLiYBgor0R/qoqxKVI0rohlN3njJaGpDHj5rII+/1f+FZUhBKnPQ9FQsEizCjjFIXXeBcpo48WoHZTzcTdj+kjM2fFwv5UeoGg6jIEJNvnaMB5t21+chmsTNcNigCSWeig456wJ3pnjUwg4cRnJUnbqwiDn3tgUa0LPdsKWv0gMA8uLN3DH0PlDYWX+29zwbssuTBYPnqmzBHAkGMvcbnUXTi0eePDU+jYRiVLB4xbRVGPDAeibxl9F26QkwQ5KGXyNkqIEBdp0Pb0wYSWFzY7M2H8gmihi/fr57bd8UI1nzC7DwzoOdPK8+ov32ivmaJ5xlufCCoEnPdiYf9Nj0GNhrkj2/CgGuFqsfTobdibQjzDGxE9WYTHyNFcSne7Q+yGN0Mz36t0DDv3ZUdrHdrGrvECpGK7EsJaTO6QjwYh/ESCzR+LAKMYlTD4O7nfF9ECZXZhYWun7e4wmd4tzHQ8wbxZU5iDCmBV/sJb1VaJk+Cp0TIdzP0bW+ixPiFB/pnjHADalIqjjSRQXI/ojrEj1b8neF3a15UoXM1Z6qnL2Vbvjfo5WeFN+JLQlL6rhG/gyQV4Pilx1d6+--b4WL/Zp9NYFylq8E--kM7Mb4gUI1OnBmu8fccaVA== \ No newline at end of file +4uziXndh55ScQ8xt3SC5lnBWZIIJQy4TFBPzuBCWQDBnQAGNyC2RMNVEg4Q+F6Qvz66zqihOkt184BathWmgvmbjDPKYzHhaKHHjq83e0V61Fz7gpn9FaDrWdUI1Q5fHOpJXX3Lacy1N/PMb2IJL+3QMbTt5Y9bXLagAshG5R7JKsCHjkoUnXY9DPyjAQjnEgBVgN2V3c+8xTJFxyLj4a3P7q0/O+b0cZZ0CA41UJDco5iTQoVV/mr0EG6Gf1Kd8JGc4rSXP858gdtw4AjlpT0J3eKeMPriUf5r7gtGCpXPANLBzlxjLj7USsXW7s+nfQdnljD0hoBet5ixBALFnO5hwTGcqtaDDxeWWzdJj1wbDgSeFLj0W0UMSYbZt2JmWWk4XqeH8TXJuFs+9BMu+uzK4t0EpNqM1OCti94g5ps4vCkmYZh6PiGwesQWdxqPax9W+7zAKeZFtrYmVdPigdqjObUYsXdWbkiVv4+uAK20kFuLRSlX3enzrKHkBMrGZO3AhVbP5vrUlczbV1p6BrC1/rtgh6Q3+3qFvfIDTS48u3z/TpwaIFG1icy56ba4GNYNI03/kpaAzR7sPGHyHoKU6DzsLED1WvefflyADftQSsY+KLhWfDzzb+E7UkIGvGzXPabj08q6yPtBSdKYI6rMw0c1MsHoq5YK4S0/KqM92tmpQgPv4FNVV9ynVrcjOqGxfclfSsWTwBlMjIVGQkCimtxzvB7SVc71KVcukiLuj7sWbgJ3/Eq1sLbgDdN4yX1pL3cDyxbXjd5g6PduOFs7Wh8QbUZkDmM7AFKyCqFVMYOynQU8zlj0v63MOEgeh4aME5wIMxV+HJ8Bk5NbRm2mJ3QxcG2FIsdl6sCv1ZXXrcaSNqD2FmVF4DOAvbuBN+6vWeFsRf70qnCAb5EXy/4D9YsOmFvK2qLoJcbhWBdJv1nHGf+p5WGnfIF426+Qe30/o2pmXxm7vwAWi7oGzBeSzEBv/cflKDoRdM6x4VHHVfCaCbA6UrGyHgdIJGde7TdUuutiX2I0+cAe5wMfLEYXkiG7pw95kk9xTIIQbMOPgriox3e7t83lkdbO7cvLd8XMp9f9lUNJoEN9+iAxwDtVAtP3pBl1TjNTrS3PaWOW44oycCnS0HENdq4vMTANsEq/nsFuLqcsy0TUlGxOzVpKNwvrsTnUxoUDPPOZ5TaY0BEUdosMFxIMERmo5hbu4v5gUbTnu3214nQR2CKqurQj8tJgZerFkWL1AY+KBUO9rBEWGol7FwMBi/IDJUC0lyq7f13WehBmMRBjeyxLl6zndd8lEPtGUveJ26xD7Pnwftjc+fjZS/mhkVkA4a/tUOOTnSLehmlUvot2AC5EQKNElTvIDWO+XsFXwT5DAh8eoBou45/nWlZ1Z1zgZB3Q4IuApZ6CM45lvMRciZegvrm7qTff+hmtL/8ApuUUFNfaHapxJj0TUbAHTMtW22VA3qBiTV3Hd48XZcnW7/60gPcGoApKdaPArFPjQ0BrDP8NZkiK5iRvOkiYhlcUD+zVPp1iIVxLtx4mGCCtL4IHUfcgn/jTU/skOYgXtHESwq9NdI/THWHGuLTldTw16afSDcyP7/BTCh1/yfIL78qPYZm6etms88O3A0sS0+aqdEOlNrs5TE6hHHzrFaoLkEYabmNIdzBP4CVlUhkBaQQwGs8axoaiQC+klCSSDN4kg0k5d1etBXWaaxgbtg8iHq5r43hzvPfDgc+kQGigZHXIA71w73md9GGikfaNBK3qxrKAyST+fj0+UTD0mu1y6fcXefQrVXtC73p/zkLuT8VvzcVdcvA+bDJGUXd/ViFvj/bXvSwYqCiBWyJCOA6HcN/kM5T+tBRMwdHX3qAsUYDY=--SG5dSe3qjbzc6ZlO--SGd6ZAa0kyDPV5Oq9V18fw== \ No newline at end of file diff --git a/plugins/tenant/acme/test/dummy/config/credentials/production.yml.enc b/plugins/tenant/acme/test/dummy/config/credentials/production.yml.enc index ec753a0aa..8fadf8436 100644 --- a/plugins/tenant/acme/test/dummy/config/credentials/production.yml.enc +++ b/plugins/tenant/acme/test/dummy/config/credentials/production.yml.enc @@ -1 +1 @@ -l2oeGvZVBP/h9AJwSWDXma7WWro/+4p2oHdBwmDNWf4ynTURNs2g5dnDypeKlC4VPRn+SuXotjLbx1dFuRX3ixMNbn3NzgT2Kky4ZYZ/63XJ9L6F7wCqO1I6JyBCFxFmarVt6gcofJ3VvQ+yX9jHgr+0/kXPQS8lIU/yYZK1FGHddpwOc0jJDQtX5QEKmnESy3nt58ZN6kLPAoydT74HNOuM2gPNEG315lqfQP4Yo9JGTx+XI1W2pMSTPhtZdizJz+MuOe97K1dgnaeNfb15kUVHKTsro91IhrT1T+VC1+0pLbgyrBDcC1OxmhTthsNlFv5Lqk3nf2iZnyCfsAGDl+4uaDx6x+vZi/KraEVl4aZRDLkxMmLjCQgtvt9fDWFZT/PE6+vJTOAqezNWmu80zTsTnzLLBLjiisFMg9RTIrkAF8FoNkMoOCJWn/zxitmMcGsDfXlxltorCk63fcVbKWmmYhobcbjaGwKx5NkXW2QR/9olm0xmqT4dUGRXbUmklHRX30Gt9lXuAvIexoX5ptkMk2yOBR/JihgrwliiSFlxjWCjExeLP7a1FlAQGsJCQa5RqU4P/uN2Dp4b63U+4EP17a+n/9wUrXiWIJ8lqF3ANOyIC6riamz8goozY7ubIMBYbOh0j+CKmnNs0AEOaBUVbB1oy+VHVaT0kV0JFstz3cT1Jlq5si33o3l/9i0+UV9LWFDLLGMZ4bMWByYZcJgy41UfOOOdnHZMlW8gZJHMVaorby5do84dXLiKATy8JMnquJlsl6siXFE2dcaoWiN+Hm81KmQ8l/hO5sXo/poKKtrY0UDe0u6xaWKeS61qR0H1L6RuUwzSHByE1cptFLjZFhqDbneyuGLwAqBBG1QUCd+OwibHokDHF24dYWxa5wou512f6+Nl5HoXLZCDn5mbustYJIjFQrxXGtSC2ypNBMgGoSpJqU2B1Tv7HB7oz5xk3r87IGVtiubNDRI9o3F2nNRZIscypyG0N/C/yHqdfKB2429xrWIy45LkXf2nXrz7FuGdmSS3VJFGthZVohvrkkB/M43RChzJGUATuJZAKMlP5l/tFQx0d9JV75165fOVfa0uGUGck7INv7UseS99C/M8SHKwTUK5htopHiWmGv9mzlyxZxHaJAuSY1Gc79OHGYj/ZcjWS4DXDnDeXGfFir2348pPTuGwsTpR77FdBHTEaiBcrvIjRIOm3CDgxvk5k01bNnFERE6Tg2HEtORaBydL1DXq5EoOD8FKbaGYEFvpx1K8YwB57ziUH4FhfSRZ8ocrDrAzai/5gpg1TNdrmBmvxzEQjpWHRb9KMslk05BYx5NJo1vXo4b1Q4XmwEEzp7io+6InHGGgRslLS7l0onmMtCOktWv4fOtxkF6oslM/t7Bl/1WJT5f5wV1aC1WC7XLGvYFPoKzvB9qaRP4+Fjkh/At6CWgiFwcZxOlsWKGw73JGWwUJxI3A0RkjFfCKJ0m44NWYBuTEUzH6x4f5v5wiBZakm1w=--8HESn0FbwKzbmfeh--vvaJGjMfZBJnDQHWz558EQ== \ No newline at end of file +1jNeODJU5wzk5bPZbdWE+7HBXr6/hzYPyxZjpp8QH+EYFqqpqBqm4rzpNCkTTemYJJ1ayEk3mKkD9ZEnkDZ0XOx5f2y34PJFHXAoOeIGeCB1bbljavrPp8dUAWTAttmUZfnaWnZ4W7P7gv+uyjb7xfIB/zOe83H95PU3SIdtGTvfg0g1D9srlGRoBNPYdK8P/LO1vqxYME+il6o1cFo73KZr0goxfFcPm+n3nJE2KW1kiPvUPKzcKbmj337rylFvExCk1YR6geEak3gZcKKRrvNrpYCm0Zb+0HNaZtjDbqZU8fTi9JDEK6fBbhvqoBIFETCNQ3TQ1bovOsr3ECP22TQBJccEN8JoBHI33qulfwq2VIXlAcRzPDu2ytr805WP0tPKCnYntOJcc1xx7+OdG1QE5eae17jAh1wxuCRbv4cpe/5jP6vGQ04j0i+MnB9RMUITzPqln5B6qRxZ/IrL0n5PlZg1uiC0JALbCB9PlpLIf9neXNG8lsXxUMnNWRuu/JVtlPewKXZ/R+a2QGUXdqQvFIkrXWQxb40z/QiC8ZhNgxqGDDcwH5Fusmge4eRHqiFxZExL/gxz9s6uFuVmr/AG7EmOScyHlDf5cbRptO7rPQRg0fKWh2IO7ph4EEjqF9qf8433sKAF4UIOU2RBuM9wAA+4h4eZRSnD4mdTxDpBvSuGl+HR8bQCrPpuzGmEkOy+L0lRPO8MKEvajaqfcQRGws4gPbO0q3MTmY/yDVOu0ilKfe1cI3CMFu5WktON0hz6mewJikBtnDju+8+sBXlJ3cVRUhb3h5boOTb0cDrpUdxOwiYmQsjtEymAewOHMVXBKwKidrnYMacgRo/7vDnH5DEs65sDeJn0hdPK2VA8MiyRpHSC1cVxd/2TYwnmv+a33xJQJiKH9OlarxKZrmIeOTEasMci5MlDC9+f578R12yY4O7c8Ua88QqjT32BNDx8zK/OlMwXuvO5QjG3Lp/wF/AYSH9AP8giDZxdyqQ+LDhaldqfV/snl09WdvZ4SegQHhyTab/vvyMYgjSOAifPXN7lPqiEw/oU/N0iMfsf2jM9azIeb6QLV7D+r4Z28yUnqINiJv+Ubuw9qwLLy84ueh7sw2tP4Lqc+WNW//NYSoRUO6tNZlIUqM142vPi9vj4ZEZZCoUpe25HS8ICbwPj9p1gs81lj0WESnqXgd4eVMGzrkmAGKGAJ8zWGbIzz6wvdYeDl0P0GqNNJNgh3bLEfa2RBZ5wxSrSVQNH5AZ/dx/WpT1/d4yUehtEvtmbQIUCUQYpLQVTF4oJbt/hEHyvIXhMC/rVCUm4tlHTHu8QfIEWzljk1+oGBBYzDgSMycUzxw6y+quIkhnc4RHcpH44ioTYUfX+/tOP/NseE1N/rhPcmCiaH4zPaiFcMJtum1Gnnwl0iONJwEStank7Ua/T+x/pl7wQGDfHsITs4b8Mjx74RSS0lHRJsDPHQEc+AaRTvBOr7s1FJfc6RidyfSHc5660VCYWQQnJe4uGdDj+PRjYo7zSe++pYrg/vvtzxei1NCBd7XDPh0fyhtn7h19xwCGZtr1gke5xP8LutvEV764Rd5O/ty0rVm3cG/FncgTLHD0AYm/BfPXKi60xGUjKi6rXMazKoK3mz2+CO5oDf+hqFbkJnzf9STEELPzCgpwvL0v9Ytc13t0Yh+4uX65OcYRhsXiT59oXuJo6SMwfdRLUcdHcIoCIdo6OvUDTHnivSv162thJxz5W3kOtwx6wExicApzDLDmnA5CIO/5aMqFrMQgMZMyvBsiTTTFnetCOSCAHVolBOKulfGsbDF3iLQo9VpgyWehN8Mz+4vhGy6WkIk7uZozQZExk46p9gT01UMbWZWP+--FEi0yvrK102wIX4S--kosE+42lphTgPCgnR4CvfQ== \ No newline at end of file diff --git a/plugins/tenant/acme/test/dummy/config/credentials/test.yml.enc b/plugins/tenant/acme/test/dummy/config/credentials/test.yml.enc index 09aebb84a..1de671b26 100644 --- a/plugins/tenant/acme/test/dummy/config/credentials/test.yml.enc +++ b/plugins/tenant/acme/test/dummy/config/credentials/test.yml.enc @@ -1 +1 @@ -V1VIFJrIz+zUmEtUESdJbN1D6KrxfqJSdA1zLQ+ATDlZ1sJyDFUQ/VejzXDXyDqNChC87bUotg6xbay8oeihBp4pq8kKM/Z5fHothk4n6fYv17XnwcDAbQwPZhU1K44mvvslJL7nPdgZ7HIao+ZWT2AU/EhBAgiVIPEZoA+kWC4DWzfvUMpGGPX8q90cfEk/YcOTaG3LlQxn9SoLEBSRwZtrrZ1N/qOsDb/sqo4zTj1zzvSBlKKFKi2+aTiHgtFWfxvkFyEGAqCDRIjx6+bLwxKP/Kg/6y9d5+eWltU5Fh8n++oadGGlzXP7AiEoY8ZXMjPY/7OF3Zalmt8mMjsoWzKAJqlVeeYtSNaA2VJyRhRniwdwzn4z3Lq/xWyEhVyhJQGKWZZFDSthHfK7wL6a4MPifujfj7DDRuO1CNXaZNvAKH2Tr+bP5WlCLD3tDrb8AEpHYZxOYB90r5PPbIe6tYqUlCNaqYeNW7Yf86SLB2nH/aYgT8aSRtR75c8Oc1RL1/RIpTa1acPdJIhHJuYjvIwxbK4G+RxE1Az0pNyfLquCqTAWolvXKiNOlwrg/bPS0Nyr52qMwm1RgOh1LMHcyaqtN0ojpifcrHD+YnJoXb45Cr0U4NgBm8zjV2DLrH3RM7urPpKuYkMP+6b8Z+d8cICc9WdXT7MbB0Y+rv5dBTV6UkINwHUPloyCLMBmqj4UQzDA3Zao6uDOlaBzYRrHrqM68lEzLomkJ237Uvtr0hr4jJXcnYIAAPCUtRUBHRDv9BnL9e2YUeME2QvVQ2hA0fR/534FpnmFgbyf/JWyMfZgTp9K/XttqfiCzE2DURKDsb8ce538XeQlTYy++gOtcqTYl2mHwNEK0n2X9fCzv8YErjU9YK4o77oqHlVV/WUeFgbxSKlk3O0g9y9/VDPIEKhRfqxPmHSfMXpItBiQ2hTP4U5p1lQ+G7i13ompZdy9YS9MX4KghU0ywkYvF95AHCV7FgU3+Em/F0WvErRLiZ45vMUcTI/KEp9S1/aJzZVOKrTLxMY2yX0cpfp5JGREd9FPOtPeLWd3yBlUU6fCL/2tXCTUb5mPEBVXo4gwOrhUWRGD8bEsmtf03JzwHmRC87pWYyEhLbZhL6iv2c4kj7ZmvbvMdOTrIzvknA1mBv4Lf73CdznFN+vvHknY4/qWhfQuDKP0i0EtTpYqYaY+R4BpcuuNXEpFIi0nR//nQfmSt42SoiphPjCZ2Rg0BFU/71CaUW9BsVJqd/hdc2c5JfFiCivf/rBLkYejv9GJfsJoWH5pjsZh0I9Mj1dDmSSpzM5t4SMBjgSw2CCYGXi+AjdD/9TYNdGXNUUhY/1fsOmbaOat5qtSoiP+cUyvace8X5KeiNe4rfUd6evbGYUZxPlbVgrTunME3MzVcJZ0o1LDwLYL5OWhyiL8O3efw+7EjniIRZIiRRpFMni99mxIsc8dKY5FJhRbw+A7eoVywPo9GlEktESlKiH7fM0I6BNHykKTKVg=--rEuq4aphpOLdfahw--i1g8g7687a/QkdlgOnIeVQ== \ No newline at end of file +4uziXndh55ScQ8xt3SC5lnBWZIIJQy4TFBPzuBCWQDBnQAGNyC2RMNVEg4Q+F6Qvz66zqihOkt184BathWmgvmbjDPKYzHhaKHHjq83e0V61Fz7gpn9FaDrWdUI1Q5fHOpJXX3Lacy1N/PMb2IJL+3QMbTt5Y9bXLagAshG5R7JKsCHjkoUnXY9DPyjAQjnEgBVgN2V3c+8xTJFxyLj4a3P7q0/O+b0cZZ0CA41UJDco5iTQoVV/mr0EG6Gf1Kd8JGc4rSXP858gdtw4AjlpT0J3eKeMPriUf5r7gtGCpXPANLBzlxjLj7USsXW7s+nfQdnljD0hoBet5ixBALFnO5hwTGcqtaDDxeWWzdJj1wbDgSeFLj0W0UMSYbZt2JmWWk4XqeH8TXJuFs+9BMu+uzK4t0EpNqM1OCti94g5ps4vCkmYZh6PiGwesQWdxqPax9W+7zAKeZFtrYmVdPigdqjObUYsXdWbkiVv4+uAK20kFuLRSlX3enzrKHkBMrGZO3AhVbP5vrUlczbV1p6BrC1/rtgh6Q3+3qFvfIDTS48u3z/TpwaIFG1icy56ba4GNYNI03/kpaAzR7sPGHyHoKU6DzsLED1WvefflyADftQSsY+KLhWfDzzb+E7UkIGvGzXPabj08q6yPtBSdKYI6rMw0c1MsHoq5YK4S0/KqM92tmpQgPv4FNVV9ynVrcjOqGxfclfSsWTwBlMjIVGQkCimtxzvB7SVc71KVcukiLuj7sWbgJ3/Eq1sLbgDdN4yX1pL3cDyxbXjd5g6PduOFs7Wh8QbUZkDmM7AFKyCqFVMYOynQU8zlj0v63MOEgeh4aME5wIMxV+HJ8Bk5NbRm2mJ3QxcG2FIsdl6sCv1ZXXrcaSNqD2FmVF4DOAvbuBN+6vWeFsRf70qnCAb5EXy/4D9YsOmFvK2qLoJcbhWBdJv1nHGf+p5WGnfIF426+Qe30/o2pmXxm7vwAWi7oGzBeSzEBv/cflKDoRdM6x4VHHVfCaCbA6UrGyHgdIJGde7TdUuutiX2I0+cAe5wMfLEYXkiG7pw95kk9xTIIQbMOPgriox3e7t83lkdbO7cvLd8XMp9f9lUNJoEN9+iAxwDtVAtP3pBl1TjNTrS3PaWOW44oycCnS0HENdq4vMTANsEq/nsFuLqcsy0TUlGxOzVpKNwvrsTnUxoUDPPOZ5TaY0BEUdosMFxIMERmo5hbu4v5gUbTnu3214nQR2CKqurQj8tJgZerFkWL1AY+KBUO9rBEWGol7FwMBi/IDJUC0lyq7f13WehBmMRBjeyxLl6zndd8lEPtGUveJ26xD7Pnwftjc+fjZS/mhkVkA4a/tUOOTnSLehmlUvot2AC5EQKNElTvIDWO+XsFXwT5DAh8eoBou45/nWlZ1Z1zgZB3Q4IuApZ6CM45lvMRciZegvrm7qTff+hmtL/8ApuUUFNfaHapxJj0TUbAHTMtW22VA3qBiTV3Hd48XZcnW7/60gPcGoApKdaPArFPjQ0BrDP8NZkiK5iRvOkiYhlcUD+zVPp1iIVxLtx4mGCCtL4IHUfcgn/jTU/skOYgXtHESwq9NdI/THWHGuLTldTw16afSDcyP7/BTCh1/yfIL78qPYZm6etms88O3A0sS0+aqdEOlNrs5TE6hHHzrFaoLkEYabmNIdzBP4CVlUhkBaQQwGs8axoaiQC+klCSSDN4kg0k5d1etBXWaaxgbtg8iHq5r43hzvPfDgc+kQGigZHXIA71w73md9GGikfaNBK3qxrKAyST+fj0+UTD0mu1y6fcXefQrVXtC73p/zkLuT8VvzcVdcvA+bDJGUXd/ViFvj/bXvSwYqCiBWyJCOA6HcN/kM5T+tBRMwdHX3qAsUYDY=--SG5dSe3qjbzc6ZlO--SGd6ZAa0kyDPV5Oq9V18fw== \ No newline at end of file diff --git a/plugins/tenant/omu/test/dummy/config/credentials/development.yml.enc b/plugins/tenant/omu/test/dummy/config/credentials/development.yml.enc index c1c717245..1de671b26 100644 --- a/plugins/tenant/omu/test/dummy/config/credentials/development.yml.enc +++ b/plugins/tenant/omu/test/dummy/config/credentials/development.yml.enc @@ -1 +1 @@ -7I0GSdWpOrkl1b2kAzwTVaRE0E7X5wedmReTbw4rJtl/9H0sDnHnPYrdyME94ciYTyv0kaAI5MZGdsHeWaCkboINPmru+gS45dc0dD1PPG7yIfGmeCCTdrE+eDbNKvb3D6bTY7fwOenfKPp54wA5O9fHGS/cRzbhIS3rbzDFmMZGKkYxo+D2ab5FxRSawPypQ0uVlA/gK8VjfpZC5Uy5jynPa3ZzDOF4k9NIKZ08VQ0PatIc5b+68jIFhDbnHYRw/4BfQGGxoC9aAIs3D2l/6/YAX3xA2GOCHg37foY3PkYO9NRSNf+Z+w/cTei6djldlz68mJWWECrDWWq3dKmjTJiDEFMevC3axqdD8nuGqGz544jpumZQkI0llZuTXS4koFYXwsOB8jjIdcET680DdpIUz0uUMJgXgelJqhq3Qp+q4ahf2KXjhI6Cvj7oI1bCdgEH77hnhNcqDIo7ij0lvi0ZfZnd34UGDEI4mWM6RIgGKNdyv+LUHJNSZvNNGTkpZez+s4OufT0QMpRIs+kgow6LaVtAbp66m9YzYGnWB4UwVnexbdR4fI/5Szh8YRaVrojJg8TjoyLSD+Oc3iosZbGnmBstc5It2VrHs2F+9qshk4AWF8dxyRverinT22AvanbDP/tIhi4uLcUcrDQ651yH6hT54PjaSDVW1perRcOiqIiU7yDATc45RQxydCcOLaVgPLxIzoBan4FRrW+tdgDXFYkt7ejHLlWckSHHIGkmaBvwu9uHkM7oFzQ6Sbs+kg6kWLTKWHEvtXw1fJnM6wg3+DtC1hzofqrertMIoKRtH4sNzAdh9koskR1ZwDTrXlTGaKGtFQPQQ4neIla+JvzS9UIKhAjhTHebrOApGi2sVB5YQ25S5MK3+9oM0ybKGSJUK2izMeZp1CuQCbWO95DqXlyBQZJbkQuW5JTNv8C323IPZX94DPy5q/kHweapq7wOOHHWSZc6rcXkSE9gaiJXHho2iEqYlxF9u5eXx/73o9+shTg/e0gT9UxsXlHvAkJW1L4hC5IGKU+q2s/Lj805yIcp2dIr3FgufBE/ynBp0sKttqNwH4l1QSYG4X+RLoxMpXkb0r6IEQKIBEzxOWnIMpUy8aSQCw9nW8Hpk2x2QeHAlFBwzeApo6ODVo18PuZguf77Bwd9xmOout8+KfCoeYpWk9stAjsI59/sMaKWw3Zni7zQf0u/n7a73qLDaKJo27tSv/LlFtZEMuVpCgt8C2dRH3KlgWr5N0KZeb4kiDhR7Ru9fJAeyLxWCP8Dxla8mT8PhlgWGlrvaBgTAUnAtdDj58c8qjMapq8ocDCxf9U2lQVqwS7fjcLXywtomcszMinOpPbJUeEBIxqnn9iBgd4v9eDyXw6dMwC7nw9raFdSMp8rRnoX2xXJXzZuYNthYgpybqNx9o45vKh+Ra1P3s61hDWClMFNf3M6N45FGiN+Ny2Bpg0HRqwrm02Qbu7sbx1Umlazd/v7Pu+cUk4GMA==--f2l+Uu17GitzVtDD--61Vgp2X3neIblPpCtrhf4g== \ No newline at end of file +4uziXndh55ScQ8xt3SC5lnBWZIIJQy4TFBPzuBCWQDBnQAGNyC2RMNVEg4Q+F6Qvz66zqihOkt184BathWmgvmbjDPKYzHhaKHHjq83e0V61Fz7gpn9FaDrWdUI1Q5fHOpJXX3Lacy1N/PMb2IJL+3QMbTt5Y9bXLagAshG5R7JKsCHjkoUnXY9DPyjAQjnEgBVgN2V3c+8xTJFxyLj4a3P7q0/O+b0cZZ0CA41UJDco5iTQoVV/mr0EG6Gf1Kd8JGc4rSXP858gdtw4AjlpT0J3eKeMPriUf5r7gtGCpXPANLBzlxjLj7USsXW7s+nfQdnljD0hoBet5ixBALFnO5hwTGcqtaDDxeWWzdJj1wbDgSeFLj0W0UMSYbZt2JmWWk4XqeH8TXJuFs+9BMu+uzK4t0EpNqM1OCti94g5ps4vCkmYZh6PiGwesQWdxqPax9W+7zAKeZFtrYmVdPigdqjObUYsXdWbkiVv4+uAK20kFuLRSlX3enzrKHkBMrGZO3AhVbP5vrUlczbV1p6BrC1/rtgh6Q3+3qFvfIDTS48u3z/TpwaIFG1icy56ba4GNYNI03/kpaAzR7sPGHyHoKU6DzsLED1WvefflyADftQSsY+KLhWfDzzb+E7UkIGvGzXPabj08q6yPtBSdKYI6rMw0c1MsHoq5YK4S0/KqM92tmpQgPv4FNVV9ynVrcjOqGxfclfSsWTwBlMjIVGQkCimtxzvB7SVc71KVcukiLuj7sWbgJ3/Eq1sLbgDdN4yX1pL3cDyxbXjd5g6PduOFs7Wh8QbUZkDmM7AFKyCqFVMYOynQU8zlj0v63MOEgeh4aME5wIMxV+HJ8Bk5NbRm2mJ3QxcG2FIsdl6sCv1ZXXrcaSNqD2FmVF4DOAvbuBN+6vWeFsRf70qnCAb5EXy/4D9YsOmFvK2qLoJcbhWBdJv1nHGf+p5WGnfIF426+Qe30/o2pmXxm7vwAWi7oGzBeSzEBv/cflKDoRdM6x4VHHVfCaCbA6UrGyHgdIJGde7TdUuutiX2I0+cAe5wMfLEYXkiG7pw95kk9xTIIQbMOPgriox3e7t83lkdbO7cvLd8XMp9f9lUNJoEN9+iAxwDtVAtP3pBl1TjNTrS3PaWOW44oycCnS0HENdq4vMTANsEq/nsFuLqcsy0TUlGxOzVpKNwvrsTnUxoUDPPOZ5TaY0BEUdosMFxIMERmo5hbu4v5gUbTnu3214nQR2CKqurQj8tJgZerFkWL1AY+KBUO9rBEWGol7FwMBi/IDJUC0lyq7f13WehBmMRBjeyxLl6zndd8lEPtGUveJ26xD7Pnwftjc+fjZS/mhkVkA4a/tUOOTnSLehmlUvot2AC5EQKNElTvIDWO+XsFXwT5DAh8eoBou45/nWlZ1Z1zgZB3Q4IuApZ6CM45lvMRciZegvrm7qTff+hmtL/8ApuUUFNfaHapxJj0TUbAHTMtW22VA3qBiTV3Hd48XZcnW7/60gPcGoApKdaPArFPjQ0BrDP8NZkiK5iRvOkiYhlcUD+zVPp1iIVxLtx4mGCCtL4IHUfcgn/jTU/skOYgXtHESwq9NdI/THWHGuLTldTw16afSDcyP7/BTCh1/yfIL78qPYZm6etms88O3A0sS0+aqdEOlNrs5TE6hHHzrFaoLkEYabmNIdzBP4CVlUhkBaQQwGs8axoaiQC+klCSSDN4kg0k5d1etBXWaaxgbtg8iHq5r43hzvPfDgc+kQGigZHXIA71w73md9GGikfaNBK3qxrKAyST+fj0+UTD0mu1y6fcXefQrVXtC73p/zkLuT8VvzcVdcvA+bDJGUXd/ViFvj/bXvSwYqCiBWyJCOA6HcN/kM5T+tBRMwdHX3qAsUYDY=--SG5dSe3qjbzc6ZlO--SGd6ZAa0kyDPV5Oq9V18fw== \ No newline at end of file diff --git a/plugins/tenant/omu/test/dummy/config/credentials/production.yml.enc b/plugins/tenant/omu/test/dummy/config/credentials/production.yml.enc index a6179ccad..3a6138dbf 100644 --- a/plugins/tenant/omu/test/dummy/config/credentials/production.yml.enc +++ b/plugins/tenant/omu/test/dummy/config/credentials/production.yml.enc @@ -1 +1 @@ -YnP4PwWwpyL55X+UOlG54Ixw0ZvN1CjreQJ34cN2uNMP8bbWJVfMrVo2amXb9T0jqQvbfyBBxeMm5sUceldstPrupBcIeOuOZdbxa2P6fod+a7DPhEk+aPtOPBYWzW45mhWDvW8lpPK7Go0EwoMJzAuJahjFST7/5sj5HCY06zRLDlceucn4Tx+gTO+1Ve/FGDtMumnLv7Z4Oa6B5tRdtmltGFY7R7GQ2EETJ/YmRJtO3xl2+b8H2jSaDYGv7qx2mdefiRlmg+CFv6cM4QP/2PXJgr4nWeio2qNF3j9wzeHT+tFDUjZ5N50U3cWJEVjZ9mWgjlvukBQy85yMB3FB67r4XsEekqcqdXifE99omEiM/lILEyyccwO/XEk/bmOcgweqRd2FAhRcsOnJ0+IZYaD/x6nUxgI4tMKqprvAGAwnpBd/Te9hRhvIhtL7upzFCowNh48k9jnJh969dkv7UH7IM08lK+6xIZNsFL6Q1+tFbNSGa7lEVnmzApYHOsXuVr/e6gQ/HDfxgvRq7HgOLLaasUwKRHegKxFkCMCo2KR1PyJwqh/fgYW2S6NzqY28goVt2+t3usAiq9XqRUxbm49id08AXltaAWG8i9RUr+LXRoZzfJdMCmZKx+cX6WMegZHA04Nh/mNBPKjolzDWTldNTg351w64lECpbFCUwahD9a6qLr5zvvMks2HLRW5sfPvxG/tTdzjXsHCrEX94EgNsbcIbdPU0r1e11QSta2vWDSUI4GL7g1SySIweyMSuitjAB2NJ3YXJSi0zQbeTLfUm0ayoOdvG70/1az7PgLrKYemY4zmm7F0ehnPqmD+CprxteEPzpvXLyGLVFvKmpJhnNxOlI5OSMJjj+uq0faSUvaNCN6RAfJuDpWasnD37FGKV9QczWEPdceWPT3CUCwJrGWcoG9yDT/2wTHpuzt4LpWdNSMxd8XH0Kv9Btov0TNh+8DxB0vKaa1JUcC1+ns+rtWQLeKt8JqF+26dvNdIaGRv+mmVnIk7/IfXUtugSCFugM9tPlvXrMhAVU5dhdFru67nlKZZ92IIvfx17TgpaPMiMx0QcVcfs0COBioWoupAzUpx+0N2KCF9fi9v29wS6AglO87xR2U6iy/kVq/Ni1emFb0L89YCmHkJqgLQmtklF0WVhwyAQ3q2LOg6v2FwFr9ChLm3O3uXI9YhETttcsAIG0GfZ8B7DqAHS8ZU2R0I/4UCKn2lL4Yoj67EIjxBQv36eeEvaoSYpSHZle7OKmTqksBtkCJ8AbYmxXxig7mRJYvY3FeTPVjeyrkl1e6Ktngem7nkhEaVAjqlhTN2Fp5d0jFPMMNNLVrFQ5MuB35wVOj3k7s82RbblSz5rmL7j9D2qlPJHgEB12ttl5p9fVATXTMAmPHRvk3RMdebqXJz+W65k5DIh/UHOU3EtMzgOZP0xe38BB9ZfZcRFHwsfPZiwzlNKnDE5zISes0jgABJIEZrgNLSKi2KKN3WqpFgKFH22dsj0Tw==--1Nbqx8k9NNKYqTkA--DLdOBX7/4RnRL3BQVF6pmQ== \ No newline at end of file +ja+BB9J7KBZF7a7jomdmddArtpduHjxXexSofZNEyLIrbzn8lH+cIkf77AD6IMrDaXZjwHCF722kvlfkHaX4XNMood0gP1Nnpcs/6PpWxYb9waRpL5Omh+cbx6S0ZXDrsNVYa7p2mfd+2s5U8U+S73fmeZWFhv0WIcBU6eMNaxaWH0zbUmrBik0vJf0jM5A3rWPbY6P1TVuUZeNsxNDrtyKJzXdNTMkvKIRfe+BalGraLTvW9sTIM4UuD/YePNYOXx/yVBfP45+ViH4j8/x+rQmnZq8/R33cevhkFwHOjJbrE2GCquACT3Bb5mqq8fSGVZd4d7v99wZlUXWuVIn569Qi/vcU8I5wVmkXcm0jMABX/Soe4ViCmuS18XvAP1X51s+nGZDvXd/tlQz83y3R/B3ZtqDzzJH1Zoz4BDa13/3kXs5k+LbzIql2OFJsFUzf1tYHy72k2Q70SewM/mOT2XMm30bXe7jI5bOUiT3KGAyihZ5Z+uLl4jakGZwys7zoX3sBZ0t9J/BBuV4TLVqaOxKnm9KBfBcfRZeSlu/2v0NPgN3usk7e1aOOKmKrtcJ/UuifpL5mKEInVCwtuqzLIONO+yAPF7ji29UT95o5dPb45at6H4FGcMrOEF1AKCfGs8mpQS7DpBpUotxY3jsAAMkrPTyY6oj+1QrIBRwnZPJAMJU7fAzAvYJQ5pQycpvXz9Ig0/mjcnj7Fa0uk/E3OaYbzTzdTMTVNcsAfKcVdZj0QyNYRBbt8cpXpBDOQqejLKM55j1bvNSl8stZmG1/rA01STbaRbfysq6t42/HKbu1wKMQcKHDOHSJKB2/5uHq16Ys5oLXeOZ1DOX8X6dl57xrEiMFHjrjsgF9cIOuqjsgcLIwRQKIaEuk2hHZ13BAPfWf113UmaHTa9Oab9H9yZjaMR5XZ/wxXXtRK0gtTcbrIVwnBJtIPMu4JDxbkk6mzwRCL8iuUjjfxL9bhFjBhEM/Jw18niph9bm4j4gcwtp9GNMQDl8Ov38Jkf9379l5TiUH+tAJLRHB/AOi3G5hZpGkvda9IumBdjimxZd3Y88QMqhWiquj3vTEcfDrqSd7WUosZsEFiBIhEGRFN3oDtco37xqA6UcWGOwEWK/XM2tegrQpngGq6L0s/ONEVjwrA2Swd10Jj7ahxXCwiZf6jPEIDpSDGJU2fmmY4ZTk/m7Gk7xasZ/rMPXcDwQgpw1JXwnamwt3iKtD2+2VhLvZVcXOpdKq+U5P6tfigClfhS8ad6Ch9uUNR5n6MQEsOS+j9lLA1HRkogmBb83KinjWt4IkgwuoakBJDLcEF6ATICHj2QsJYzry8KS/kLF6seObMpTsPJlDTwKbUku+EUF1h+vjyz3C+XAEB58EgpPgaIWCo1XsrgVc464DITisXUjnXSWvlA9LfXGhey5+5CWemu/1TSd4oVCaV+3snOgfkQkuRIhU7LEikp57LUR+G4pxZPHSLvv8yuRXITtE9DSw6k0RKybZYTUYJ1CocMv/di61EBhtUIUTxLQKvbj5kQnGiJlWEwk3vLwBaoLb7wT4XfTNmnE4zopPEhkl19Cubgrss6RPQypbCcfUrDPiyb//cpMffCg4Y07B8zHCrPhl353iKfrBSexXcxeY+cDWpEBbfnGWJHzwaPi7AJFko4pb2onHgDmaidai4eBi4q6WadgJUPy6KmNEd5bVLNJaGj6jvlMsWlzDGOH3yvAm8X21bv8BGC/l/FmSzLQh5PEqjQ3oAmjxzMH6CrbRwXh7IolydezlhOpjYJp7NhMeFFLNhTUaRUg/TclOzU6W8hqzZ93eZpSSmMMQ1AZJwky2GqrKj3jMcHQXZSz0NCNl3gt9kcgSrsJxSko27XGTgeKdtIN3ywU=--230ijeX0gsp/nD4A--1uPd7/t2fHMAl8H+uMcgzg== \ No newline at end of file diff --git a/plugins/tenant/omu/test/dummy/config/credentials/test.yml.enc b/plugins/tenant/omu/test/dummy/config/credentials/test.yml.enc index 1a1147111..1de671b26 100644 --- a/plugins/tenant/omu/test/dummy/config/credentials/test.yml.enc +++ b/plugins/tenant/omu/test/dummy/config/credentials/test.yml.enc @@ -1 +1 @@ -s/8ANhcMWacugH6XYDNF4ycsF5rPiHgSbOTtWvAFbG9CUWJvGrswsyTYFZndi23EnQy9sud9NFQpjw6ek7eo5mc5/97YEwRv5Pmc67wfrjsfDBHatnNA6vbNzH7AwHMgZ7eRqfzVabnkCVY4FkS2zVSi7zVNUN3ovk6oXxEkko4M7RiysUKX3PenKoZr4DxdjZts//pHK2HxBzhfpn+fLLNypz4pDeVI9ulazQebFmV2Nwia32ZPo6MKJ2kYNoTkTwEsy0QVKQapJUJ5jyk+WXyVnJZVrZ7puOqEzuhmOmo7l6WMzAcn/6XWcqV43nlLVcowOWGeDmtPDD9L7aTkHp7Ky50Xc/YMGZdv7Qfusdpsiriul2X32VXb5tcrzW+xNiRW14q3twQx05altYeCrH/gi8Csu6Ja5WAwU5n/LRiFlen89wmGy6uJn9xLtV9vee2eOfcDuPIy9JhKNCKRK7uOfdRD+7fS2MO0helJ1jizy8YIrSRwYSeeS4pGX0QGcPvyzV+wPoLTacCb6+BwifIIk0mrWxsdhTyDFayjVW0nfg6zztb2m1uEfPukUMBZh227MF6fA289wEvx6O4Tfj+xzSxVPAwEM2X+25m8bdhyCOze+NWBH4Li/SvZxgA31z8WiiRVH14UEl98fA//bHvY3qjDPec8QIm1n/Q6pnGVjbkEFAjT2JI9yrejIKtGAQ/GQvbiLKPcC/DLBQue1lQFBxlW8M/z3dsh9FZlOb7XEu5zmB5wriOf5IuwcS4jjpGi4kMXuJryRmixYIZpnZ8bYqSTpqf+54XPhOy0H9cOBm72Q9jOZlqE6Jc1Way0SUS5gu9v0HLvTNkWLVxnNNuHDu7kPw+gOHimZj9VM6ozaaRFgxqjDr332dHh3tDZHtvdPjZx1wFx/jJIEXz1I4ZUZaXB7q9E1tIXe8iDGX2zndFeb3fN277PFiRaKKe03XyUu26mI/szUL4PwBqtIuqHmvvouGMspT8QP9x9BKKBqTZ7HJs/anvG2rWWli7OZk0cXFAEJntDOM40E7Ts70edcMst3yjQ1UCPmuMD8MdGw1SjbbSqXUw3kyMh3D8D7LpdwzB5BST/Zi3gGoLLS4nY+WKDmtwVPuud+L6jq5/d+z54QKOJWYBefD5IKb8V58OPJPGBkrDfPOdJ4pMtjZM6h415rtD3jNCrW+pX7a/R6JrPB9IF7cfDfOlxLeE3TVhA3rbgnCk5TStzXbkE2/oT6zzJycOQiTKgYzvSFvTVyj2aM+5r0Gu+Vzt8X/mwkIcUtEhPgx7JLBrHPcDJZgs5rkxFG9YLz4FxBKc2ZD4SsyMSeTpsgXAbUJ3qmSc2/E7/yMljgQMjKcyz5vyk7/BEINwDXBx5PMnmlPWDk6enzbi/yggpso2uw9bYyU56hsKT859p0DfbT4E/Og6W/4bcitDCIHftrU2zwnwSRGgIHHno7Ag23d1ahzH9JckLQr8AePUDCav0CHOkVWWLW8UPsA==--f3lFTTvXH1WFCHjP--xlBmXAju1AR3gvvpe5ycgA== \ No newline at end of file +4uziXndh55ScQ8xt3SC5lnBWZIIJQy4TFBPzuBCWQDBnQAGNyC2RMNVEg4Q+F6Qvz66zqihOkt184BathWmgvmbjDPKYzHhaKHHjq83e0V61Fz7gpn9FaDrWdUI1Q5fHOpJXX3Lacy1N/PMb2IJL+3QMbTt5Y9bXLagAshG5R7JKsCHjkoUnXY9DPyjAQjnEgBVgN2V3c+8xTJFxyLj4a3P7q0/O+b0cZZ0CA41UJDco5iTQoVV/mr0EG6Gf1Kd8JGc4rSXP858gdtw4AjlpT0J3eKeMPriUf5r7gtGCpXPANLBzlxjLj7USsXW7s+nfQdnljD0hoBet5ixBALFnO5hwTGcqtaDDxeWWzdJj1wbDgSeFLj0W0UMSYbZt2JmWWk4XqeH8TXJuFs+9BMu+uzK4t0EpNqM1OCti94g5ps4vCkmYZh6PiGwesQWdxqPax9W+7zAKeZFtrYmVdPigdqjObUYsXdWbkiVv4+uAK20kFuLRSlX3enzrKHkBMrGZO3AhVbP5vrUlczbV1p6BrC1/rtgh6Q3+3qFvfIDTS48u3z/TpwaIFG1icy56ba4GNYNI03/kpaAzR7sPGHyHoKU6DzsLED1WvefflyADftQSsY+KLhWfDzzb+E7UkIGvGzXPabj08q6yPtBSdKYI6rMw0c1MsHoq5YK4S0/KqM92tmpQgPv4FNVV9ynVrcjOqGxfclfSsWTwBlMjIVGQkCimtxzvB7SVc71KVcukiLuj7sWbgJ3/Eq1sLbgDdN4yX1pL3cDyxbXjd5g6PduOFs7Wh8QbUZkDmM7AFKyCqFVMYOynQU8zlj0v63MOEgeh4aME5wIMxV+HJ8Bk5NbRm2mJ3QxcG2FIsdl6sCv1ZXXrcaSNqD2FmVF4DOAvbuBN+6vWeFsRf70qnCAb5EXy/4D9YsOmFvK2qLoJcbhWBdJv1nHGf+p5WGnfIF426+Qe30/o2pmXxm7vwAWi7oGzBeSzEBv/cflKDoRdM6x4VHHVfCaCbA6UrGyHgdIJGde7TdUuutiX2I0+cAe5wMfLEYXkiG7pw95kk9xTIIQbMOPgriox3e7t83lkdbO7cvLd8XMp9f9lUNJoEN9+iAxwDtVAtP3pBl1TjNTrS3PaWOW44oycCnS0HENdq4vMTANsEq/nsFuLqcsy0TUlGxOzVpKNwvrsTnUxoUDPPOZ5TaY0BEUdosMFxIMERmo5hbu4v5gUbTnu3214nQR2CKqurQj8tJgZerFkWL1AY+KBUO9rBEWGol7FwMBi/IDJUC0lyq7f13WehBmMRBjeyxLl6zndd8lEPtGUveJ26xD7Pnwftjc+fjZS/mhkVkA4a/tUOOTnSLehmlUvot2AC5EQKNElTvIDWO+XsFXwT5DAh8eoBou45/nWlZ1Z1zgZB3Q4IuApZ6CM45lvMRciZegvrm7qTff+hmtL/8ApuUUFNfaHapxJj0TUbAHTMtW22VA3qBiTV3Hd48XZcnW7/60gPcGoApKdaPArFPjQ0BrDP8NZkiK5iRvOkiYhlcUD+zVPp1iIVxLtx4mGCCtL4IHUfcgn/jTU/skOYgXtHESwq9NdI/THWHGuLTldTw16afSDcyP7/BTCh1/yfIL78qPYZm6etms88O3A0sS0+aqdEOlNrs5TE6hHHzrFaoLkEYabmNIdzBP4CVlUhkBaQQwGs8axoaiQC+klCSSDN4kg0k5d1etBXWaaxgbtg8iHq5r43hzvPfDgc+kQGigZHXIA71w73md9GGikfaNBK3qxrKAyST+fj0+UTD0mu1y6fcXefQrVXtC73p/zkLuT8VvzcVdcvA+bDJGUXd/ViFvj/bXvSwYqCiBWyJCOA6HcN/kM5T+tBRMwdHX3qAsUYDY=--SG5dSe3qjbzc6ZlO--SGd6ZAa0kyDPV5Oq9V18fw== \ No newline at end of file From b7d4de6f583e6c3ec86d45e8d75ade7e9d2584d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Thu, 5 Dec 2019 14:53:58 +0300 Subject: [PATCH 004/216] =?UTF-8?q?bundle-audit'e=20OIDC=20i=C3=A7in=20ist?= =?UTF-8?q?isna=20ekle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/static_analysis/all.rake | 2 +- lib/tasks/static_analysis/audit.rake | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/tasks/static_analysis/all.rake b/lib/tasks/static_analysis/all.rake index 3271d6b3f..a50502b69 100644 --- a/lib/tasks/static_analysis/all.rake +++ b/lib/tasks/static_analysis/all.rake @@ -2,5 +2,5 @@ namespace :static_analysis do desc 'Run all static analysis tasks' - task all: %w[bundle:audit brakeman erb_linter eslint executables html_linter markdownlint rubocop secrets] + task all: %w[bundle_audit brakeman erb_linter eslint executables html_linter markdownlint rubocop secrets] end diff --git a/lib/tasks/static_analysis/audit.rake b/lib/tasks/static_analysis/audit.rake index 293c9e4b5..c809b981a 100644 --- a/lib/tasks/static_analysis/audit.rake +++ b/lib/tasks/static_analysis/audit.rake @@ -1,9 +1,8 @@ # frozen_string_literal: true -if Rails.env.development? || Rails.env.test? - require 'bundler/audit/task' - - namespace :static_analysis do - Bundler::Audit::Task.new +namespace :static_analysis do + desc 'Bundle Audit' + task bundle_audit: :environment do + sh 'bundle exec bundle-audit check --update --ignore CVE-2015-9284' end end From e9a6ea35e541ee14665a37708ac83c30a31a4e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Thu, 5 Dec 2019 14:55:04 +0300 Subject: [PATCH 005/216] =?UTF-8?q?SSO=20dok=C3=BCmanlar=C4=B1=20ekle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/app/sso.md | 16 ++++++++++++ doc/development/sso.md | 55 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 doc/app/sso.md create mode 100644 doc/development/sso.md diff --git a/doc/app/sso.md b/doc/app/sso.md new file mode 100644 index 000000000..72db3267a --- /dev/null +++ b/doc/app/sso.md @@ -0,0 +1,16 @@ +--- +author(s): + - Emre Can Yılmaz (@ecylmz) +--- + +Single Sign-on +============== + +Uygulamada SSO'yu aktif hale getirmek için aşağıdaki ortam değişkeni tanımlanmalıdır. + +```text +NOKUL_SSO_ENABLED=true +``` + +Bu ortam değişkeni olmadığında sistem veritabanından yetkilendirmeye çalışacaktır. LDAP'taki ve veritabanındaki kullanıcı +parolaları aynı olduğundan, kullanıcılar başarılı bir şekilde sisteme giriş yapabilmeye devam edebileceklerdir. diff --git a/doc/development/sso.md b/doc/development/sso.md new file mode 100644 index 000000000..8deafbdee --- /dev/null +++ b/doc/development/sso.md @@ -0,0 +1,55 @@ +--- +author(s): + - Emre Can Yılmaz (@ecylmz) +--- + +Single Sign-on +============== + +Geliştirme ortamında Single Sign-On(SSO) denemeleri yapmak için Vagrant ile çalışmanız gerekiyor. Çalışma ortamını hazır +hale getirmek için aşağıdaki komutlar uygulanır: + +```sh +vagrant up ldap --provider=lxc +vagrant up dev --provider=lxc +vagrant up sso --provider=lxc +``` + +Nokulda SSO'yu aktif etmek için `.env` dosyasına aşağıdaki satırı ekleyin: + +```text +NOKUL_SSO_ENABLED=true +``` + +Nokul uygulamasına SSO üzerinden giriş yapabilmek için bir kullanıcınızın olması gerekiyor. Kullanıcınızı hazır hale +getirmek için aşağıdaki komutları rails konsoluna girmelisiniz: + +```ruby +user = User.find_by(id_number: "Geliştirici ekibe sor") +user.password = 12345 +user.password_confirmation = 12345 +user.activated = true +user.save(validate: false) +LDAP::Entity.create(user) +``` + +`vagrant ssh dev` diyerek dev sanal makinesine girip uygulamayı durdurun. Uygulamayı ssl kullanarak başlatmak için şunu +başlatın: + +```bash +sudo app stop +cd /app +bundle exec rails s -b 'ssl://0.0.0.0:3000?key=/etc/ssl/private/ssl-cert-snakeoil.key&cert=/etc/ssl/certs/ssl-cert-snakeoil.pem' +``` + +Uygulamaya giriş için `https://other.vagrant.ga:3000` adresine gidin. + +LemonLDAP +--------- + +LemonLDAP ile ilgili yapılandırmalar için `https://manager.sso.vagrant.ga` adresine girin. + +```text +Kullanıcı: cezmi +Parola: 12345 +``` From 16f9873481a98a55e14310802a629725435e7cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Thu, 5 Dec 2019 15:09:40 +0300 Subject: [PATCH 006/216] Resime 'alt' ekle --- lib/templates/sso/portal/customheader.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/templates/sso/portal/customheader.tpl b/lib/templates/sso/portal/customheader.tpl index 77b438145..30460604b 100644 --- a/lib/templates/sso/portal/customheader.tpl +++ b/lib/templates/sso/portal/customheader.tpl @@ -1,4 +1,4 @@ - acme/images/acme-logo.svg" class="img-fluid rounded mx-auto d-block" /> + acme/images/acme-logo.svg" alt="ACME Logo" class="img-fluid rounded mx-auto d-block" /> From 648caea9a9a4a111e942eb4a9df47c8ebcd112cc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:53:15 +0000 Subject: [PATCH 007/216] chore(deps): [security] bump puma from 4.3.0 to 4.3.1 Bumps [puma](https://github.com/puma/puma) from 4.3.0 to 4.3.1. **This update includes a security fix.** - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.3.0...v4.3.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index aef4681f6..37da1a4a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -249,7 +249,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.1) - puma (4.3.0) + puma (4.3.1) nio4r (~> 2.0) pundit (2.1.0) activesupport (>= 3.0.0) From 64b4bc8ed07076d0317a951bd8cb71c294ee9069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 09:19:44 +0300 Subject: [PATCH 008/216] Update lib/scripts/sso.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Recai Oktaş --- lib/scripts/sso.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scripts/sso.sh b/lib/scripts/sso.sh index c6b6e38b4..3a9a041bd 100644 --- a/lib/scripts/sso.sh +++ b/lib/scripts/sso.sh @@ -46,7 +46,7 @@ sed -i -e "s/^logLevel.*/logLevel=debug/" /etc/lemonldap-ng/lemonldap-ng.ini # allow sso vagrant ip for reload # shellcheck disable=SC2117 -sed -i -e "35i \ \ \ \ allow 10.0.3.19;" /etc/nginx/sites-available/handler-nginx.conf +sed -i '/^\s*location\s*=\s*[/]reload\>/a\ allow 10.0.3.19;' /etc/nginx/sites-available/handler-nginx.conf # for vagrant ln -s /vagrant/lib/templates/sso/etc/nginx/dhparam.pem /etc/nginx/dhparam.pem From efd8c5f75f62b81246bccf0a6206188a57625fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 09:24:31 +0300 Subject: [PATCH 009/216] Update config/environments/development.rb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Recai Oktaş --- config/environments/development.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index 1e3cc5800..869761468 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -3,7 +3,7 @@ Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. - %w[.ngrok.io .serveo.net .localtunnel.me other.vagrant.ga].each { |host| config.hosts << host } + %w[.ngrok.io .serveo.net .localtunnel.me .vagrant.ga].each { |host| config.hosts << host } # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development From b28514be005f8a863115ec82a7d52011b0ffb54e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 09:24:45 +0300 Subject: [PATCH 010/216] Update doc/app/sso.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Recai Oktaş --- doc/app/sso.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/app/sso.md b/doc/app/sso.md index 72db3267a..183f5abf9 100644 --- a/doc/app/sso.md +++ b/doc/app/sso.md @@ -12,5 +12,5 @@ Uygulamada SSO'yu aktif hale getirmek için aşağıdaki ortam değişkeni tanı NOKUL_SSO_ENABLED=true ``` -Bu ortam değişkeni olmadığında sistem veritabanından yetkilendirmeye çalışacaktır. LDAP'taki ve veritabanındaki kullanıcı +Bu ortam değişkeni olmadığında sistem veritabanından yetkilendirmeye çalışacaktır. LDAP ve veritabanındaki kullanıcı parolaları aynı olduğundan, kullanıcılar başarılı bir şekilde sisteme giriş yapabilmeye devam edebileceklerdir. From 13fefec6654796584a18abad4bdb60aa75cdf2b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 09:25:04 +0300 Subject: [PATCH 011/216] Update lib/scripts/sso.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Recai Oktaş --- lib/scripts/sso.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scripts/sso.sh b/lib/scripts/sso.sh index 3a9a041bd..782eb5b2f 100644 --- a/lib/scripts/sso.sh +++ b/lib/scripts/sso.sh @@ -42,7 +42,7 @@ apt-get -y install lemonldap-ng \ sed -i 's/example\.com/sso\.vagrant\.ga/g' /etc/lemonldap-ng/* /var/lib/lemonldap-ng/conf/lmConf-1.json sed -i -e 's/^;checkTime.*/checkTime = 1/' /etc/lemonldap-ng/lemonldap-ng.ini -sed -i -e "s/^logLevel.*/logLevel=debug/" /etc/lemonldap-ng/lemonldap-ng.ini +sed -i 's/^logLevel.*/logLevel=debug/' /etc/lemonldap-ng/lemonldap-ng.ini # allow sso vagrant ip for reload # shellcheck disable=SC2117 From 56eacdcfffe2c3b7c20aad1bc0bb198b2fe90d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 09:29:47 +0300 Subject: [PATCH 012/216] Update lib/scripts/sso.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Recai Oktaş --- lib/scripts/sso.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scripts/sso.sh b/lib/scripts/sso.sh index 782eb5b2f..f096344c6 100644 --- a/lib/scripts/sso.sh +++ b/lib/scripts/sso.sh @@ -41,7 +41,7 @@ apt-get -y install lemonldap-ng \ cpanminus sed -i 's/example\.com/sso\.vagrant\.ga/g' /etc/lemonldap-ng/* /var/lib/lemonldap-ng/conf/lmConf-1.json -sed -i -e 's/^;checkTime.*/checkTime = 1/' /etc/lemonldap-ng/lemonldap-ng.ini +sed -i 's/^;checkTime.*/checkTime = 1/' /etc/lemonldap-ng/lemonldap-ng.ini sed -i 's/^logLevel.*/logLevel=debug/' /etc/lemonldap-ng/lemonldap-ng.ini # allow sso vagrant ip for reload From 23c816beffa260c2a3d3e4f71b4a8a68f21b5888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 09:51:26 +0300 Subject: [PATCH 013/216] s/NOKUL_SSO_ENABLED/NOKUL_SSO_ENABLE --- doc/app/sso.md | 2 +- doc/development/sso.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/app/sso.md b/doc/app/sso.md index 72db3267a..67023bc68 100644 --- a/doc/app/sso.md +++ b/doc/app/sso.md @@ -9,7 +9,7 @@ Single Sign-on Uygulamada SSO'yu aktif hale getirmek için aşağıdaki ortam değişkeni tanımlanmalıdır. ```text -NOKUL_SSO_ENABLED=true +NOKUL_SSO_ENABLE=true ``` Bu ortam değişkeni olmadığında sistem veritabanından yetkilendirmeye çalışacaktır. LDAP'taki ve veritabanındaki kullanıcı diff --git a/doc/development/sso.md b/doc/development/sso.md index 8deafbdee..770b4fb75 100644 --- a/doc/development/sso.md +++ b/doc/development/sso.md @@ -18,7 +18,7 @@ vagrant up sso --provider=lxc Nokulda SSO'yu aktif etmek için `.env` dosyasına aşağıdaki satırı ekleyin: ```text -NOKUL_SSO_ENABLED=true +NOKUL_SSO_ENABLE=true ``` Nokul uygulamasına SSO üzerinden giriş yapabilmek için bir kullanıcınızın olması gerekiyor. Kullanıcınızı hazır hale From 782ed0e35e4bf8ae0676911e08fa7a57b10004a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 09:52:09 +0300 Subject: [PATCH 014/216] Guard clause --- app/controllers/account/sessions_controller.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/account/sessions_controller.rb b/app/controllers/account/sessions_controller.rb index 4fd3502f1..c0c712e92 100644 --- a/app/controllers/account/sessions_controller.rb +++ b/app/controllers/account/sessions_controller.rb @@ -7,11 +7,9 @@ class SessionsController < Devise::SessionsController # GET /resource/sign_in def new - if ENV.fetch('NOKUL_SSO_ENABLED', false) - redirect_to(user_openid_connect_omniauth_authorize_path) - else - super - end + return super unless ENV.fetch('NOKUL_SSO_ENABLE', false) + + redirect_to(user_openid_connect_omniauth_authorize_path) end # POST /resource/sign_in From b6254cd8d90103eaceb25f1402fb8080a49d23d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 09:54:09 +0300 Subject: [PATCH 015/216] s/NOKUL_SSO_ENABLED/NOKUL_SSO_ENABLE --- app/views/layouts/shared/_header.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/shared/_header.html.erb b/app/views/layouts/shared/_header.html.erb index d36aea102..99107a71c 100644 --- a/app/views/layouts/shared/_header.html.erb +++ b/app/views/layouts/shared/_header.html.erb @@ -24,7 +24,7 @@ <%= link_to :settings, class: 'dropdown-item' do %> <%= fa_icon('shield', text: t('.account_settings')) %> <% end %> - <% if ENV.fetch('NOKUL_SSO_ENABLED', false) %> + <% if ENV.fetch('NOKUL_SSO_ENABLE', false) %> <%= link_to "#{Tenant.credentials.lemonldap[:issuer]}/oauth2/logout", class: 'dropdown-item' do %> <%= fa_icon('lock', text: t('.logout')) %> <% end %> From 4081a6128f846a1a331b286f3923ec8f16f75461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 09:54:57 +0300 Subject: [PATCH 016/216] =?UTF-8?q?Gereksiz=20yorum=20sat=C4=B1rlar=C4=B1n?= =?UTF-8?q?=C4=B1=20kald=C4=B1r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/templates/sso/etc/nginx/portal-nginx.conf | 36 +++---------------- .../sso/etc/nginx/snippets/ssl-params.conf | 3 -- 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/lib/templates/sso/etc/nginx/portal-nginx.conf b/lib/templates/sso/etc/nginx/portal-nginx.conf index a18742625..dfbecef21 100644 --- a/lib/templates/sso/etc/nginx/portal-nginx.conf +++ b/lib/templates/sso/etc/nginx/portal-nginx.conf @@ -15,24 +15,15 @@ server { server_name auth.sso.vagrant.ga; root /usr/share/lemonldap-ng/portal/htdocs/; - # Use "lm_app" format to get username in nginx.log (see nginx-lmlog.conf) - #access_log /var/log/nginx/portal.log lm_app; - - # Uncomment this if you are running behind a reverse proxy and want - # LemonLDAP::NG to see the real IP address of the end user - # Adjust the settings to match the IP address of your reverse proxy - # and the header containing the original IP address - # As an alternative, you can use the PROXY protocol - # - #set_real_ip_from 127.0.0.1; - #real_ip_header X-Forwarded-For; + + set_real_ip_from 10.0.3.1; + real_ip_header X-Forwarded-For; if ($uri !~ ^/((static|javascript|favicon).*|.*\.psgi)) { rewrite ^/(.*)$ /index.psgi/$1 break; } location ~ ^(?/.*\.psgi)(?:$|/) { - # Note that Content-Security-Policy header is generated by portal itself # FastCGI configuration include /etc/nginx/fastcgi_params; @@ -41,19 +32,6 @@ server { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_split_path_info ^(.*\.psgi)(/.*)$; fastcgi_param PATH_INFO $fastcgi_path_info; - # Uncomment this if you use Auth SSL: - #map $ssl_client_s_dn $ssl_client_s_dn_cn { - # default ""; - # ~/CN=(?[^/]+) $CN; - #} - #fastcgi_param SSL_CLIENT_S_DN_CN $ssl_client_s_dn_cn - - # OR TO USE uWSGI - #include /etc/nginx/uwsgi_params; - #uwsgi_pass 127.0.0.1:5000; - #uwsgi_param LLTYPE psgi; - #uwsgi_param SCRIPT_FILENAME $document_root$sc; - #uwsgi_param SCRIPT_NAME $sc; } @@ -62,7 +40,7 @@ server { try_files $uri $uri/ =404; # Uncomment this if you use https only - #add_header Strict-Transport-Security "15768000"; + add_header Strict-Transport-Security "15768000"; } location /static/ { @@ -88,10 +66,4 @@ server { location /index.psgi/notification { deny all; } - - # DEBIAN - # If install was made with USEDEBIANLIBS (official releases), uncomment this - #location /javascript/ { - # alias /usr/share/javascript/; - #} } diff --git a/lib/templates/sso/etc/nginx/snippets/ssl-params.conf b/lib/templates/sso/etc/nginx/snippets/ssl-params.conf index dbc82f746..64ea45f3d 100644 --- a/lib/templates/sso/etc/nginx/snippets/ssl-params.conf +++ b/lib/templates/sso/etc/nginx/snippets/ssl-params.conf @@ -10,9 +10,6 @@ ssl_stapling on; # Requires nginx >= 1.3.7 ssl_stapling_verify on; # Requires nginx => 1.3.7 resolver 8.8.8.8 8.8.4.4 valid=300s; resolver_timeout 5s; -# Disable strict transport security for now. You can uncomment the following -# line if you understand the implications. -# add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"; add_header X-Frame-Options DENY; add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; From bd2b48cb14dc69c3c5909871e87fe2bdc07bb593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 09:55:52 +0300 Subject: [PATCH 017/216] =?UTF-8?q?reboot=20yerine=20systemctl=20ile=20ser?= =?UTF-8?q?visi=20yeniden=20ba=C5=9Flat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/scripts/sso.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scripts/sso.sh b/lib/scripts/sso.sh index c6b6e38b4..dd6de528e 100644 --- a/lib/scripts/sso.sh +++ b/lib/scripts/sso.sh @@ -171,4 +171,4 @@ ln -s /vagrant/lib/templates/sso/portal $TEMPLATE_DIR/acme lemonldap-ng-cli -yes 1 set portalSkin 'acme' portalSkinBackground 'acme-bg.jpg' lemonldap-ng-cli update-cache -reboot +systemctl restart lemonldap-ng-fastcgi-server.service From 4719636a1a2d6b7b406ce4e647802716405778f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 10:02:51 +0300 Subject: [PATCH 018/216] Update doc/development/sso.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Recai Oktaş --- doc/development/sso.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/development/sso.md b/doc/development/sso.md index 770b4fb75..2ee716f16 100644 --- a/doc/development/sso.md +++ b/doc/development/sso.md @@ -15,7 +15,7 @@ vagrant up dev --provider=lxc vagrant up sso --provider=lxc ``` -Nokulda SSO'yu aktif etmek için `.env` dosyasına aşağıdaki satırı ekleyin: +Nokul'da SSO'yu etkinleştirmek için `.env` dosyasına aşağıdaki satırı ekleyin: ```text NOKUL_SSO_ENABLE=true From 8f5d22c2c34bfc70cebc98fe8888ed90a87506a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 10:03:32 +0300 Subject: [PATCH 019/216] Update doc/development/sso.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Recai Oktaş --- doc/development/sso.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/development/sso.md b/doc/development/sso.md index 2ee716f16..7eaf2b0ee 100644 --- a/doc/development/sso.md +++ b/doc/development/sso.md @@ -33,7 +33,7 @@ user.save(validate: false) LDAP::Entity.create(user) ``` -`vagrant ssh dev` diyerek dev sanal makinesine girip uygulamayı durdurun. Uygulamayı ssl kullanarak başlatmak için şunu +`vagrant ssh dev` diyerek dev sanal makinesine girip uygulamayı durdurun. Uygulamayı SSL kullanarak başlatmak için: başlatın: ```bash From 5be293ca7fe316be13fb57cbae258c3a808fc639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 10:04:59 +0300 Subject: [PATCH 020/216] Update doc/development/sso.md --- doc/development/sso.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/development/sso.md b/doc/development/sso.md index 7eaf2b0ee..519e3bbf4 100644 --- a/doc/development/sso.md +++ b/doc/development/sso.md @@ -34,7 +34,6 @@ LDAP::Entity.create(user) ``` `vagrant ssh dev` diyerek dev sanal makinesine girip uygulamayı durdurun. Uygulamayı SSL kullanarak başlatmak için: -başlatın: ```bash sudo app stop From f7b1cef92613baf5ceaf026e20ba099bba0ba1d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Fri, 6 Dec 2019 10:59:48 +0300 Subject: [PATCH 021/216] Add get logout route for llng --- config/routes/account.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes/account.rb b/config/routes/account.rb index 571c036d6..0948b9e8b 100644 --- a/config/routes/account.rb +++ b/config/routes/account.rb @@ -12,6 +12,7 @@ get 'login', to: 'sessions#new' get 'recover', to: 'passwords#new' delete 'logout', to: 'sessions#destroy' + get 'logout', to: 'sessions#destroy' end end From f7472edbbb223c7c1bb852e00591fcc00ced6d45 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2019 00:22:35 +0000 Subject: [PATCH 022/216] chore(deps): bump chalk from 2.4.2 to 3.0.0 Bumps [chalk](https://github.com/chalk/chalk) from 2.4.2 to 3.0.0. - [Release notes](https://github.com/chalk/chalk/releases) - [Commits](https://github.com/chalk/chalk/compare/v2.4.2...v3.0.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1fdddf7cb..ebfc37d93 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@rails/activestorage": "^6.0.0-alpha", "@rails/ujs": "^6.0.1", "@rails/webpacker": "https://github.com/rails/webpacker", - "chalk": "^2.4.2", + "chalk": "^3.0.0", "flatpickr": "^4.6.3", "intl-tel-input": "^16.0.7", "jquery.maskedinput": "^1.4.1", diff --git a/yarn.lock b/yarn.lock index 86eb94d2a..08d745919 100644 --- a/yarn.lock +++ b/yarn.lock @@ -793,6 +793,11 @@ webpack-cli "^3.3.2" webpack-sources "^1.3.0" +"@types/color-name@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== + "@types/events@*": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" @@ -1085,6 +1090,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172" + integrity sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -1684,6 +1697,14 @@ chalk@^1.1.1: strip-ansi "^3.0.0" supports-color "^2.0.0" +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -1851,12 +1872,19 @@ color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3: dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -color-name@^1.0.0: +color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== @@ -3560,6 +3588,11 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + has-symbols@^1.0.0, has-symbols@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" @@ -7553,6 +7586,13 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" +supports-color@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + dependencies: + has-flag "^4.0.0" + svgo@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.0.tgz#bae51ba95ded9a33a36b7c46ce9c359ae9154313" From f0ae6ca351c7d1f86a6deede186fed8b362787d6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2019 00:23:46 +0000 Subject: [PATCH 023/216] chore(deps): bump regexp-tree from 0.1.14 to 0.1.17 Bumps [regexp-tree](https://github.com/DmitrySoshnikov/regexp-tree) from 0.1.14 to 0.1.17. - [Release notes](https://github.com/DmitrySoshnikov/regexp-tree/releases) - [Commits](https://github.com/DmitrySoshnikov/regexp-tree/compare/v0.1.14...v0.1.17) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 86eb94d2a..07c8394f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6674,9 +6674,9 @@ regex-not@^1.0.0, regex-not@^1.0.2: safe-regex "^1.1.0" regexp-tree@^0.1.13: - version "0.1.14" - resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.14.tgz#1abca3675f6cc4b0dee5c959c6c4554ed172dfae" - integrity sha512-59v5A90TAh4cAMyDQEOzcnsu4q7Wb10RsyTjngEnJIZsWYM4siVGu+JmLT1WsxHvOWhiu4YS20XiTuxWMeVoHQ== + version "0.1.17" + resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.17.tgz#66d914a6ca21f95dd7660ed70a7dad47aeb2246a" + integrity sha512-UnOJjFS/EPZmfISmYx+0PcDtPzyFKTe+cZTS5sM5hifnRUDRxoB1j4DAmGwqzxjwBGlwOkGfb2cDGHtjuEwqoA== regexp.prototype.flags@^1.2.0: version "1.2.0" From 952f197959b9e5c93e944f12a043bf24f6f4b200 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2019 00:25:28 +0000 Subject: [PATCH 024/216] chore(deps): bump svgo from 1.3.0 to 1.3.2 Bumps [svgo](https://github.com/svg/svgo) from 1.3.0 to 1.3.2. - [Release notes](https://github.com/svg/svgo/releases) - [Changelog](https://github.com/svg/svgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/svg/svgo/compare/v1.3.0...v1.3.2) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 67 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/yarn.lock b/yarn.lock index 86eb94d2a..c009c3d1b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2198,21 +2198,13 @@ css-select@^2.0.0: domutils "^1.7.0" nth-check "^1.0.2" -css-tree@1.0.0-alpha.29: - version "1.0.0-alpha.29" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39" - integrity sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg== - dependencies: - mdn-data "~1.1.0" - source-map "^0.5.3" - -css-tree@1.0.0-alpha.33: - version "1.0.0-alpha.33" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.33.tgz#970e20e5a91f7a378ddd0fc58d0b6c8d4f3be93e" - integrity sha512-SPt57bh5nQnpsTBsx/IXbO14sRc9xXu5MtMAVuo0BaQQmyf0NupNPPSoMaqiAF5tDFafYsTkfeH4Q/HCKXkg4w== +css-tree@1.0.0-alpha.37: + version "1.0.0-alpha.37" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" + integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg== dependencies: mdn-data "2.0.4" - source-map "^0.5.3" + source-map "^0.6.1" css-unit-converter@^1.1.1: version "1.1.1" @@ -2315,12 +2307,12 @@ cssnano@^4.1.10: is-resolvable "^1.0.0" postcss "^7.0.0" -csso@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b" - integrity sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg== +csso@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz#e5f81ab3a56b8eefb7f0092ce7279329f454de3d" + integrity sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg== dependencies: - css-tree "1.0.0-alpha.29" + css-tree "1.0.0-alpha.37" currently-unhandled@^0.4.1: version "0.4.1" @@ -2704,7 +2696,23 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0: +es-abstract@^1.12.0, es-abstract@^1.5.1: + version "1.16.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz#52490d978f96ff9f89ec15b5cf244304a5bca161" + integrity sha512-WtY7Fx5LiOnSYgF5eg/1T+GONaGmpvpPdCpSnYij+U2gDTL0UPfWrhDw7b2IYb+9NQJsYpCA0wOQvZfsd6YwRw== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.1.4" + is-regex "^1.0.4" + object-inspect "^1.7.0" + object-keys "^1.1.1" + string.prototype.trimleft "^2.1.0" + string.prototype.trimright "^2.1.0" + +es-abstract@^1.7.0: version "1.16.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz#d3a26dc9c3283ac9750dca569586e976d9dcc06d" integrity sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg== @@ -2720,7 +2728,7 @@ es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0: string.prototype.trimleft "^2.1.0" string.prototype.trimright "^2.1.0" -es-to-primitive@^1.2.0: +es-to-primitive@^1.2.0, es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== @@ -4724,11 +4732,6 @@ mdn-data@2.0.4: resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== -mdn-data@~1.1.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01" - integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA== - mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -5254,7 +5257,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.6.0: +object-inspect@^1.6.0, object-inspect@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== @@ -7220,7 +7223,7 @@ source-map@^0.4.2: dependencies: amdefine ">=0.0.4" -source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6: +source-map@^0.5.0, source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= @@ -7554,16 +7557,16 @@ supports-color@^5.3.0: has-flag "^3.0.0" svgo@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.0.tgz#bae51ba95ded9a33a36b7c46ce9c359ae9154313" - integrity sha512-MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ== + version "1.3.2" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" + integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== dependencies: chalk "^2.4.1" coa "^2.0.2" css-select "^2.0.0" css-select-base-adapter "^0.1.1" - css-tree "1.0.0-alpha.33" - csso "^3.5.1" + css-tree "1.0.0-alpha.37" + csso "^4.0.2" js-yaml "^3.13.1" mkdirp "~0.5.1" object.values "^1.1.0" From 56a2d7e42ec73b1bc5ed2bfe28772a10c7ee3c78 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2019 00:26:06 +0000 Subject: [PATCH 025/216] chore(deps): bump bluebird from 3.7.1 to 3.7.2 Bumps [bluebird](https://github.com/petkaantonov/bluebird) from 3.7.1 to 3.7.2. - [Release notes](https://github.com/petkaantonov/bluebird/releases) - [Commits](https://github.com/petkaantonov/bluebird/compare/v3.7.1...v3.7.2) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 86eb94d2a..74ea2e9a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1348,9 +1348,9 @@ block-stream@*: inherits "~2.0.0" bluebird@^3.5.5: - version "3.7.1" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de" - integrity sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg== + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" From d5891e55446d78b29692ee407d9a47c599f2504f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2019 00:27:04 +0000 Subject: [PATCH 026/216] chore(deps): bump buffer from 4.9.1 to 4.9.2 Bumps [buffer](https://github.com/feross/buffer) from 4.9.1 to 4.9.2. - [Release notes](https://github.com/feross/buffer/releases) - [Commits](https://github.com/feross/buffer/compare/v4.9.1...v4.9.2) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 86eb94d2a..fb7a86b79 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1508,9 +1508,9 @@ buffer-xor@^1.0.3: integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= buffer@^4.3.0: - version "4.9.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" - integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg= + version "4.9.2" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" + integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== dependencies: base64-js "^1.0.2" ieee754 "^1.1.4" From f12e16adb721c3f2f48700afcb4c5d11eaa7b6ae Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2019 00:36:22 +0000 Subject: [PATCH 027/216] chore(deps): bump valid_email2 from 3.1.2 to 3.1.3 Bumps [valid_email2](https://github.com/micke/valid_email2) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/micke/valid_email2/releases) - [Changelog](https://github.com/micke/valid_email2/blob/master/CHANGELOG.md) - [Commits](https://github.com/micke/valid_email2/compare/v3.1.2...v3.1.3) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index eec18294b..31066f8f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -414,7 +414,7 @@ GEM execjs (>= 0.3.0, < 3) unicode-display_width (1.6.0) uniform_notifier (1.13.0) - valid_email2 (3.1.2) + valid_email2 (3.1.3) activemodel (>= 3.2) mail (~> 2.5) validate_email (0.1.6) From d641724bd28ec592946444fe639ed6902652837c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2019 00:37:03 +0000 Subject: [PATCH 028/216] chore(deps): bump twilio-ruby from 5.29.1 to 5.30.0 Bumps [twilio-ruby](https://github.com/twilio/twilio-ruby) from 5.29.1 to 5.30.0. - [Release notes](https://github.com/twilio/twilio-ruby/releases) - [Changelog](https://github.com/twilio/twilio-ruby/blob/master/CHANGES.md) - [Commits](https://github.com/twilio/twilio-ruby/compare/5.29.1...5.30.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index eec18294b..ff1b8a36f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -238,7 +238,7 @@ GEM jwt (~> 2) zeitwerk (~> 2) nio4r (2.5.2) - nokogiri (1.10.5) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) @@ -404,7 +404,7 @@ GEM thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) - twilio-ruby (5.29.1) + twilio-ruby (5.30.0) faraday (~> 0.9) jwt (>= 1.5, <= 2.5) nokogiri (>= 1.6, < 2.0) From 068c07bfd4cc8c993f150bf36523535ed0566faf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2019 00:37:35 +0000 Subject: [PATCH 029/216] chore(deps): bump aws-sdk-s3 from 1.57.0 to 1.59.0 Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.57.0 to 1.59.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.57.0...v1.59.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index eec18294b..d526a35b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,8 +92,8 @@ GEM authy (2.7.5) httpclient (>= 2.5.3.3) aws-eventstream (1.0.3) - aws-partitions (1.246.0) - aws-sdk-core (3.82.0) + aws-partitions (1.251.0) + aws-sdk-core (3.84.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -101,8 +101,8 @@ GEM aws-sdk-kms (1.26.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.57.0) - aws-sdk-core (~> 3, >= 3.77.0) + aws-sdk-s3 (1.59.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.0) From d537649e168ec3711cae07efbeb804d6d3a4c5fd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2019 00:38:05 +0000 Subject: [PATCH 030/216] chore(deps): bump nokogiri from 1.10.5 to 1.10.7 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.5 to 1.10.7. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.5...v1.10.7) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index eec18294b..6fd03ac59 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -238,7 +238,7 @@ GEM jwt (~> 2) zeitwerk (~> 2) nio4r (2.5.2) - nokogiri (1.10.5) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) From 0bdb0013a972c3beb20e0999ebf039aae9f2213a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2019 00:38:41 +0000 Subject: [PATCH 031/216] chore(deps): bump aws-partitions from 1.246.0 to 1.251.0 Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.246.0 to 1.251.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index eec18294b..7ab606b8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,7 +92,7 @@ GEM authy (2.7.5) httpclient (>= 2.5.3.3) aws-eventstream (1.0.3) - aws-partitions (1.246.0) + aws-partitions (1.251.0) aws-sdk-core (3.82.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) From 64376ba67bcc78b8a9e218aa770b1d029b6b296f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2019 00:39:25 +0000 Subject: [PATCH 032/216] chore(deps): bump aws-sdk-core from 3.82.0 to 3.84.0 Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.82.0 to 3.84.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index eec18294b..f3b8395da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,8 +92,8 @@ GEM authy (2.7.5) httpclient (>= 2.5.3.3) aws-eventstream (1.0.3) - aws-partitions (1.246.0) - aws-sdk-core (3.82.0) + aws-partitions (1.251.0) + aws-sdk-core (3.84.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) From 649ff4b8d915b733044a8f37eb05c058f7aa1b54 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2019 00:39:53 +0000 Subject: [PATCH 033/216] chore(deps-dev): bump listen from 3.2.0 to 3.2.1 Bumps [listen](https://github.com/guard/listen) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/guard/listen/releases) - [Commits](https://github.com/guard/listen/compare/v3.2.0...v3.2.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index eec18294b..7a0120073 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -204,7 +204,7 @@ GEM addressable (~> 2.3) letter_opener (1.7.0) launchy (~> 2.2) - listen (3.2.0) + listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) lograge (0.11.2) From 12670ee35c10cb105019c0ec11c74c3830f7b148 Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Mon, 9 Dec 2019 11:01:16 +0300 Subject: [PATCH 034/216] WIP: Fix registered student's prospective record validation --- app/models/prospective_student.rb | 1 + .../prospective_student_validator.rb | 25 +++++++++++++++++++ .../prospective_students/_form.html.erb | 1 + config/locales/validators/en.yml | 2 ++ config/locales/validators/tr.yml | 2 ++ 5 files changed, 31 insertions(+) create mode 100644 app/validators/prospective_student_validator.rb diff --git a/app/models/prospective_student.rb b/app/models/prospective_student.rb index 9b75daaef..f9f7e6c27 100644 --- a/app/models/prospective_student.rb +++ b/app/models/prospective_student.rb @@ -68,6 +68,7 @@ class ProspectiveStudent < ApplicationRecord validates :state_of_education, allow_nil: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :system_register_type, inclusion: { in: system_register_types.keys } validates :top_student, inclusion: { in: [true, false] } + validates_with ProspectiveStudentValidator, on: :update # scopes scope :registered, -> { where(registered: true) } diff --git a/app/validators/prospective_student_validator.rb b/app/validators/prospective_student_validator.rb new file mode 100644 index 000000000..6eb6eed7d --- /dev/null +++ b/app/validators/prospective_student_validator.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +class ProspectiveStudentValidator < ActiveModel::Validator + def validate(record) + return unless record.user + return unless registered?(record) + return unless record.unit_id_changed? || record.academic_term_id_changed? + + record.errors[:base] << message('unchangeable_variables') + end + + private + + def registered?(record) + record.user.students.find_by(unit_id: unit(record))&.permanently_registered? + end + + def unit(record) + record.unit_id_changed? ? Unit.find(record.changes[:unit_id]&.first) : record.unit + end + + def message(key) + I18n.t(key, scope: %i[validators prospective_student]) + end +end diff --git a/app/views/first_registration/prospective_students/_form.html.erb b/app/views/first_registration/prospective_students/_form.html.erb index f24b37097..163bb935c 100644 --- a/app/views/first_registration/prospective_students/_form.html.erb +++ b/app/views/first_registration/prospective_students/_form.html.erb @@ -11,6 +11,7 @@
<%= f.error_notification %> + <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
diff --git a/config/locales/validators/en.yml b/config/locales/validators/en.yml index fcd15bf8e..b498b3870 100644 --- a/config/locales/validators/en.yml +++ b/config/locales/validators/en.yml @@ -30,6 +30,8 @@ en: image: not_permitted: '%{mime_type} is not an allowed file type. You can upload files in %{extension_whitelist} formats.' size_not_satisfied: File size is not between the permitted range. You can upload files from minimum %{minimum} KBs to maximum %{maximum} MBs. + prospective_student: + unchangeable_variables: The program and academic term of a registered student cannot be changed. position: invalid_end_date: Start date is selected as a date after the end date multiple_active_repetitive: This employee already has this position in this unit diff --git a/config/locales/validators/tr.yml b/config/locales/validators/tr.yml index 03aa66bdf..49d5a2cdf 100644 --- a/config/locales/validators/tr.yml +++ b/config/locales/validators/tr.yml @@ -30,6 +30,8 @@ tr: image: not_permitted: '%{mime_type} izin verilen bir dosya türü değil. %{extension_whitelist} türlerinde bir dosya yükleyebilirsiniz' size_not_satisfied: Dosya boyutu izin verilen aralıkta değil. Yükleyeceğiniz dosya en az %{minimum} KB, en çok %{maximum} MB boyutunda olabilir. + prospective_student: + unchangeable_variables: Kayıtlı bir öğrencinin yerleştiği program ve akademik dönemi değiştirilemez. position: invalid_end_date: Görev başlangıç tarihi bitiş tarihinden sonraki bir tarih olarak seçilmiş. multiple_active_repetitive: Bu personelin seçilen birimde aktif olarak aynı görevi var! From aa1cf6dd62ac18a11f464bceded40b60c8d4d800 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 10 Dec 2019 00:38:48 +0000 Subject: [PATCH 035/216] fix: package.json & yarn.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-SERIALIZEJAVASCRIPT-536840 --- package.json | 2 +- yarn.lock | 1484 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 893 insertions(+), 593 deletions(-) diff --git a/package.json b/package.json index ebfc37d93..13af2eb49 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "@rails/actiontext": "^6.0.1", "@rails/activestorage": "^6.0.0-alpha", "@rails/ujs": "^6.0.1", - "@rails/webpacker": "https://github.com/rails/webpacker", + "@rails/webpacker": "4.1.0", "chalk": "^3.0.0", "flatpickr": "^4.6.3", "intl-tel-input": "^16.0.7", diff --git a/yarn.lock b/yarn.lock index 192ee9bd8..5ce36401f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,19 +9,19 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@^7.4.5": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.0.tgz#9b00f73554edd67bebc86df8303ef678be3d7b48" - integrity sha512-FuRhDRtsd6IptKpHXAa+4WPZYY2ZzgowkbLBecEDDSje1X/apG7jQM33or3NdOmjXBKWGOg4JmSiRfUfuTtHXw== +"@babel/core@^7.7.2": + version "7.7.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.5.tgz#ae1323cd035b5160293307f50647e83f8ba62f7e" + integrity sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw== dependencies: "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.6.0" - "@babel/helpers" "^7.6.0" - "@babel/parser" "^7.6.0" - "@babel/template" "^7.6.0" - "@babel/traverse" "^7.6.0" - "@babel/types" "^7.6.0" - convert-source-map "^1.1.0" + "@babel/generator" "^7.7.4" + "@babel/helpers" "^7.7.4" + "@babel/parser" "^7.7.5" + "@babel/template" "^7.7.4" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" + convert-source-map "^1.7.0" debug "^4.1.0" json5 "^2.1.0" lodash "^4.17.13" @@ -29,125 +29,132 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.0.tgz#e2c21efbfd3293ad819a2359b448f002bfdfda56" - integrity sha512-Ms8Mo7YBdMMn1BYuNtKuP/z0TgEIhbcyB8HVR6PPNYp4P61lMsABiS4A3VG1qznjXVCf3r+fVHhm4efTYVsySA== +"@babel/generator@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369" + integrity sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg== dependencies: - "@babel/types" "^7.6.0" + "@babel/types" "^7.7.4" jsesc "^2.5.1" lodash "^4.17.13" source-map "^0.5.0" - trim-right "^1.0.1" -"@babel/helper-annotate-as-pure@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32" - integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q== +"@babel/helper-annotate-as-pure@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce" + integrity sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.7.4" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f" - integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz#5f73f2b28580e224b5b9bd03146a4015d6217f5f" + integrity sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ== dependencies: - "@babel/helper-explode-assignable-expression" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/helper-explode-assignable-expression" "^7.7.4" + "@babel/types" "^7.7.4" -"@babel/helper-call-delegate@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43" - integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ== +"@babel/helper-call-delegate@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz#621b83e596722b50c0066f9dc37d3232e461b801" + integrity sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA== dependencies: - "@babel/helper-hoist-variables" "^7.4.4" - "@babel/traverse" "^7.4.4" - "@babel/types" "^7.4.4" + "@babel/helper-hoist-variables" "^7.7.4" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" -"@babel/helper-create-class-features-plugin@^7.5.5": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz#769711acca889be371e9bc2eb68641d55218021f" - integrity sha512-O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng== +"@babel/helper-create-class-features-plugin@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz#fce60939fd50618610942320a8d951b3b639da2d" + integrity sha512-l+OnKACG4uiDHQ/aJT8dwpR+LhCJALxL0mJ6nzjB25e5IPwqV1VOsY7ah6UB1DG+VOXAIMtuC54rFJGiHkxjgA== dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-member-expression-to-functions" "^7.5.5" - "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/helper-function-name" "^7.7.4" + "@babel/helper-member-expression-to-functions" "^7.7.4" + "@babel/helper-optimise-call-expression" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.5.5" - "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/helper-replace-supers" "^7.7.4" + "@babel/helper-split-export-declaration" "^7.7.4" -"@babel/helper-define-map@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369" - integrity sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg== +"@babel/helper-create-regexp-features-plugin@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz#6d5762359fd34f4da1500e4cff9955b5299aaf59" + integrity sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A== + dependencies: + "@babel/helper-regex" "^7.4.4" + regexpu-core "^4.6.0" + +"@babel/helper-define-map@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz#2841bf92eb8bd9c906851546fe6b9d45e162f176" + integrity sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg== dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/types" "^7.5.5" + "@babel/helper-function-name" "^7.7.4" + "@babel/types" "^7.7.4" lodash "^4.17.13" -"@babel/helper-explode-assignable-expression@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6" - integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA== +"@babel/helper-explode-assignable-expression@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz#fa700878e008d85dc51ba43e9fb835cddfe05c84" + integrity sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg== dependencies: - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" -"@babel/helper-function-name@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53" - integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw== +"@babel/helper-function-name@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e" + integrity sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ== dependencies: - "@babel/helper-get-function-arity" "^7.0.0" - "@babel/template" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/helper-get-function-arity" "^7.7.4" + "@babel/template" "^7.7.4" + "@babel/types" "^7.7.4" -"@babel/helper-get-function-arity@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" - integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ== +"@babel/helper-get-function-arity@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0" + integrity sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.7.4" -"@babel/helper-hoist-variables@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a" - integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w== +"@babel/helper-hoist-variables@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz#612384e3d823fdfaaf9fce31550fe5d4db0f3d12" + integrity sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ== dependencies: - "@babel/types" "^7.4.4" + "@babel/types" "^7.7.4" -"@babel/helper-member-expression-to-functions@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590" - integrity sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA== +"@babel/helper-member-expression-to-functions@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz#356438e2569df7321a8326644d4b790d2122cb74" + integrity sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw== dependencies: - "@babel/types" "^7.5.5" + "@babel/types" "^7.7.4" -"@babel/helper-module-imports@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d" - integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A== +"@babel/helper-module-imports@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91" + integrity sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.7.4" -"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz#f84ff8a09038dcbca1fd4355661a500937165b4a" - integrity sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@babel/helper-simple-access" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.4.4" - "@babel/template" "^7.4.4" - "@babel/types" "^7.5.5" +"@babel/helper-module-transforms@^7.7.4", "@babel/helper-module-transforms@^7.7.5": + version "7.7.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz#d044da7ffd91ec967db25cd6748f704b6b244835" + integrity sha512-A7pSxyJf1gN5qXVcidwLWydjftUN878VkalhXX5iQDuGyiGK3sOrrKKHF4/A4fwHtnsotv/NipwAeLzY4KQPvw== + dependencies: + "@babel/helper-module-imports" "^7.7.4" + "@babel/helper-simple-access" "^7.7.4" + "@babel/helper-split-export-declaration" "^7.7.4" + "@babel/template" "^7.7.4" + "@babel/types" "^7.7.4" lodash "^4.17.13" -"@babel/helper-optimise-call-expression@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5" - integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g== +"@babel/helper-optimise-call-expression@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2" + integrity sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.7.4" "@babel/helper-plugin-utils@^7.0.0": version "7.0.0" @@ -161,60 +168,60 @@ dependencies: lodash "^4.17.13" -"@babel/helper-remap-async-to-generator@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f" - integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.0.0" - "@babel/helper-wrap-function" "^7.1.0" - "@babel/template" "^7.1.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.0.0" - -"@babel/helper-replace-supers@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2" - integrity sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.5.5" - "@babel/helper-optimise-call-expression" "^7.0.0" - "@babel/traverse" "^7.5.5" - "@babel/types" "^7.5.5" - -"@babel/helper-simple-access@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c" - integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w== - dependencies: - "@babel/template" "^7.1.0" - "@babel/types" "^7.0.0" - -"@babel/helper-split-export-declaration@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677" - integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q== - dependencies: - "@babel/types" "^7.4.4" - -"@babel/helper-wrap-function@^7.1.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa" - integrity sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ== - dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/template" "^7.1.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.2.0" - -"@babel/helpers@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.0.tgz#21961d16c6a3c3ab597325c34c465c0887d31c6e" - integrity sha512-W9kao7OBleOjfXtFGgArGRX6eCP0UEcA2ZWEWNkJdRZnHhW4eEbeswbG3EwaRsnQUAEGWYgMq1HsIXuNNNy2eQ== - dependencies: - "@babel/template" "^7.6.0" - "@babel/traverse" "^7.6.0" - "@babel/types" "^7.6.0" +"@babel/helper-remap-async-to-generator@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz#c68c2407350d9af0e061ed6726afb4fff16d0234" + integrity sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.7.4" + "@babel/helper-wrap-function" "^7.7.4" + "@babel/template" "^7.7.4" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" + +"@babel/helper-replace-supers@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz#3c881a6a6a7571275a72d82e6107126ec9e2cdd2" + integrity sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.7.4" + "@babel/helper-optimise-call-expression" "^7.7.4" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" + +"@babel/helper-simple-access@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz#a169a0adb1b5f418cfc19f22586b2ebf58a9a294" + integrity sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A== + dependencies: + "@babel/template" "^7.7.4" + "@babel/types" "^7.7.4" + +"@babel/helper-split-export-declaration@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8" + integrity sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug== + dependencies: + "@babel/types" "^7.7.4" + +"@babel/helper-wrap-function@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace" + integrity sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg== + dependencies: + "@babel/helper-function-name" "^7.7.4" + "@babel/template" "^7.7.4" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" + +"@babel/helpers@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.4.tgz#62c215b9e6c712dadc15a9a0dcab76c92a940302" + integrity sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg== + dependencies: + "@babel/template" "^7.7.4" + "@babel/traverse" "^7.7.4" + "@babel/types" "^7.7.4" "@babel/highlight@^7.0.0": version "7.5.0" @@ -225,73 +232,72 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.0.tgz#3e05d0647432a8326cb28d0de03895ae5a57f39b" - integrity sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ== +"@babel/parser@^7.7.4", "@babel/parser@^7.7.5": + version "7.7.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71" + integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig== -"@babel/plugin-proposal-async-generator-functions@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e" - integrity sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ== +"@babel/plugin-proposal-async-generator-functions@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz#0351c5ac0a9e927845fffd5b82af476947b7ce6d" + integrity sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-remap-async-to-generator" "^7.1.0" - "@babel/plugin-syntax-async-generators" "^7.2.0" + "@babel/helper-remap-async-to-generator" "^7.7.4" + "@babel/plugin-syntax-async-generators" "^7.7.4" -"@babel/plugin-proposal-class-properties@^7.4.4": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4" - integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A== +"@babel/plugin-proposal-class-properties@^7.7.0": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz#2f964f0cb18b948450362742e33e15211e77c2ba" + integrity sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.5.5" + "@babel/helper-create-class-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-proposal-dynamic-import@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz#e532202db4838723691b10a67b8ce509e397c506" - integrity sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw== +"@babel/plugin-proposal-dynamic-import@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d" + integrity sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-dynamic-import" "^7.2.0" + "@babel/plugin-syntax-dynamic-import" "^7.7.4" -"@babel/plugin-proposal-json-strings@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317" - integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg== +"@babel/plugin-proposal-json-strings@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz#7700a6bfda771d8dc81973249eac416c6b4c697d" + integrity sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-json-strings" "^7.2.0" + "@babel/plugin-syntax-json-strings" "^7.7.4" -"@babel/plugin-proposal-object-rest-spread@^7.4.4", "@babel/plugin-proposal-object-rest-spread@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz#61939744f71ba76a3ae46b5eea18a54c16d22e58" - integrity sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw== +"@babel/plugin-proposal-object-rest-spread@^7.6.2", "@babel/plugin-proposal-object-rest-spread@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71" + integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-object-rest-spread" "^7.2.0" + "@babel/plugin-syntax-object-rest-spread" "^7.7.4" -"@babel/plugin-proposal-optional-catch-binding@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5" - integrity sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g== +"@babel/plugin-proposal-optional-catch-binding@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz#ec21e8aeb09ec6711bc0a39ca49520abee1de379" + integrity sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.7.4" -"@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78" - integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA== +"@babel/plugin-proposal-unicode-property-regex@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb" + integrity sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA== dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.5.4" -"@babel/plugin-syntax-async-generators@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f" - integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg== +"@babel/plugin-syntax-async-generators@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz#331aaf310a10c80c44a66b238b6e49132bd3c889" + integrity sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g== dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -302,374 +308,394 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-json-strings@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470" - integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg== +"@babel/plugin-syntax-dynamic-import@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec" + integrity sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-object-rest-spread@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e" - integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA== +"@babel/plugin-syntax-json-strings@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz#86e63f7d2e22f9e27129ac4e83ea989a382e86cc" + integrity sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-optional-catch-binding@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c" - integrity sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w== +"@babel/plugin-syntax-object-rest-spread@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz#47cf220d19d6d0d7b154304701f468fc1cc6ff46" + integrity sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-arrow-functions@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550" - integrity sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg== +"@babel/plugin-syntax-optional-catch-binding@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz#a3e38f59f4b6233867b4a92dcb0ee05b2c334aa6" + integrity sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-async-to-generator@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e" - integrity sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg== +"@babel/plugin-syntax-top-level-await@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz#bd7d8fa7b9fee793a36e4027fd6dd1aa32f946da" + integrity sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg== dependencies: - "@babel/helper-module-imports" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-remap-async-to-generator" "^7.1.0" -"@babel/plugin-transform-block-scoped-functions@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190" - integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w== +"@babel/plugin-transform-arrow-functions@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12" + integrity sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-block-scoping@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.0.tgz#c49e21228c4bbd4068a35667e6d951c75439b1dc" - integrity sha512-tIt4E23+kw6TgL/edACZwP1OUKrjOTyMrFMLoT5IOFrfMRabCgekjqFd5o6PaAMildBu46oFkekIdMuGkkPEpA== +"@babel/plugin-transform-async-to-generator@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz#694cbeae6d613a34ef0292713fa42fb45c4470ba" + integrity sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg== + dependencies: + "@babel/helper-module-imports" "^7.7.4" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-remap-async-to-generator" "^7.7.4" + +"@babel/plugin-transform-block-scoped-functions@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz#d0d9d5c269c78eaea76227ace214b8d01e4d837b" + integrity sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-block-scoping@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz#200aad0dcd6bb80372f94d9e628ea062c58bf224" + integrity sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" lodash "^4.17.13" -"@babel/plugin-transform-classes@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9" - integrity sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg== +"@babel/plugin-transform-classes@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz#c92c14be0a1399e15df72667067a8f510c9400ec" + integrity sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg== dependencies: - "@babel/helper-annotate-as-pure" "^7.0.0" - "@babel/helper-define-map" "^7.5.5" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/helper-annotate-as-pure" "^7.7.4" + "@babel/helper-define-map" "^7.7.4" + "@babel/helper-function-name" "^7.7.4" + "@babel/helper-optimise-call-expression" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.5.5" - "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/helper-replace-supers" "^7.7.4" + "@babel/helper-split-export-declaration" "^7.7.4" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da" - integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA== +"@babel/plugin-transform-computed-properties@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz#e856c1628d3238ffe12d668eb42559f79a81910d" + integrity sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-destructuring@^7.4.4", "@babel/plugin-transform-destructuring@^7.6.0": +"@babel/plugin-transform-destructuring@^7.6.0": version "7.6.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz#44bbe08b57f4480094d57d9ffbcd96d309075ba6" integrity sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3" - integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg== +"@babel/plugin-transform-destructuring@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz#2b713729e5054a1135097b6a67da1b6fe8789267" + integrity sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.5.4" -"@babel/plugin-transform-duplicate-keys@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853" - integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ== +"@babel/plugin-transform-dotall-regex@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96" + integrity sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw== dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-exponentiation-operator@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008" - integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A== +"@babel/plugin-transform-duplicate-keys@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz#3d21731a42e3f598a73835299dd0169c3b90ac91" + integrity sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-for-of@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556" - integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ== +"@babel/plugin-transform-exponentiation-operator@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz#dd30c0191e3a1ba19bcc7e389bdfddc0729d5db9" + integrity sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ== dependencies: + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-function-name@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad" - integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA== +"@babel/plugin-transform-for-of@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz#248800e3a5e507b1f103d8b4ca998e77c63932bc" + integrity sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA== dependencies: - "@babel/helper-function-name" "^7.1.0" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-literals@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1" - integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg== +"@babel/plugin-transform-function-name@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz#75a6d3303d50db638ff8b5385d12451c865025b1" + integrity sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g== dependencies: + "@babel/helper-function-name" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-member-expression-literals@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d" - integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA== +"@babel/plugin-transform-literals@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz#27fe87d2b5017a2a5a34d1c41a6b9f6a6262643e" + integrity sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-modules-amd@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91" - integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg== +"@babel/plugin-transform-member-expression-literals@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz#aee127f2f3339fc34ce5e3055d7ffbf7aa26f19a" + integrity sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA== dependencies: - "@babel/helper-module-transforms" "^7.1.0" + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-modules-amd@^7.7.5": + version "7.7.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz#39e0fb717224b59475b306402bb8eedab01e729c" + integrity sha512-CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ== + dependencies: + "@babel/helper-module-transforms" "^7.7.5" "@babel/helper-plugin-utils" "^7.0.0" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-commonjs@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz#39dfe957de4420445f1fcf88b68a2e4aa4515486" - integrity sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g== +"@babel/plugin-transform-modules-commonjs@^7.7.5": + version "7.7.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.5.tgz#1d27f5eb0bcf7543e774950e5b2fa782e637b345" + integrity sha512-9Cq4zTFExwFhQI6MT1aFxgqhIsMWQWDVwOgLzl7PTWJHsNaqFvklAU+Oz6AQLAS0dJKTwZSOCo20INwktxpi3Q== dependencies: - "@babel/helper-module-transforms" "^7.4.4" + "@babel/helper-module-transforms" "^7.7.5" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-simple-access" "^7.1.0" + "@babel/helper-simple-access" "^7.7.4" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-systemjs@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249" - integrity sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg== +"@babel/plugin-transform-modules-systemjs@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz#cd98152339d3e763dfe838b7d4273edaf520bb30" + integrity sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw== dependencies: - "@babel/helper-hoist-variables" "^7.4.4" + "@babel/helper-hoist-variables" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-umd@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae" - integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw== +"@babel/plugin-transform-modules-umd@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz#1027c355a118de0aae9fee00ad7813c584d9061f" + integrity sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw== dependencies: - "@babel/helper-module-transforms" "^7.1.0" + "@babel/helper-module-transforms" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-named-capturing-groups-regex@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.0.tgz#1e6e663097813bb4f53d42df0750cf28ad3bb3f1" - integrity sha512-jem7uytlmrRl3iCAuQyw8BpB4c4LWvSpvIeXKpMb+7j84lkx4m4mYr5ErAcmN5KM7B6BqrAvRGjBIbbzqCczew== +"@babel/plugin-transform-named-capturing-groups-regex@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz#fb3bcc4ee4198e7385805007373d6b6f42c98220" + integrity sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw== dependencies: - regexp-tree "^0.1.13" + "@babel/helper-create-regexp-features-plugin" "^7.7.4" -"@babel/plugin-transform-new-target@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5" - integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA== +"@babel/plugin-transform-new-target@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz#4a0753d2d60639437be07b592a9e58ee00720167" + integrity sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-object-super@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9" - integrity sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ== +"@babel/plugin-transform-object-super@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz#48488937a2d586c0148451bf51af9d7dda567262" + integrity sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.5.5" + "@babel/helper-replace-supers" "^7.7.4" -"@babel/plugin-transform-parameters@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16" - integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw== +"@babel/plugin-transform-parameters@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce" + integrity sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw== dependencies: - "@babel/helper-call-delegate" "^7.4.4" - "@babel/helper-get-function-arity" "^7.0.0" + "@babel/helper-call-delegate" "^7.7.4" + "@babel/helper-get-function-arity" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-property-literals@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905" - integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ== +"@babel/plugin-transform-property-literals@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz#2388d6505ef89b266103f450f9167e6bd73f98c2" + integrity sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-regenerator@^7.4.5": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f" - integrity sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA== +"@babel/plugin-transform-regenerator@^7.7.0", "@babel/plugin-transform-regenerator@^7.7.5": + version "7.7.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.5.tgz#3a8757ee1a2780f390e89f246065ecf59c26fce9" + integrity sha512-/8I8tPvX2FkuEyWbjRCt4qTAgZK0DVy8QRguhA524UH48RfGJy94On2ri+dCuwOpcerPRl9O4ebQkRcVzIaGBw== dependencies: regenerator-transform "^0.14.0" -"@babel/plugin-transform-reserved-words@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634" - integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw== +"@babel/plugin-transform-reserved-words@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz#6a7cf123ad175bb5c69aec8f6f0770387ed3f1eb" + integrity sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-runtime@^7.4.4": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.0.tgz#85a3cce402b28586138e368fce20ab3019b9713e" - integrity sha512-Da8tMf7uClzwUm/pnJ1S93m/aRXmoYNDD7TkHua8xBDdaAs54uZpTWvEt6NGwmoVMb9mZbntfTqmG2oSzN/7Vg== +"@babel/plugin-transform-runtime@^7.6.2": + version "7.7.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.7.6.tgz#4f2b548c88922fb98ec1c242afd4733ee3e12f61" + integrity sha512-tajQY+YmXR7JjTwRvwL4HePqoL3DYxpYXIHKVvrOIvJmeHe2y1w4tz5qz9ObUDC9m76rCzIMPyn4eERuwA4a4A== dependencies: - "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-module-imports" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" resolve "^1.8.1" semver "^5.5.1" -"@babel/plugin-transform-shorthand-properties@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0" - integrity sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg== +"@babel/plugin-transform-shorthand-properties@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz#74a0a9b2f6d67a684c6fbfd5f0458eb7ba99891e" + integrity sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-spread@^7.2.0": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406" - integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w== +"@babel/plugin-transform-spread@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz#aa673b356fe6b7e70d69b6e33a17fef641008578" + integrity sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-sticky-regex@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1" - integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw== +"@babel/plugin-transform-sticky-regex@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz#ffb68c05090c30732076b1285dc1401b404a123c" + integrity sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-regex" "^7.0.0" -"@babel/plugin-transform-template-literals@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0" - integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g== +"@babel/plugin-transform-template-literals@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz#1eb6411736dd3fe87dbd20cc6668e5121c17d604" + integrity sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.0.0" + "@babel/helper-annotate-as-pure" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-typeof-symbol@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2" - integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw== +"@babel/plugin-transform-typeof-symbol@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz#3174626214f2d6de322882e498a38e8371b2140e" + integrity sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-unicode-regex@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f" - integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA== +"@babel/plugin-transform-unicode-regex@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae" + integrity sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw== dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.5.4" -"@babel/preset-env@^7.4.5": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.0.tgz#aae4141c506100bb2bfaa4ac2a5c12b395619e50" - integrity sha512-1efzxFv/TcPsNXlRhMzRnkBFMeIqBBgzwmZwlFDw5Ubj0AGLeufxugirwZmkkX/ayi3owsSqoQ4fw8LkfK9SYg== +"@babel/preset-env@^7.7.1": + version "7.7.6" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.6.tgz#39ac600427bbb94eec6b27953f1dfa1d64d457b2" + integrity sha512-k5hO17iF/Q7tR9Jv8PdNBZWYW6RofxhnxKjBMc0nG4JTaWvOTiPoO/RLFwAKcA4FpmuBFm6jkoqaRJLGi0zdaQ== dependencies: - "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-module-imports" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-proposal-async-generator-functions" "^7.2.0" - "@babel/plugin-proposal-dynamic-import" "^7.5.0" - "@babel/plugin-proposal-json-strings" "^7.2.0" - "@babel/plugin-proposal-object-rest-spread" "^7.5.5" - "@babel/plugin-proposal-optional-catch-binding" "^7.2.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" - "@babel/plugin-syntax-async-generators" "^7.2.0" - "@babel/plugin-syntax-dynamic-import" "^7.2.0" - "@babel/plugin-syntax-json-strings" "^7.2.0" - "@babel/plugin-syntax-object-rest-spread" "^7.2.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" - "@babel/plugin-transform-arrow-functions" "^7.2.0" - "@babel/plugin-transform-async-to-generator" "^7.5.0" - "@babel/plugin-transform-block-scoped-functions" "^7.2.0" - "@babel/plugin-transform-block-scoping" "^7.6.0" - "@babel/plugin-transform-classes" "^7.5.5" - "@babel/plugin-transform-computed-properties" "^7.2.0" - "@babel/plugin-transform-destructuring" "^7.6.0" - "@babel/plugin-transform-dotall-regex" "^7.4.4" - "@babel/plugin-transform-duplicate-keys" "^7.5.0" - "@babel/plugin-transform-exponentiation-operator" "^7.2.0" - "@babel/plugin-transform-for-of" "^7.4.4" - "@babel/plugin-transform-function-name" "^7.4.4" - "@babel/plugin-transform-literals" "^7.2.0" - "@babel/plugin-transform-member-expression-literals" "^7.2.0" - "@babel/plugin-transform-modules-amd" "^7.5.0" - "@babel/plugin-transform-modules-commonjs" "^7.6.0" - "@babel/plugin-transform-modules-systemjs" "^7.5.0" - "@babel/plugin-transform-modules-umd" "^7.2.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.0" - "@babel/plugin-transform-new-target" "^7.4.4" - "@babel/plugin-transform-object-super" "^7.5.5" - "@babel/plugin-transform-parameters" "^7.4.4" - "@babel/plugin-transform-property-literals" "^7.2.0" - "@babel/plugin-transform-regenerator" "^7.4.5" - "@babel/plugin-transform-reserved-words" "^7.2.0" - "@babel/plugin-transform-shorthand-properties" "^7.2.0" - "@babel/plugin-transform-spread" "^7.2.0" - "@babel/plugin-transform-sticky-regex" "^7.2.0" - "@babel/plugin-transform-template-literals" "^7.4.4" - "@babel/plugin-transform-typeof-symbol" "^7.2.0" - "@babel/plugin-transform-unicode-regex" "^7.4.4" - "@babel/types" "^7.6.0" + "@babel/plugin-proposal-async-generator-functions" "^7.7.4" + "@babel/plugin-proposal-dynamic-import" "^7.7.4" + "@babel/plugin-proposal-json-strings" "^7.7.4" + "@babel/plugin-proposal-object-rest-spread" "^7.7.4" + "@babel/plugin-proposal-optional-catch-binding" "^7.7.4" + "@babel/plugin-proposal-unicode-property-regex" "^7.7.4" + "@babel/plugin-syntax-async-generators" "^7.7.4" + "@babel/plugin-syntax-dynamic-import" "^7.7.4" + "@babel/plugin-syntax-json-strings" "^7.7.4" + "@babel/plugin-syntax-object-rest-spread" "^7.7.4" + "@babel/plugin-syntax-optional-catch-binding" "^7.7.4" + "@babel/plugin-syntax-top-level-await" "^7.7.4" + "@babel/plugin-transform-arrow-functions" "^7.7.4" + "@babel/plugin-transform-async-to-generator" "^7.7.4" + "@babel/plugin-transform-block-scoped-functions" "^7.7.4" + "@babel/plugin-transform-block-scoping" "^7.7.4" + "@babel/plugin-transform-classes" "^7.7.4" + "@babel/plugin-transform-computed-properties" "^7.7.4" + "@babel/plugin-transform-destructuring" "^7.7.4" + "@babel/plugin-transform-dotall-regex" "^7.7.4" + "@babel/plugin-transform-duplicate-keys" "^7.7.4" + "@babel/plugin-transform-exponentiation-operator" "^7.7.4" + "@babel/plugin-transform-for-of" "^7.7.4" + "@babel/plugin-transform-function-name" "^7.7.4" + "@babel/plugin-transform-literals" "^7.7.4" + "@babel/plugin-transform-member-expression-literals" "^7.7.4" + "@babel/plugin-transform-modules-amd" "^7.7.5" + "@babel/plugin-transform-modules-commonjs" "^7.7.5" + "@babel/plugin-transform-modules-systemjs" "^7.7.4" + "@babel/plugin-transform-modules-umd" "^7.7.4" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4" + "@babel/plugin-transform-new-target" "^7.7.4" + "@babel/plugin-transform-object-super" "^7.7.4" + "@babel/plugin-transform-parameters" "^7.7.4" + "@babel/plugin-transform-property-literals" "^7.7.4" + "@babel/plugin-transform-regenerator" "^7.7.5" + "@babel/plugin-transform-reserved-words" "^7.7.4" + "@babel/plugin-transform-shorthand-properties" "^7.7.4" + "@babel/plugin-transform-spread" "^7.7.4" + "@babel/plugin-transform-sticky-regex" "^7.7.4" + "@babel/plugin-transform-template-literals" "^7.7.4" + "@babel/plugin-transform-typeof-symbol" "^7.7.4" + "@babel/plugin-transform-unicode-regex" "^7.7.4" + "@babel/types" "^7.7.4" browserslist "^4.6.0" - core-js-compat "^3.1.1" + core-js-compat "^3.4.7" invariant "^2.2.2" js-levenshtein "^1.1.3" semver "^5.5.0" -"@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.0.tgz#4fc1d642a9fd0299754e8b5de62c631cf5568205" - integrity sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ== +"@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2": + version "7.7.6" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f" + integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw== dependencies: regenerator-runtime "^0.13.2" -"@babel/template@^7.1.0", "@babel/template@^7.4.4", "@babel/template@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6" - integrity sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ== +"@babel/template@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b" + integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw== dependencies: "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.6.0" - "@babel/types" "^7.6.0" + "@babel/parser" "^7.7.4" + "@babel/types" "^7.7.4" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.0.tgz#389391d510f79be7ce2ddd6717be66d3fed4b516" - integrity sha512-93t52SaOBgml/xY74lsmt7xOR4ufYvhb5c5qiM6lu4J/dWGMAfAh6eKw4PjLes6DI6nQgearoxnFJk60YchpvQ== +"@babel/traverse@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558" + integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw== dependencies: "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.6.0" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.4.4" - "@babel/parser" "^7.6.0" - "@babel/types" "^7.6.0" + "@babel/generator" "^7.7.4" + "@babel/helper-function-name" "^7.7.4" + "@babel/helper-split-export-declaration" "^7.7.4" + "@babel/parser" "^7.7.4" + "@babel/types" "^7.7.4" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0": - version "7.6.1" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz#53abf3308add3ac2a2884d539151c57c4b3ac648" - integrity sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g== +"@babel/types@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193" + integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA== dependencies: esutils "^2.0.2" lodash "^4.17.13" @@ -750,48 +776,49 @@ resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.1.tgz#5eb013bd7f18a1cc7c314602d3b4d68302e20b60" integrity sha512-IwUGMGke2u5W/hkJLOSU5xcQT3Y0gjIdiEsG27kHyLvsPOzdABKeAD8l37j6romhzeCmM56Wv52OGqSueUmyig== -"@rails/webpacker@https://github.com/rails/webpacker": - version "4.0.7" - resolved "https://github.com/rails/webpacker#d0fa1d1351bfc5bb53e76b94ce6f33cf2175a879" +"@rails/webpacker@4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-4.1.0.tgz#6c2f569cbcc42dae3d3a1c0dd4e92b92b686732f" + integrity sha512-4wtClcDXj/xhoR4yUTuUuZvVrI7MZviQwW+CKecD8GL+1BScqqAjjl97aEFlJJp+uSdEZscl9ugWLROc3weC9Q== dependencies: - "@babel/core" "^7.4.5" - "@babel/plugin-proposal-class-properties" "^7.4.4" - "@babel/plugin-proposal-object-rest-spread" "^7.4.4" + "@babel/core" "^7.7.2" + "@babel/plugin-proposal-class-properties" "^7.7.0" + "@babel/plugin-proposal-object-rest-spread" "^7.6.2" "@babel/plugin-syntax-dynamic-import" "^7.2.0" - "@babel/plugin-transform-destructuring" "^7.4.4" - "@babel/plugin-transform-regenerator" "^7.4.5" - "@babel/plugin-transform-runtime" "^7.4.4" - "@babel/preset-env" "^7.4.5" - "@babel/runtime" "^7.4.5" + "@babel/plugin-transform-destructuring" "^7.6.0" + "@babel/plugin-transform-regenerator" "^7.7.0" + "@babel/plugin-transform-runtime" "^7.6.2" + "@babel/preset-env" "^7.7.1" + "@babel/runtime" "^7.7.2" babel-loader "^8.0.6" - babel-plugin-dynamic-import-node "^2.2.0" - babel-plugin-macros "^2.5.0" + babel-plugin-dynamic-import-node "^2.3.0" + babel-plugin-macros "^2.6.1" case-sensitive-paths-webpack-plugin "^2.2.0" - compression-webpack-plugin "^2.0.0" - core-js "^3.1.3" - css-loader "^2.1.1" - file-loader "^3.0.1" - flatted "^2.0.0" - glob "^7.1.4" + compression-webpack-plugin "^3.0.0" + core-js "^3.4.0" + css-loader "^3.2.0" + file-loader "^4.2.0" + flatted "^2.0.1" + glob "^7.1.6" js-yaml "^3.13.1" - mini-css-extract-plugin "^0.7.0" - node-sass "^4.12.0" - optimize-css-assets-webpack-plugin "^5.0.1" + mini-css-extract-plugin "^0.8.0" + node-sass "^4.13.0" + optimize-css-assets-webpack-plugin "^5.0.3" path-complete-extname "^1.0.0" - pnp-webpack-plugin "^1.4.3" + pnp-webpack-plugin "^1.5.0" postcss-flexbugs-fixes "^4.1.0" postcss-import "^12.0.1" postcss-loader "^3.0.0" - postcss-preset-env "^6.6.0" + postcss-preset-env "^6.7.0" postcss-safe-parser "^4.0.1" - regenerator-runtime "^0.13.2" - sass-loader "^7.1.0" - style-loader "^0.23.1" - terser-webpack-plugin "^1.3.0" - webpack "^4.32.2" + regenerator-runtime "^0.13.3" + sass-loader "7.3.1" + style-loader "^1.0.0" + terser-webpack-plugin "^2.2.1" + webpack "^4.41.2" webpack-assets-manifest "^3.1.1" - webpack-cli "^3.3.2" - webpack-sources "^1.3.0" + webpack-cli "^3.3.10" + webpack-sources "^1.4.3" "@types/color-name@^1.1.1": version "1.1.1" @@ -822,6 +849,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.4.tgz#64db61e0359eb5a8d99b55e05c729f130a678b04" integrity sha512-W0+n1Y+gK/8G2P/piTkBBN38Qc5Q1ZSO6B5H3QmPCUewaiXOo2GCAWZ4ElZCcNhjJuBSUSLGFUJnmlCn5+nxOQ== +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + "@types/q@^1.5.1": version "1.5.2" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8" @@ -1011,6 +1043,14 @@ acorn@^7.1.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c" integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ== +aggregate-error@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0" + integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + ajv-errors@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" @@ -1292,21 +1332,21 @@ babel-loader@^8.0.6: mkdirp "^0.5.1" pify "^4.0.1" -babel-plugin-dynamic-import-node@^2.2.0, babel-plugin-dynamic-import-node@^2.3.0: +babel-plugin-dynamic-import-node@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ== dependencies: object.assign "^4.1.0" -babel-plugin-macros@^2.5.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz#41f7ead616fc36f6a93180e89697f69f51671181" - integrity sha512-6W2nwiXme6j1n2erPOnmRiWfObUhWH7Qw1LMi9XZy8cj+KtESu3T6asZvtk5bMQQjX8te35o7CFueiSdL/2NmQ== +babel-plugin-macros@^2.6.1: + version "2.8.0" + resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" + integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== dependencies: - "@babel/runtime" "^7.4.2" - cosmiconfig "^5.2.0" - resolve "^1.10.0" + "@babel/runtime" "^7.7.2" + cosmiconfig "^6.0.0" + resolve "^1.12.0" balanced-match@^1.0.0: version "1.0.0" @@ -1496,7 +1536,7 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.6.4, browserslist@^4.7.3: +browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.6.4: version "4.8.0" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.0.tgz#6f06b0f974a7cc3a84babc2ccc56493668e3c789" integrity sha512-HYnxc/oLRWvJ3TsGegR0SRL/UDnknGq2s/a8dYYEO+kOQ9m9apKoS5oiathLKZdh/e9uE+/J3j92qPlGD/vTqA== @@ -1505,6 +1545,15 @@ browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.6 electron-to-chromium "^1.3.317" node-releases "^1.1.41" +browserslist@^4.8.2: + version "4.8.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289" + integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA== + dependencies: + caniuse-lite "^1.0.30001015" + electron-to-chromium "^1.3.322" + node-releases "^1.1.42" + buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -1544,16 +1593,17 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cacache@^11.2.0: - version "11.3.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc" - integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA== +cacache@^12.0.2: + version "12.0.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" + integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== dependencies: bluebird "^3.5.5" chownr "^1.1.1" figgy-pudding "^3.5.1" glob "^7.1.4" graceful-fs "^4.1.15" + infer-owner "^1.0.3" lru-cache "^5.1.1" mississippi "^3.0.0" mkdirp "^0.5.1" @@ -1564,26 +1614,29 @@ cacache@^11.2.0: unique-filename "^1.1.1" y18n "^4.0.0" -cacache@^12.0.2: - version "12.0.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" - integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== +cacache@^13.0.1: + version "13.0.1" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c" + integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w== dependencies: - bluebird "^3.5.5" - chownr "^1.1.1" + chownr "^1.1.2" figgy-pudding "^3.5.1" + fs-minipass "^2.0.0" glob "^7.1.4" - graceful-fs "^4.1.15" - infer-owner "^1.0.3" + graceful-fs "^4.2.2" + infer-owner "^1.0.4" lru-cache "^5.1.1" - mississippi "^3.0.0" + minipass "^3.0.0" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.2" mkdirp "^0.5.1" move-concurrently "^1.0.1" + p-map "^3.0.0" promise-inflight "^1.0.1" - rimraf "^2.6.3" - ssri "^6.0.1" + rimraf "^2.7.1" + ssri "^7.0.0" unique-filename "^1.1.1" - y18n "^4.0.0" cache-base@^1.0.1: version "1.0.1" @@ -1642,7 +1695,7 @@ camelcase@^3.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= -camelcase@^5.0.0, camelcase@^5.2.0: +camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== @@ -1667,6 +1720,11 @@ caniuse-lite@^1.0.30001012: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001012.tgz#653ec635e815b9e0fb801890923b0c2079eb34ec" integrity sha512-7RR4Uh04t9K1uYRWzOJmzplgEOAXbfK72oVNokCdMzA67trrhPzy93ahKk1AWHiA0c58tD2P+NHqxrA8FZ+Trg== +caniuse-lite@^1.0.30001015: + version "1.0.30001015" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0" + integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ== + case-sensitive-paths-webpack-plugin@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz#3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e" @@ -1752,7 +1810,7 @@ chokidar@^2.0.2, chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chownr@^1.1.1: +chownr@^1.1.1, chownr@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw== @@ -1782,6 +1840,11 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + cli-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" @@ -1951,16 +2014,16 @@ compressible@~2.0.16: dependencies: mime-db ">= 1.40.0 < 2" -compression-webpack-plugin@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-2.0.0.tgz#46476350c1eb27f783dccc79ac2f709baa2cffbc" - integrity sha512-bDgd7oTUZC8EkRx8j0sjyCfeiO+e5sFcfgaFcjVhfQf5lLya7oY2BczxcJ7IUuVjz5m6fy8IECFmVFew3xLk8Q== +compression-webpack-plugin@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.0.1.tgz#be7a343e6dfbccbd64a77c5fbe29627d140fc321" + integrity sha512-FOwoBVzDiwSdJDnZTKXDpAjJU90k8SbChgxnoiYwTo15xjIDJkSC8wFKuc13DymXjgasPEqzS5+2RUgSKXdKKA== dependencies: - cacache "^11.2.0" - find-cache-dir "^2.0.0" + cacache "^13.0.1" + find-cache-dir "^3.0.0" neo-async "^2.5.0" - schema-utils "^1.0.0" - serialize-javascript "^1.4.0" + schema-utils "^2.6.1" + serialize-javascript "^2.1.2" webpack-sources "^1.0.1" compression@^1.7.4: @@ -2030,7 +2093,7 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -convert-source-map@^1.1.0: +convert-source-map@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== @@ -2064,12 +2127,12 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.1.1: - version "3.4.5" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.5.tgz#f072059c0b98ad490eacac082296cfe241af1b58" - integrity sha512-rYVvzvKJDKoefdAC+q6VP63vp5hMmeVONCi9pVUbU1qRrtVrmAk/nPhnRg+i+XFd775m1hpG2Yd5RY3X45ccuw== +core-js-compat@^3.4.7: + version "3.4.8" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.8.tgz#f72e6a4ed76437ea710928f44615f926a81607d5" + integrity sha512-l3WTmnXHV2Sfu5VuD7EHE2w7y+K68+kULKt5RJg8ZJk3YhHF1qLD4O8v8AmNq+8vbOwnPFFDvds25/AoEvMqlQ== dependencies: - browserslist "^4.7.3" + browserslist "^4.8.2" semver "^6.3.0" core-js@^3.1.3, core-js@^3.1.4: @@ -2077,12 +2140,17 @@ core-js@^3.1.3, core-js@^3.1.4: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.4.5.tgz#3dda65611d95699b5eb7742ea451ea052d37aa65" integrity sha512-OuvejWH6vIaUo59Ndlh89purNm4DCIy/v3QoYlcGnn+PkYI8BhNHfCuAESrWX+ZPfq9JccVJ+XXgOMy77PJexg== +core-js@^3.4.0: + version "3.4.8" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.4.8.tgz#e0fc0c61f2ef90cbc10c531dbffaa46dfb7152dd" + integrity sha512-b+BBmCZmVgho8KnBUOXpvlqEMguko+0P+kXCwD4vIprsXC6ht1qgPxtb1OK6XgSlrySF71wkwBQ0Hv695bk9gQ== + core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cosmiconfig@^5.0.0, cosmiconfig@^5.2.0: +cosmiconfig@^5.0.0: version "5.2.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== @@ -2092,6 +2160,17 @@ cosmiconfig@^5.0.0, cosmiconfig@^5.2.0: js-yaml "^3.13.1" parse-json "^4.0.0" +cosmiconfig@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.1.0" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.7.2" + create-ecdh@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" @@ -2187,22 +2266,23 @@ css-has-pseudo@^0.10.0: postcss "^7.0.6" postcss-selector-parser "^5.0.0-rc.4" -css-loader@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz#d8254f72e412bb2238bb44dd674ffbef497333ea" - integrity sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w== +css-loader@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.3.0.tgz#65f889807baec3197313965d6cda9899f936734d" + integrity sha512-x9Y1vvHe5RR+4tzwFdWExPueK00uqFTCw7mZy+9aE/X1SKWOArm5luaOrtJ4d05IpOwJ6S86b/tVcIdhw1Bu4A== dependencies: - camelcase "^5.2.0" - icss-utils "^4.1.0" + camelcase "^5.3.1" + cssesc "^3.0.0" + icss-utils "^4.1.1" loader-utils "^1.2.3" normalize-path "^3.0.0" - postcss "^7.0.14" + postcss "^7.0.23" postcss-modules-extract-imports "^2.0.0" - postcss-modules-local-by-default "^2.0.6" - postcss-modules-scope "^2.1.0" - postcss-modules-values "^2.0.0" - postcss-value-parser "^3.3.0" - schema-utils "^1.0.0" + postcss-modules-local-by-default "^3.0.2" + postcss-modules-scope "^2.1.1" + postcss-modules-values "^3.0.0" + postcss-value-parser "^4.0.2" + schema-utils "^2.6.0" css-prefers-color-scheme@^3.1.1: version "3.1.1" @@ -2642,6 +2722,11 @@ electron-to-chromium@^1.3.317: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.320.tgz#3b101b4ba1db2f97da72f187826b4e78c30f30fd" integrity sha512-GVyRfGaKs/Vsf915WDaK5NG9vfud8nJFyapyQcrVS+sp8IeMpfml/YMvhthXsSOLlc0rzwdtnkNJE/+q4EPbTA== +electron-to-chromium@^1.3.322: + version "1.3.322" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8" + integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA== + elliptic@^6.0.0: version "6.5.1" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz#c380f5f909bf1b9b4428d028cd18d3b0efd6b52b" @@ -3157,13 +3242,13 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" -file-loader@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa" - integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw== +file-loader@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz#780f040f729b3d18019f20605f723e844b8a58af" + integrity sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA== dependencies: - loader-utils "^1.0.2" - schema-utils "^1.0.0" + loader-utils "^1.2.3" + schema-utils "^2.5.0" fill-range@^4.0.0: version "4.0.0" @@ -3197,6 +3282,15 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: make-dir "^2.0.0" pkg-dir "^3.0.0" +find-cache-dir@^3.0.0, find-cache-dir@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.1.0.tgz#9935894999debef4cf9f677fdf646d002c4cdecb" + integrity sha512-zw+EFiNBNPgI2NTrKkDd1xd7q0cs6wr/iWnr/oUkI0yF9K9GqQ+riIt4aiyFaaqpaWbxPrJXHI+QvmNUQbX+0Q== + dependencies: + commondir "^1.0.1" + make-dir "^3.0.0" + pkg-dir "^4.1.0" + find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -3219,6 +3313,14 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + findup-sync@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" @@ -3250,7 +3352,7 @@ flatpickr@^4.6.3: resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.3.tgz#15a8b76b6e34e3a072861250503a5995b9d3bc60" integrity sha512-007VucCkqNOMMb9ggRLNuJowwaJcyOh4sKAFcdGfahfGc7JQbf94zSzjdBq/wVyHWUEs5o3+idhFZ0wbZMRmVQ== -flatted@^2.0.0: +flatted@^2.0.0, flatted@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08" integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg== @@ -3331,6 +3433,13 @@ fs-minipass@^1.2.5: dependencies: minipass "^2.6.0" +fs-minipass@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1" + integrity sha512-40Qz+LFXmd9tzYVnnBmZvFfvAADfUA14TXPK1s7IfElJTIZ97rA8w4Kin7Wt5JBrC3ShnnFJO/5vPjPEeJIq9A== + dependencies: + minipass "^3.0.0" + fs-write-stream-atomic@^1.0.8: version "1.0.10" resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" @@ -3488,6 +3597,18 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl once "^1.3.0" path-is-absolute "^1.0.0" +glob@^7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + global-modules@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" @@ -3556,7 +3677,7 @@ globule@^1.0.0: lodash "~4.17.10" minimatch "~3.0.2" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.2: version "4.2.3" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== @@ -3832,12 +3953,7 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: dependencies: safer-buffer ">= 2.1.2 < 3" -icss-replace-symbols@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" - integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0= - -icss-utils@^4.1.0: +icss-utils@^4.0.0, icss-utils@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== @@ -3894,6 +4010,14 @@ import-fresh@^3.0.0: parent-module "^1.0.0" resolve-from "^4.0.0" +import-fresh@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" + integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + import-from@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1" @@ -3926,12 +4050,17 @@ indent-string@^2.1.0: dependencies: repeating "^2.0.0" +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + indexes-of@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= -infer-owner@^1.0.3: +infer-owner@^1.0.3, infer-owner@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== @@ -4351,6 +4480,14 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= +jest-worker@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5" + integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw== + dependencies: + merge-stream "^2.0.0" + supports-color "^6.1.0" + jquery.maskedinput@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/jquery.maskedinput/-/jquery.maskedinput-1.4.1.tgz#3ea8f4cdc4eafce7354c27b66a73d0f44defc327" @@ -4526,6 +4663,11 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + linkify-it@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf" @@ -4584,6 +4726,13 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + lodash._reinterpolate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -4682,6 +4831,13 @@ make-dir@^2.0.0: pify "^4.0.1" semver "^5.6.0" +make-dir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.0.tgz#1b5f39f6b9270ed33f9f054c5c0f84304989f801" + integrity sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw== + dependencies: + semver "^6.0.0" + mamacro@^0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" @@ -4821,6 +4977,11 @@ merge-descriptors@1.0.1: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" @@ -4885,10 +5046,10 @@ mimic-fn@^2.0.0, mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mini-css-extract-plugin@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.7.0.tgz#5ba8290fbb4179a43dd27cca444ba150bee743a0" - integrity sha512-RQIw6+7utTYn8DBGsf/LpRgZCJMpZt+kuawJ/fju0KiOL6nAaTBNmCJwS7HtwSCXfS47gCkmtBFS7HdsquhdxQ== +mini-css-extract-plugin@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz#81d41ec4fe58c713a96ad7c723cdb2d0bd4d70e1" + integrity sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw== dependencies: loader-utils "^1.1.0" normalize-url "1.9.1" @@ -4922,6 +5083,27 @@ minimist@^1.1.3, minimist@^1.2.0: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + dependencies: + minipass "^3.0.0" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz#3dcb6bb4a546e32969c7ad710f2c79a86abba93a" + integrity sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA== + dependencies: + minipass "^3.0.0" + minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" @@ -4930,6 +5112,13 @@ minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: safe-buffer "^5.1.2" yallist "^3.0.0" +minipass@^3.0.0, minipass@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" + integrity sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w== + dependencies: + yallist "^4.0.0" + minizlib@^1.2.1: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" @@ -5144,10 +5333,17 @@ node-releases@^1.1.41: dependencies: semver "^6.3.0" -node-sass@^4.12.0: - version "4.12.0" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017" - integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ== +node-releases@^1.1.42: + version "1.1.42" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.42.tgz#a999f6a62f8746981f6da90627a8d2fc090bbad7" + integrity sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA== + dependencies: + semver "^6.3.0" + +node-sass@^4.13.0: + version "4.13.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066" + integrity sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA== dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -5156,7 +5352,7 @@ node-sass@^4.12.0: get-stdin "^4.0.1" glob "^7.0.3" in-publish "^2.0.0" - lodash "^4.17.11" + lodash "^4.17.15" meow "^3.7.0" mkdirp "^0.5.1" nan "^2.13.2" @@ -5390,7 +5586,7 @@ opn@^5.5.0: dependencies: is-wsl "^1.1.0" -optimize-css-assets-webpack-plugin@^5.0.1: +optimize-css-assets-webpack-plugin@^5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz#e2f1d4d94ad8c0af8967ebd7cf138dcb1ef14572" integrity sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA== @@ -5478,7 +5674,7 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" -p-limit@^2.0.0: +p-limit@^2.0.0, p-limit@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== @@ -5499,11 +5695,25 @@ p-locate@^3.0.0: dependencies: p-limit "^2.0.0" +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + p-map@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== +p-map@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d" + integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ== + dependencies: + aggregate-error "^3.0.0" + p-retry@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328" @@ -5584,6 +5794,16 @@ parse-json@^4.0.0: error-ex "^1.3.1" json-parse-better-errors "^1.0.1" +parse-json@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" + integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + lines-and-columns "^1.1.6" + parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" @@ -5631,6 +5851,11 @@ path-exists@^3.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -5672,6 +5897,11 @@ path-type@^2.0.0: dependencies: pify "^2.0.0" +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + pbkdf2@^3.0.3: version "3.0.17" resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6" @@ -5729,7 +5959,14 @@ pkg-dir@^3.0.0: dependencies: find-up "^3.0.0" -pnp-webpack-plugin@^1.4.3: +pkg-dir@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +pnp-webpack-plugin@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.5.0.tgz#62a1cd3068f46d564bb33c56eb250e4d586676eb" integrity sha512-jd9olUr9D7do+RN8Wspzhpxhgp1n6Vd0NtQ4SFkmIACZoEL1nkyAdW9Ygrinjec0vgDcWjscFQQ1gDW8rsfKTg== @@ -6080,29 +6317,30 @@ postcss-modules-extract-imports@^2.0.0: dependencies: postcss "^7.0.5" -postcss-modules-local-by-default@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz#dd9953f6dd476b5fd1ef2d8830c8929760b56e63" - integrity sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA== +postcss-modules-local-by-default@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915" + integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ== dependencies: - postcss "^7.0.6" - postcss-selector-parser "^6.0.0" - postcss-value-parser "^3.3.1" + icss-utils "^4.1.1" + postcss "^7.0.16" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.0.0" -postcss-modules-scope@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz#ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb" - integrity sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A== +postcss-modules-scope@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz#33d4fc946602eb5e9355c4165d68a10727689dba" + integrity sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ== dependencies: postcss "^7.0.6" postcss-selector-parser "^6.0.0" -postcss-modules-values@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz#479b46dc0c5ca3dc7fa5270851836b9ec7152f64" - integrity sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w== +postcss-modules-values@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" + integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== dependencies: - icss-replace-symbols "^1.1.0" + icss-utils "^4.0.0" postcss "^7.0.6" postcss-nesting@^7.0.0: @@ -6224,7 +6462,7 @@ postcss-place@^4.0.1: postcss "^7.0.2" postcss-values-parser "^2.0.0" -postcss-preset-env@^6.6.0: +postcss-preset-env@^6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz#c34ddacf8f902383b35ad1e030f178f4cdf118a5" integrity sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg== @@ -6343,7 +6581,7 @@ postcss-selector-parser@^5.0.0, postcss-selector-parser@^5.0.0-rc.3, postcss-sel indexes-of "^1.0.1" uniq "^1.0.1" -postcss-selector-parser@^6.0.0: +postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c" integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg== @@ -6371,12 +6609,12 @@ postcss-unique-selectors@^4.0.1: postcss "^7.0.0" uniqs "^2.0.0" -postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1: +postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.0.0: +postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9" integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ== @@ -6399,6 +6637,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2 source-map "^0.6.1" supports-color "^6.1.0" +postcss@^7.0.16, postcss@^7.0.23: + version "7.0.24" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.24.tgz#972c3c5be431b32e40caefe6c81b5a19117704c2" + integrity sha512-Xl0XvdNWg+CblAXzNvbSOUvgJXwSjmbAKORqyw9V2AlHrm1js2gFw9y3jibBAhpKZi8b5JzJCVh/FyzPsTtgTA== + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -6689,7 +6936,7 @@ regenerate@^1.4.0: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== -regenerator-runtime@^0.13.2: +regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3: version "0.13.3" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== @@ -6709,11 +6956,6 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexp-tree@^0.1.13: - version "0.1.17" - resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.17.tgz#66d914a6ca21f95dd7660ed70a7dad47aeb2246a" - integrity sha512-UnOJjFS/EPZmfISmYx+0PcDtPzyFKTe+cZTS5sM5hifnRUDRxoB1j4DAmGwqzxjwBGlwOkGfb2cDGHtjuEwqoA== - regexp.prototype.flags@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c" @@ -6731,10 +6973,10 @@ regexpp@^3.0.0: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e" integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g== -regexpu-core@^4.5.4: - version "4.5.5" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.5.tgz#aaffe61c2af58269b3e516b61a73790376326411" - integrity sha512-FpI67+ky9J+cDizQUJlIlNZFKual/lUkFr1AG6zOCpwZ9cLrg8UUVakyUQJD7fCDIe9Z2nwTQJNPyonatNmDFQ== +regexpu-core@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6" + integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg== dependencies: regenerate "^1.4.0" regenerate-unicode-properties "^8.1.0" @@ -6860,6 +7102,13 @@ resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.3. dependencies: path-parse "^1.0.6" +resolve@^1.12.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16" + integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w== + dependencies: + path-parse "^1.0.6" + restore-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" @@ -6888,7 +7137,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -6963,7 +7212,7 @@ sass-graph@^2.2.4: scss-tokenizer "^0.2.3" yargs "^7.0.0" -sass-loader@^7.1.0: +sass-loader@7.3.1: version "7.3.1" resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.3.1.tgz#a5bf68a04bcea1c13ff842d747150f7ab7d0d23f" integrity sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA== @@ -6988,6 +7237,14 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" +schema-utils@^2.0.1, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f" + integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg== + dependencies: + ajv "^6.10.2" + ajv-keywords "^3.4.1" + scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" @@ -7018,7 +7275,7 @@ selfsigned@^1.10.7: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.1.0, semver@^6.1.2, semver@^6.3.0: +semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -7047,11 +7304,16 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -serialize-javascript@^1.4.0, serialize-javascript@^1.7.0: +serialize-javascript@^1.7.0: version "1.9.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb" integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A== +serialize-javascript@^2.1.1, serialize-javascript@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" + integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== + serve-index@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" @@ -7354,6 +7616,14 @@ ssri@^6.0.1: dependencies: figgy-pudding "^3.5.1" +ssri@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz#92c241bf6de82365b5c7fb4bd76e975522e1294d" + integrity sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g== + dependencies: + figgy-pudding "^3.5.1" + minipass "^3.1.1" + stable@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" @@ -7553,13 +7823,13 @@ strip-json-comments@^3.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== -style-loader@^0.23.1: - version "0.23.1" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925" - integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg== +style-loader@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.1.tgz#aec6d4c61d0ed8d0a442faed741d4dfc6573888a" + integrity sha512-CnpEkSR1C+REjudiTWCv4+ssP7SCiuaQZJTZDWBRwTJoS90mdqkB8uOGMHKgVeUzpaU7IfLWoyQbvvs5Joj3Xw== dependencies: - loader-utils "^1.1.0" - schema-utils "^1.0.0" + loader-utils "^1.2.3" + schema-utils "^2.0.1" stylehacks@^4.0.0: version "4.0.3" @@ -7652,7 +7922,7 @@ tar@^4: safe-buffer "^5.1.2" yallist "^3.0.3" -terser-webpack-plugin@^1.3.0, terser-webpack-plugin@^1.4.1: +terser-webpack-plugin@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4" integrity sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg== @@ -7667,6 +7937,20 @@ terser-webpack-plugin@^1.3.0, terser-webpack-plugin@^1.4.1: webpack-sources "^1.4.0" worker-farm "^1.7.0" +terser-webpack-plugin@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.2.2.tgz#2a6e00237125564a455ad69b22e08ee59420473a" + integrity sha512-/CHMNswPMAwuD2kd++qys8UmBRmsshPSzHw4BlDwurPtK9YjeK93OV89YWkJulHk972cs07K/7Z92V6PNjWF8A== + dependencies: + cacache "^13.0.1" + find-cache-dir "^3.1.0" + jest-worker "^24.9.0" + schema-utils "^2.6.1" + serialize-javascript "^2.1.1" + source-map "^0.6.1" + terser "^4.4.2" + webpack-sources "^1.4.3" + terser@^4.1.2: version "4.4.1" resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.1.tgz#f3a469c125d9a0eb52f1e6a7fdff587bd6e35902" @@ -7676,6 +7960,15 @@ terser@^4.1.2: source-map "~0.6.1" source-map-support "~0.5.12" +terser@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.2.tgz#448fffad0245f4c8a277ce89788b458bfd7706e8" + integrity sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ== + dependencies: + commander "^2.20.0" + source-map "~0.6.1" + source-map-support "~0.5.12" + text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -7778,11 +8071,6 @@ trim-newlines@^1.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= - trix@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/trix/-/trix-1.2.0.tgz#b314101abd1d8d3d5da22ae5b866a719a73a6e21" @@ -8078,7 +8366,7 @@ webpack-assets-manifest@^3.1.1: tapable "^1.0.0" webpack-sources "^1.0.0" -webpack-cli@^3.3.2: +webpack-cli@^3.3.10: version "3.3.10" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.10.tgz#17b279267e9b4fb549023fae170da8e6e766da13" integrity sha512-u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg== @@ -8153,7 +8441,7 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: +webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== @@ -8161,7 +8449,7 @@ webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack- source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.32.2: +webpack@^4.41.2: version "4.41.2" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e" integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A== @@ -8306,6 +8594,18 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yaml@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz#f26aabf738590ab61efaca502358e48dc9f348b2" + integrity sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw== + dependencies: + "@babel/runtime" "^7.6.3" + yargs-parser@^11.1.1: version "11.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" From 6d831969ac676978affee85cfc7b83792a76408d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Tue, 10 Dec 2019 10:04:07 +0300 Subject: [PATCH 036/216] =?UTF-8?q?LemonLDAP=20dok=C3=BCman=C4=B1=20ekle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/app/sso.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/doc/app/sso.md b/doc/app/sso.md index 223004202..b902fa02e 100644 --- a/doc/app/sso.md +++ b/doc/app/sso.md @@ -14,3 +14,27 @@ NOKUL_SSO_ENABLE=true Bu ortam değişkeni olmadığında sistem veritabanından yetkilendirmeye çalışacaktır. LDAP ve veritabanındaki kullanıcı parolaları aynı olduğundan, kullanıcılar başarılı bir şekilde sisteme giriş yapabilmeye devam edebileceklerdir. + +LemonLDAP +--------- + +LemonLDAP ve LLNG arasındaki bağlantı bir süre sonra kopuyor. Bununla LLNG depolarındaki issue [şudur][LLNG-1807]. + +Geçici çözüm: + +LemonLDAP sunucusunda aşağıdaki gibi keepalive değerleri girilir: + +```bash +$ vim /etc/sysctl +net.ipv4.tcp_keepalive_time = 300 +net.ipv4.tcp_keepalive_intvl = 60 +net.ipv4.tcp_keepalive_probes = 5 +``` + +Yukarıdaki ayarlar şunu yapmaktadır: + +Açık ve boşta olan bir TCP bağlantısına, 300 saniyenin ardından bağlantının hala hayatta olup olmadığını anlamak için +dakikada 1 istek atılır. 5 denemenin ardından eğer karşı taraftan yanıt alınamazsa bağlantı sonlandırılır. Bu kontroller +sırasında arada trafik oluştuğu için firewall bağlantıyı sonlandırmayacaktır. + +[LLNG-1807]: https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues/1807 From d6b9961096d6a697980e8c28b3d37ca5cf8eede6 Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Wed, 11 Dec 2019 10:02:25 +0300 Subject: [PATCH 037/216] Change placement type validation --- app/models/prospective_student.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/prospective_student.rb b/app/models/prospective_student.rb index f9f7e6c27..010689d1f 100644 --- a/app/models/prospective_student.rb +++ b/app/models/prospective_student.rb @@ -60,7 +60,7 @@ class ProspectiveStudent < ApplicationRecord validates :placement_rank, allow_nil: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :placement_score, allow_nil: true, numericality: { greater_than_or_equal_to: 0 } validates :placement_score_type, length: { maximum: 255 } - validates :placement_type, allow_nil: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + validates :placement_type, allow_nil: true, inclusion: { in: placement_types.keys } validates :preference_order, allow_nil: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :registration_city, length: { maximum: 255 } validates :registered, inclusion: { in: [true, false] } From 60782c3d941b2b4a19ef03e7c3c36aa5d1e4a08f Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Wed, 11 Dec 2019 11:03:33 +0300 Subject: [PATCH 038/216] Refactor prospective student validation --- app/validators/prospective_student_validator.rb | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/app/validators/prospective_student_validator.rb b/app/validators/prospective_student_validator.rb index 6eb6eed7d..b60bf3687 100644 --- a/app/validators/prospective_student_validator.rb +++ b/app/validators/prospective_student_validator.rb @@ -2,8 +2,7 @@ class ProspectiveStudentValidator < ActiveModel::Validator def validate(record) - return unless record.user - return unless registered?(record) + return unless record.registered? return unless record.unit_id_changed? || record.academic_term_id_changed? record.errors[:base] << message('unchangeable_variables') @@ -11,14 +10,6 @@ def validate(record) private - def registered?(record) - record.user.students.find_by(unit_id: unit(record))&.permanently_registered? - end - - def unit(record) - record.unit_id_changed? ? Unit.find(record.changes[:unit_id]&.first) : record.unit - end - def message(key) I18n.t(key, scope: %i[validators prospective_student]) end From 12ef453f375d8c4c32e42383814db8e6a1707b86 Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Wed, 11 Dec 2019 12:45:32 +0300 Subject: [PATCH 039/216] Add prospective student validation test --- .../prospective_student_validator_test.rb | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 test/validators/prospective_student_validator_test.rb diff --git a/test/validators/prospective_student_validator_test.rb b/test/validators/prospective_student_validator_test.rb new file mode 100644 index 000000000..eaea226c7 --- /dev/null +++ b/test/validators/prospective_student_validator_test.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +require 'test_helper' + +class ProspectiveStudentValidatorTest < ActiveSupport::TestCase + setup do + @prospective_student = prospective_students(:mine) + @unit = units(:matematik_ve_fen_bilimleri_egitimi_bolumu) + @academic_term = academic_terms(:summer_2017_2018) + end + + { + 'unit' => @unit, + 'academic_term' => @academic_term + }.each do |property, value| + test "unchangeable variables validation for #{property}" do + @prospective_student.send("#{property}=", value) + + assert @prospective_student.registered? + assert_not @prospective_student.save + assert_not_empty @prospective_student.errors[:base] + assert_equal I18n.t('validators.prospective_student.unchangeable_variables'), + @prospective_student.errors[:base].first + end + end +end From 226feea3214bdc6cd8655f8a53a4c29d1cd2794c Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Fri, 13 Dec 2019 00:37:20 +0000 Subject: [PATCH 040/216] fix: package.json & yarn.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-TRIX-536207 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 13af2eb49..49e7e117e 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "jquery.maskedinput": "^1.4.1", "select2": "^4.0.12", "toastr": "^2.1.4", - "trix": "^1.0.0", + "trix": "^1.2.2", "turbolinks": "^5.2.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 5ce36401f..f95545597 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8071,10 +8071,10 @@ trim-newlines@^1.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= -trix@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/trix/-/trix-1.2.0.tgz#b314101abd1d8d3d5da22ae5b866a719a73a6e21" - integrity sha512-gJ7edoWzcnc9DBjsgeGkmotVpyVhFQTlSOmUYjwFn71NlGixAhNgsu8pVIq/jkIkbk6om0PSetc9cRJm+qU3+A== +trix@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/trix/-/trix-1.2.2.tgz#bb2afacb981df9a6edb49bc66f57427b9728909d" + integrity sha512-xNWwKDa1PG5do/qV3FRESXjM17U5ACB9Ih+x4mylLYfAgmYYTA17ExVdrrA7vCJ5J9nS1tVZFyhVTPgPTtIFVg== "true-case-path@^1.0.2": version "1.0.3" From d6294a29cb0bb9655a315a2d31b6310d128155f1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:39:50 +0000 Subject: [PATCH 041/216] chore(deps): bump @rails/actiontext from 6.0.1 to 6.0.2 Bumps [@rails/actiontext](https://github.com/rails/rails) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v6.0.1...v6.0.2) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 49e7e117e..3bcad63f9 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "dependencies": { "@coreui/coreui-free-bootstrap-admin-template": "https://github.com/coreui/coreui-free-bootstrap-admin-template.git", "@rails/actioncable": "^6.0.0-alpha", - "@rails/actiontext": "^6.0.1", + "@rails/actiontext": "^6.0.2", "@rails/activestorage": "^6.0.0-alpha", "@rails/ujs": "^6.0.1", "@rails/webpacker": "4.1.0", diff --git a/yarn.lock b/yarn.lock index f95545597..5b4ab7e12 100644 --- a/yarn.lock +++ b/yarn.lock @@ -757,10 +757,10 @@ resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.0.tgz#8bff9c902be1531ef7a9e191562e9771efcfdfe1" integrity sha512-DieouotYHpI6k2EGTCnh1eMvD3W8p3zqjWXEYj4z0khJ+A0qQ5tHxihjTEkio54MVwqHt1DcpUm2woh2n/alCA== -"@rails/actiontext@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/@rails/actiontext/-/actiontext-6.0.1.tgz#62400c48262c71b90e9808718609eb5dd59f4ac6" - integrity sha512-JP+nW17rPVX4CtnJE++0hDKfgtQekxN3avYO9XzQ/Ta/G+y32BhCYZ/SR4AyL/b+sv48l2a89TXGHyX6tTM+3A== +"@rails/actiontext@^6.0.2": + version "6.0.2" + resolved "https://registry.yarnpkg.com/@rails/actiontext/-/actiontext-6.0.2.tgz#1ad5ecfe5a64affb9cca7908a996c635cb0b2224" + integrity sha512-fxCGPRud14H4LTlAMLCtXDvhrNA9xswg2LwTYMEHzLQ0EPz2VU5ixDLygtYQymVq+9GtZ6CFGsvbOT0HhUJsGQ== dependencies: "@rails/activestorage" "^6.0.0-alpha" From eee45799117d0a1b7dce80ea0a0e6e3400b3efb3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:40:24 +0000 Subject: [PATCH 042/216] chore(deps): bump object.values from 1.1.0 to 1.1.1 Bumps [object.values](https://github.com/es-shims/Object.values) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/es-shims/Object.values/releases) - [Changelog](https://github.com/es-shims/Object.values/blob/master/CHANGELOG.md) - [Commits](https://github.com/es-shims/Object.values/compare/v1.1.0...v1.1.1) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/yarn.lock b/yarn.lock index f95545597..92b6cecc5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2809,10 +2809,10 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.12.0, es-abstract@^1.5.1: - version "1.16.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz#52490d978f96ff9f89ec15b5cf244304a5bca161" - integrity sha512-WtY7Fx5LiOnSYgF5eg/1T+GONaGmpvpPdCpSnYij+U2gDTL0UPfWrhDw7b2IYb+9NQJsYpCA0wOQvZfsd6YwRw== +es-abstract@^1.17.0-next.1: + version "1.17.0-next.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172" + integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" @@ -2822,26 +2822,27 @@ es-abstract@^1.12.0, es-abstract@^1.5.1: is-regex "^1.0.4" object-inspect "^1.7.0" object-keys "^1.1.1" + object.assign "^4.1.0" string.prototype.trimleft "^2.1.0" string.prototype.trimright "^2.1.0" -es-abstract@^1.7.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz#d3a26dc9c3283ac9750dca569586e976d9dcc06d" - integrity sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg== +es-abstract@^1.5.1, es-abstract@^1.7.0: + version "1.16.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz#52490d978f96ff9f89ec15b5cf244304a5bca161" + integrity sha512-WtY7Fx5LiOnSYgF5eg/1T+GONaGmpvpPdCpSnYij+U2gDTL0UPfWrhDw7b2IYb+9NQJsYpCA0wOQvZfsd6YwRw== dependencies: - es-to-primitive "^1.2.0" + es-to-primitive "^1.2.1" function-bind "^1.1.1" has "^1.0.3" - has-symbols "^1.0.0" + has-symbols "^1.0.1" is-callable "^1.1.4" is-regex "^1.0.4" - object-inspect "^1.6.0" + object-inspect "^1.7.0" object-keys "^1.1.1" string.prototype.trimleft "^2.1.0" string.prototype.trimright "^2.1.0" -es-to-primitive@^1.2.0, es-to-primitive@^1.2.1: +es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== @@ -3763,7 +3764,7 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has@^1.0.0, has@^1.0.1, has@^1.0.3: +has@^1.0.0, has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== @@ -4398,11 +4399,11 @@ is-promise@^2.1.0: integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= is-regex@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" - integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" + integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== dependencies: - has "^1.0.1" + has "^1.0.3" is-resolvable@^1.0.0: version "1.1.0" @@ -5486,7 +5487,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.6.0, object-inspect@^1.7.0: +object-inspect@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== @@ -5534,12 +5535,12 @@ object.pick@^1.3.0: isobject "^3.0.1" object.values@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9" - integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" + integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== dependencies: define-properties "^1.1.3" - es-abstract "^1.12.0" + es-abstract "^1.17.0-next.1" function-bind "^1.1.1" has "^1.0.3" From 31a18dbc5fa940d86c1f9c0d43275063f5af7b0a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:41:20 +0000 Subject: [PATCH 043/216] chore(deps): bump deep-equal from 1.1.0 to 1.1.1 Bumps [deep-equal](https://github.com/substack/node-deep-equal) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/substack/node-deep-equal/releases) - [Changelog](https://github.com/inspect-js/node-deep-equal/blob/master/CHANGELOG.md) - [Commits](https://github.com/substack/node-deep-equal/compare/v1.1.0...v1.1.1) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index f95545597..b0ea10570 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2478,9 +2478,9 @@ decode-uri-component@^0.2.0: integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= deep-equal@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.0.tgz#3103cdf8ab6d32cf4a8df7865458f2b8d33f3745" - integrity sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw== + version "1.1.1" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== dependencies: is-arguments "^1.0.4" is-date-object "^1.0.1" @@ -2825,6 +2825,23 @@ es-abstract@^1.12.0, es-abstract@^1.5.1: string.prototype.trimleft "^2.1.0" string.prototype.trimright "^2.1.0" +es-abstract@^1.17.0-next.1: + version "1.17.0-next.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172" + integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.1.4" + is-regex "^1.0.4" + object-inspect "^1.7.0" + object-keys "^1.1.1" + object.assign "^4.1.0" + string.prototype.trimleft "^2.1.0" + string.prototype.trimright "^2.1.0" + es-abstract@^1.7.0: version "1.16.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz#d3a26dc9c3283ac9750dca569586e976d9dcc06d" @@ -3763,7 +3780,7 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has@^1.0.0, has@^1.0.1, has@^1.0.3: +has@^1.0.0, has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== @@ -4398,11 +4415,11 @@ is-promise@^2.1.0: integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= is-regex@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" - integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" + integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== dependencies: - has "^1.0.1" + has "^1.0.3" is-resolvable@^1.0.0: version "1.1.0" @@ -6957,11 +6974,12 @@ regex-not@^1.0.0, regex-not@^1.0.2: safe-regex "^1.1.0" regexp.prototype.flags@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c" - integrity sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA== + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" + integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== dependencies: - define-properties "^1.1.2" + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" regexpp@^2.0.1: version "2.0.1" From 52442abdf5eb406cff7d1483e72028a02f9337e7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:42:18 +0000 Subject: [PATCH 044/216] chore(deps): bump npm-packlist from 1.4.6 to 1.4.7 Bumps [npm-packlist](https://github.com/npm/npm-packlist) from 1.4.6 to 1.4.7. - [Release notes](https://github.com/npm/npm-packlist/releases) - [Commits](https://github.com/npm/npm-packlist/compare/v1.4.6...v1.4.7) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index f95545597..ff9deed4b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5421,14 +5421,21 @@ normalize-url@^3.0.0: integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== npm-bundled@^1.0.1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd" - integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g== + version "1.1.1" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" + integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== + dependencies: + npm-normalize-package-bin "^1.0.1" + +npm-normalize-package-bin@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== npm-packlist@^1.1.6: - version "1.4.6" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.6.tgz#53ba3ed11f8523079f1457376dd379ee4ea42ff4" - integrity sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg== + version "1.4.7" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" + integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== dependencies: ignore-walk "^3.0.1" npm-bundled "^1.0.1" From b733138e4245ace3fa2c36bb08e3233191ed0a1b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:42:49 +0000 Subject: [PATCH 045/216] chore(deps): bump css-loader from 3.3.0 to 3.3.2 Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.3.0 to 3.3.2. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.3.0...v3.3.2) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/yarn.lock b/yarn.lock index f95545597..e51ab2b63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2267,9 +2267,9 @@ css-has-pseudo@^0.10.0: postcss-selector-parser "^5.0.0-rc.4" css-loader@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.3.0.tgz#65f889807baec3197313965d6cda9899f936734d" - integrity sha512-x9Y1vvHe5RR+4tzwFdWExPueK00uqFTCw7mZy+9aE/X1SKWOArm5luaOrtJ4d05IpOwJ6S86b/tVcIdhw1Bu4A== + version "3.3.2" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.3.2.tgz#41b2086528aa4fbf8c0692e874bc14f081129b21" + integrity sha512-4XSiURS+YEK2fQhmSaM1onnUm0VKWNf6WWBYjkp9YbSDGCBTVZ5XOM6Gkxo8tLgQlzkZOBJvk9trHlDk4gjEYg== dependencies: camelcase "^5.3.1" cssesc "^3.0.0" @@ -3200,9 +3200,9 @@ fast-deep-equal@^2.0.1: integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== fast-levenshtein@~2.0.6: version "2.0.6" @@ -6628,16 +6628,7 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1: indexes-of "^1.0.1" uniq "^1.0.1" -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.23" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.23.tgz#9f9759fad661b15964f3cfc3140f66f1e05eadc1" - integrity sha512-hOlMf3ouRIFXD+j2VJecwssTwbvsPGJVMzupptg+85WA+i7MwyrydmQAgY3R+m0Bc0exunhbJmijy8u8+vufuQ== - dependencies: - chalk "^2.4.2" - source-map "^0.6.1" - supports-color "^6.1.0" - -postcss@^7.0.16, postcss@^7.0.23: +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.5, postcss@^7.0.6: version "7.0.24" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.24.tgz#972c3c5be431b32e40caefe6c81b5a19117704c2" integrity sha512-Xl0XvdNWg+CblAXzNvbSOUvgJXwSjmbAKORqyw9V2AlHrm1js2gFw9y3jibBAhpKZi8b5JzJCVh/FyzPsTtgTA== From 2d85bf2b122da4ace82fb13645cc59c1eca62b65 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:44:09 +0000 Subject: [PATCH 046/216] chore(deps): bump aws-partitions from 1.251.0 to 1.255.0 Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.251.0 to 1.255.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3f2319c96..dab31bb08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,7 +92,7 @@ GEM authy (2.7.5) httpclient (>= 2.5.3.3) aws-eventstream (1.0.3) - aws-partitions (1.251.0) + aws-partitions (1.255.0) aws-sdk-core (3.84.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) From 9e88ee036617f4da466edf00e803bac03f254c35 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:44:38 +0000 Subject: [PATCH 047/216] chore(deps): bump rails from 6.0.1 to 6.0.2 Bumps [rails](https://github.com/rails/rails) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v6.0.1...v6.0.2) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 102 +++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3f2319c96..d104fbfa1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,56 +27,56 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.0.1) - actionpack (= 6.0.1) + actioncable (6.0.2) + actionpack (= 6.0.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.1) - actionpack (= 6.0.1) - activejob (= 6.0.1) - activerecord (= 6.0.1) - activestorage (= 6.0.1) - activesupport (= 6.0.1) + actionmailbox (6.0.2) + actionpack (= 6.0.2) + activejob (= 6.0.2) + activerecord (= 6.0.2) + activestorage (= 6.0.2) + activesupport (= 6.0.2) mail (>= 2.7.1) - actionmailer (6.0.1) - actionpack (= 6.0.1) - actionview (= 6.0.1) - activejob (= 6.0.1) + actionmailer (6.0.2) + actionpack (= 6.0.2) + actionview (= 6.0.2) + activejob (= 6.0.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.1) - actionview (= 6.0.1) - activesupport (= 6.0.1) + actionpack (6.0.2) + actionview (= 6.0.2) + activesupport (= 6.0.2) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.1) - actionpack (= 6.0.1) - activerecord (= 6.0.1) - activestorage (= 6.0.1) - activesupport (= 6.0.1) + actiontext (6.0.2) + actionpack (= 6.0.2) + activerecord (= 6.0.2) + activestorage (= 6.0.2) + activesupport (= 6.0.2) nokogiri (>= 1.8.5) - actionview (6.0.1) - activesupport (= 6.0.1) + actionview (6.0.2) + activesupport (= 6.0.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.1) - activesupport (= 6.0.1) + activejob (6.0.2) + activesupport (= 6.0.2) globalid (>= 0.3.6) - activemodel (6.0.1) - activesupport (= 6.0.1) - activerecord (6.0.1) - activemodel (= 6.0.1) - activesupport (= 6.0.1) - activestorage (6.0.1) - actionpack (= 6.0.1) - activejob (= 6.0.1) - activerecord (= 6.0.1) + activemodel (6.0.2) + activesupport (= 6.0.2) + activerecord (6.0.2) + activemodel (= 6.0.2) + activesupport (= 6.0.2) + activestorage (6.0.2) + actionpack (= 6.0.2) + activejob (= 6.0.2) + activerecord (= 6.0.2) marcel (~> 0.3.1) - activesupport (6.0.1) + activesupport (6.0.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -121,7 +121,7 @@ GEM bootsnap (1.4.5) msgpack (~> 1.0) brakeman (4.7.2) - builder (3.2.3) + builder (3.2.4) bullet (6.0.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) @@ -296,29 +296,29 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.1) - actioncable (= 6.0.1) - actionmailbox (= 6.0.1) - actionmailer (= 6.0.1) - actionpack (= 6.0.1) - actiontext (= 6.0.1) - actionview (= 6.0.1) - activejob (= 6.0.1) - activemodel (= 6.0.1) - activerecord (= 6.0.1) - activestorage (= 6.0.1) - activesupport (= 6.0.1) + rails (6.0.2) + actioncable (= 6.0.2) + actionmailbox (= 6.0.2) + actionmailer (= 6.0.2) + actionpack (= 6.0.2) + actiontext (= 6.0.2) + actionview (= 6.0.2) + activejob (= 6.0.2) + activemodel (= 6.0.2) + activerecord (= 6.0.2) + activestorage (= 6.0.2) + activesupport (= 6.0.2) bundler (>= 1.3.0) - railties (= 6.0.1) + railties (= 6.0.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.1) - actionpack (= 6.0.1) - activesupport (= 6.0.1) + railties (6.0.2) + actionpack (= 6.0.2) + activesupport (= 6.0.2) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) From e7f37b76473b68bca52d76077bc300cf701cba78 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:45:38 +0000 Subject: [PATCH 048/216] chore(deps-dev): bump rack-mini-profiler from 1.1.3 to 1.1.4 Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 1.1.3 to 1.1.4. - [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases) - [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.1.3...v1.1.4) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3f2319c96..6b161be0a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -282,7 +282,7 @@ GEM rack (2.0.7) rack-attack (6.2.1) rack (>= 1.0, < 3) - rack-mini-profiler (1.1.3) + rack-mini-profiler (1.1.4) rack (>= 1.2.0) rack-oauth2 (1.10.1) activesupport From d9ff5cfbedf4019499702e301487853fd374ffe9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:46:10 +0000 Subject: [PATCH 049/216] chore(deps): bump pagy from 3.7.0 to 3.7.1 Bumps [pagy](https://github.com/ddnexus/pagy) from 3.7.0 to 3.7.1. - [Release notes](https://github.com/ddnexus/pagy/releases) - [Changelog](https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md) - [Commits](https://github.com/ddnexus/pagy/compare/3.7.0...3.7.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3f2319c96..b1a5a90b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -258,7 +258,7 @@ GEM validate_url webfinger (>= 1.0.1) orm_adapter (0.5.0) - pagy (3.7.0) + pagy (3.7.1) parallel (1.19.1) parser (2.6.5.0) ast (~> 2.4.0) From acfbc7856df667e463413f23315091e440c7cf91 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:46:44 +0000 Subject: [PATCH 050/216] chore(deps): bump aws-sdk-core from 3.84.0 to 3.86.0 Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.84.0 to 3.86.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3f2319c96..716e92933 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,8 +92,8 @@ GEM authy (2.7.5) httpclient (>= 2.5.3.3) aws-eventstream (1.0.3) - aws-partitions (1.251.0) - aws-sdk-core (3.84.0) + aws-partitions (1.255.0) + aws-sdk-core (3.86.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) From aad259af484bf5485c4d99b7bf00808ccc022e67 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:47:36 +0000 Subject: [PATCH 051/216] chore(deps): bump telephone_number from 1.4.3 to 1.4.4 Bumps [telephone_number](https://github.com/mobi/telephone_number) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/mobi/telephone_number/releases) - [Commits](https://github.com/mobi/telephone_number/compare/v1.4.3...v1.4.4) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3f2319c96..80acb0aa3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -400,7 +400,7 @@ GEM attr_required (>= 0.0.5) httpclient (>= 2.4) swearjar (1.3.1) - telephone_number (1.4.3) + telephone_number (1.4.4) thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) From d22b6c479a4e626d706fe9ef94939d06353e3a75 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:48:14 +0000 Subject: [PATCH 052/216] chore(deps): bump webpacker from 4.2.0 to 4.2.2 Bumps [webpacker](https://github.com/rails/webpacker) from 4.2.0 to 4.2.2. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v4.2.0...v4.2.2) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3f2319c96..90a05804a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,7 +121,7 @@ GEM bootsnap (1.4.5) msgpack (~> 1.0) brakeman (4.7.2) - builder (3.2.3) + builder (3.2.4) bullet (6.0.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) @@ -441,7 +441,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webpacker (4.2.0) + webpacker (4.2.2) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) From 911aebd16bd9566621007710f8b91ec2fb282710 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:48:39 +0000 Subject: [PATCH 053/216] chore(deps): bump builder from 3.2.3 to 3.2.4 Bumps [builder](https://github.com/jimweirich/builder) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/jimweirich/builder/releases) - [Changelog](https://github.com/jimweirich/builder/blob/master/CHANGES) - [Commits](https://github.com/jimweirich/builder/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3f2319c96..eda0f1c80 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,7 +121,7 @@ GEM bootsnap (1.4.5) msgpack (~> 1.0) brakeman (4.7.2) - builder (3.2.3) + builder (3.2.4) bullet (6.0.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) From 771a12f9c08d71e7f85350950c3a70fe023aa013 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:49:11 +0000 Subject: [PATCH 054/216] chore(deps): bump json from 2.2.0 to 2.3.0 Bumps [json](https://github.com/flori/json) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/flori/json/releases) - [Changelog](https://github.com/flori/json/blob/master/CHANGES.md) - [Commits](https://github.com/flori/json/compare/v2.2.0...v2.3.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3f2319c96..8608c5263 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -194,7 +194,7 @@ GEM jbuilder (2.9.1) activesupport (>= 4.2.0) jmespath (1.4.0) - json (2.2.0) + json (2.3.0) json-jwt (1.11.0) activesupport (>= 4.2) aes_key_wrap From 74fa9f54c5e3009d2c4a2f9bd483c3415eb7e05c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 00:49:46 +0000 Subject: [PATCH 055/216] chore(deps): bump twilio-ruby from 5.30.0 to 5.31.0 Bumps [twilio-ruby](https://github.com/twilio/twilio-ruby) from 5.30.0 to 5.31.0. - [Release notes](https://github.com/twilio/twilio-ruby/releases) - [Changelog](https://github.com/twilio/twilio-ruby/blob/master/CHANGES.md) - [Commits](https://github.com/twilio/twilio-ruby/compare/5.30.0...5.31.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3f2319c96..f57456c68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -404,7 +404,7 @@ GEM thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) - twilio-ruby (5.30.0) + twilio-ruby (5.31.0) faraday (~> 0.9) jwt (>= 1.5, <= 2.5) nokogiri (>= 1.6, < 2.0) From a15d3b640abae29713e3276e1cdc14280b988a81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Tue, 17 Dec 2019 09:11:24 +0300 Subject: [PATCH 056/216] Delete .gitattributes --- .gitattributes | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 741b99403..000000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -*.tar.gz filter=lfs diff=lfs merge=lfs -text -*.gz filter=lfs diff=lfs merge=lfs -text From e0d3fe38cec6d79cce75437823bc6505d2857ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Tekinaslan?= Date: Tue, 17 Dec 2019 11:10:25 +0300 Subject: [PATCH 057/216] Use native Rails method instead of git command --- lib/tasks/s3.rake | 91 ++--------------------------------------------- 1 file changed, 3 insertions(+), 88 deletions(-) diff --git a/lib/tasks/s3.rake b/lib/tasks/s3.rake index 550e5cd64..5c25de57d 100644 --- a/lib/tasks/s3.rake +++ b/lib/tasks/s3.rake @@ -1,97 +1,12 @@ # frozen_string_literal: true require 'aws-sdk-s3' -require 'fileutils' -require 'open3' require 'singleton' -# Adapted from https://github.com/omu/zoo/blob/master/git-import/git-import -module Shell - Result = Struct.new :args, :out, :err, :exit_code do - def outline - out.first - end - - # :reek:NilCheck - def ok? - exit_code&.zero? - end - - def notok? - !ok? - end - - def command - args.join ' ' - end - end - - # Adapted to popen3 from github.com/mina-deploy/mina - class Runner - def initialize - @coathooks = 0 - end - - def run(*args) - return dummy_result if args.empty? - - out, err, status = - Open3.popen3(*args) do |_, stdout, stderr, wait_thread| - block(stdout, stderr, wait_thread) - end - Result.new args, out, err, status.exitstatus - end - - private - - attr_reader :coathooks - - def block(stdout, stderr, wait_thread) - # Handle `^C` - trap('INT') { handle_sigint(wait_thread.pid) } - - out = stdout.readlines.map(&:chomp) - err = stderr.readlines.map(&:chomp) - - [out, err, wait_thread.value] - end - - def handle_sigint(pid) - message, signal = message_and_signal - warn "\n" + message - ::Process.kill signal, pid - @coathooks += 1 - rescue Errno::ESRCH - warn 'No process to kill.' - end - - def message_and_signal - if coathooks > 1 - ['SIGINT received again. Force quitting...', 'KILL'] - else - ['SIGINT received.', 'TERM'] - end - end - end - - module_function - - def run(args, msg = nil) - warn msg if msg - Runner.new.run(*args) - end - - def run_or_die(args, msg = nil) - result = run(args, msg) - result.ok? || abort("Command failed with exit code #{result.exit_code}: #{result.command}") - result - end -end - class S3 include Singleton - TOPLEVEL = %w[git rev-parse --show-toplevel].freeze + TOPLEVEL = Rails.application.root BUCKET = 'static' def initialize(config = Tenant.credentials.config[:s3]) @@ -99,7 +14,7 @@ class S3 end def pull(file, bucket: BUCKET) - Dir.chdir(Shell.run_or_die(TOPLEVEL).outline) do + Dir.chdir(TOPLEVEL) do target = File.join(Dir.pwd, file) key = File.basename(target) FileUtils.mkdir_p File.dirname(target) @@ -110,7 +25,7 @@ class S3 end def push(file, bucket: BUCKET) - Dir.chdir(Shell.run_or_die(TOPLEVEL).outline) do + Dir.chdir(TOPLEVEL) do body = IO.read(File.join(Dir.pwd, file)) key = File.basename(file) client.put_object bucket: bucket, body: body, key: key From b680d68640520f2abe30088633725e0ebe8858a9 Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Tue, 17 Dec 2019 13:26:00 +0300 Subject: [PATCH 058/216] Add paper model test --- test/fixtures/papers.yml | 17 ++++++++++++ test/models/paper_test.rb | 56 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 test/fixtures/papers.yml create mode 100644 test/models/paper_test.rb diff --git a/test/fixtures/papers.yml b/test/fixtures/papers.yml new file mode 100644 index 000000000..e2222b5f5 --- /dev/null +++ b/test/fixtures/papers.yml @@ -0,0 +1,17 @@ +one: + activity: active + authors: Mine Uraslı + number_of_authors: 1 + country: turkey + discipline: Fen Bilimleri ve Matematik Temel Alanı + incentive_point: 1.5 + language_of_publication: İngilizce + last_update: Fri 28 Feb 2014 17:35:42 EET +02:00 + name: Accurate Binary Decisions + presentation_type: verbal + publication_status: published + scope: international + type: summary + type_of_release: printed + user: mine + yoksis_id: 683676 diff --git a/test/models/paper_test.rb b/test/models/paper_test.rb new file mode 100644 index 000000000..b7a9841fa --- /dev/null +++ b/test/models/paper_test.rb @@ -0,0 +1,56 @@ +# frozen_string_literal: true + +require 'test_helper' + +class PaperTest < ActiveSupport::TestCase + extend Support::Minitest::AssociationHelper + extend Support::Minitest::EnumerationHelper + extend Support::Minitest::ValidationHelper + + # relations + belongs_to :user + belongs_to :country, optional: true + + # enums + enum activity: { deleted: 0, active: 1 } + enum presentation_type: { verbal: 33, guest_speaker: 39, poster: 38 } + enum publication_status: { unpublished: 0, published: 1, accepted: 2 } + enum scope: { national: 0, international: 1 } + enum type: { full_text: 36, summary: 37 } + enum type_of_release: { printed: 1, electronic: 2, printed_and_electronic: 3 } + + # validations: presence + validates_presence_of :activity + validates_presence_of :scope + validates_presence_of :yoksis_id + + # validations: length + validates_length_of :access_link, maximum: 2000 + validates_length_of :authors + validates_length_of :city + validates_length_of :discipline + validates_length_of :doi + validates_length_of :issn + validates_length_of :issue + validates_length_of :keywords, maximum: 4000 + validates_length_of :language_of_publication + validates_length_of :print_isbn + validates_length_of :special_issue + validates_length_of :sponsored_by + + # validations: numericality + validates_numericality_of :author_id + validates_numericality_of :number_of_authors + validates_numericality_of :incentive_point + validates_numericality_of :first_page + validates_numericality_of :last_page + validates_numericality_of :volume + validates_numericality_of :yoksis_id + validates_numerical_range :author_id, greater_than_or_equal_to: 0 + validates_numerical_range :number_of_authors, greater_than: 0 + validates_numerical_range :incentive_point, greater_than_or_equal_to: 0 + validates_numerical_range :first_page, greater_than: 0, less_than_or_equal_to: 15_000 + validates_numerical_range :last_page, greater_than: 0, less_than_or_equal_to: 15_000 + validates_numerical_range :volume, greater_than_or_equal_to: 0 + validates_numerical_range :yoksis_id, greater_than_or_equal_to: 0 +end From 804aca92f0ef096283443cb18e04749fadc26126 Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Tue, 17 Dec 2019 14:52:34 +0300 Subject: [PATCH 059/216] Add sample data for buildings and place type --- test/fixtures/buildings.yml | 42 ++++++++++++++++++----------------- test/fixtures/place_types.yml | 36 ++++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 29 deletions(-) diff --git a/test/fixtures/buildings.yml b/test/fixtures/buildings.yml index 63d3cd497..4e3489b81 100644 --- a/test/fixtures/buildings.yml +++ b/test/fixtures/buildings.yml @@ -1,23 +1,25 @@ -# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html +muhendislik_fakultesi_a_blok: + meksis_id: 1249030236 + name: Mühendislik Fakültesi / A Blok + code: Müh-fak-a + indoor_area: 4872.2 + active: true + place_type: egitim + unit: muhendislik_fakultesi -one: - meksis_id: 1 - name: MyString - code: MyString - indoor_area: 1.5 - latitude: 9.99 - longitude: 9.99 - active: false - place_type: one - unit: one +muhendislik_fakultesi_b_blok: + meksis_id: 1249030245 + name: Mühendislik Fakültesi / B Blok + code: Müh-fak-b + indoor_area: 4768.4 + active: true + place_type: egitim + unit: muhendislik_fakultesi -two: - meksis_id: 1 - name: MyString - code: MyString - indoor_area: 1.5 - latitude: 9.99 - longitude: 9.99 +egitim_fakultesi_d_blok: + meksis_id: 1249030245 + name: Eğitim Fakültesi / D Blok + code: Eğıtım-d active: false - place_type: two - unit: two + place_type: egitim + unit: egitim_fakultesi diff --git a/test/fixtures/place_types.yml b/test/fixtures/place_types.yml index 47bb86542..817214854 100644 --- a/test/fixtures/place_types.yml +++ b/test/fixtures/place_types.yml @@ -1,11 +1,29 @@ -# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: +egitim: meksis_id: 1 - name: MyString - ancestry: MyString + name: Eğitim -two: - meksis_id: 1 - name: MyString - ancestry: MyString +arastirma: + meksis_id: 2 + name: Araştırma + +yonetim: + meksis_id: 3 + name: Yönetim + +saglik_hizmeti: + meksis_id: 4 + name: Sağlık Hizmeti + +kutuphane: + meksis_id: 5 + name: Kütüphane + +derslik: + meksis_id: 11 + name: Derslik + ancestry: <%= ActiveRecord::FixtureSet.identify(:egitim) %> + +amfi: + meksis_id: 12 + name: amfi + ancestry: <%= ActiveRecord::FixtureSet.identify(:egitim) %> From c1bf2afa2e6dd9dca22bd97e6d53a69cc24fa924 Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Tue, 17 Dec 2019 14:53:21 +0300 Subject: [PATCH 060/216] Add building model test --- test/models/building_test.rb | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/test/models/building_test.rb b/test/models/building_test.rb index f01604cd8..4b96e748e 100644 --- a/test/models/building_test.rb +++ b/test/models/building_test.rb @@ -3,7 +3,21 @@ require 'test_helper' class BuildingTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end + extend Support::Minitest::AssociationHelper + + # relations + belongs_to :place_type + belongs_to :unit + has_many :classrooms, dependent: :destroy + + # scopes + test 'actives scope returns active buildings' do + assert_includes(Building.actives, buildings(:muhendislik_fakultesi_a_blok)) + assert_not_includes(Building.actives, buildings(:egitim_fakultesi_d_blok)) + end + + test 'passives scope returns passive buildings' do + assert_includes(Building.passives, buildings(:egitim_fakultesi_d_blok)) + assert_not_includes(Building.passives, buildings(:muhendislik_fakultesi_a_blok)) + end end From bc6a85c08cbc05e3c17f457fc5b1b49c25ae5ea8 Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Wed, 18 Dec 2019 09:13:24 +0300 Subject: [PATCH 061/216] Add missing translations --- .../controllers/course_management/available_courses.en.yml | 7 +++++++ .../controllers/course_management/available_courses.tr.yml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/config/locales/controllers/course_management/available_courses.en.yml b/config/locales/controllers/course_management/available_courses.en.yml index 2c8f903fc..e6eb4b894 100644 --- a/config/locales/controllers/course_management/available_courses.en.yml +++ b/config/locales/controllers/course_management/available_courses.en.yml @@ -8,6 +8,13 @@ en: curriculum: Curriculum groups: Groups unit: Unit + available_course/groups: + name: Group Name + quota: Quota + lecturers: Lecturers + available_course/groups/lecturers: + lecturer: Lecturer + coordinator: Coordinator cocoon: groups: add: Add Group diff --git a/config/locales/controllers/course_management/available_courses.tr.yml b/config/locales/controllers/course_management/available_courses.tr.yml index 85ab509f0..939d32436 100644 --- a/config/locales/controllers/course_management/available_courses.tr.yml +++ b/config/locales/controllers/course_management/available_courses.tr.yml @@ -8,6 +8,13 @@ tr: curriculum: Müfredat groups: Gruplar unit: Birim + available_course/groups: + name: Grup Adı + quota: Kontenjan + lecturers: Öğretim elemanları + available_course/groups/lecturers: + lecturer: Öğretim Elemanı + coordinator: Koordinatör cocoon: groups: add: Grup Ekle From 07127cee894e4b1f2a8406e7c03fab86f4be5e31 Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Wed, 18 Dec 2019 09:40:52 +0300 Subject: [PATCH 062/216] Add place type model test --- test/models/place_type_test.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/models/place_type_test.rb b/test/models/place_type_test.rb index 03578a055..06c44b423 100644 --- a/test/models/place_type_test.rb +++ b/test/models/place_type_test.rb @@ -3,7 +3,14 @@ require 'test_helper' class PlaceTypeTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end + extend Support::Minitest::AssociationHelper + + # relations + has_one :building, dependent: :destroy + has_one :classroom, dependent: :destroy + + # custom methods + test 'number_of_children method' do + assert_equal place_types(:egitim).children.count, place_types(:egitim).number_of_children + end end From a1a0f94a2922e6fc5f2c57ab19b9f8a555ac926e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2019 19:51:25 +0000 Subject: [PATCH 063/216] chore(deps): [security] bump rack from 2.0.7 to 2.0.8 Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8. **This update includes a security fix.** - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ef83185b4..2159a3aea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,7 +279,7 @@ GEM pundit (2.1.0) activesupport (>= 3.0.0) pwned (2.0.0) - rack (2.0.7) + rack (2.0.8) rack-attack (6.2.1) rack (>= 1.0, < 3) rack-mini-profiler (1.1.4) From a5049f9934239993aa940ff64f2e279d01708b0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2019 20:16:10 +0000 Subject: [PATCH 064/216] chore(deps): bump rack from 2.0.7 to 2.0.8 in /plugins/tenant/common Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8) Signed-off-by: dependabot[bot] --- plugins/tenant/common/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/tenant/common/Gemfile.lock b/plugins/tenant/common/Gemfile.lock index f32aa17b4..052b54ef2 100644 --- a/plugins/tenant/common/Gemfile.lock +++ b/plugins/tenant/common/Gemfile.lock @@ -93,7 +93,7 @@ GEM nio4r (2.5.2) nokogiri (1.10.5) mini_portile2 (~> 2.4.0) - rack (2.0.7) + rack (2.0.8) rack-test (1.1.0) rack (>= 1.0, < 3) rails (6.0.1) From 943781c6953fe9bf8f685c684e3a003a5fab140d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2019 20:16:11 +0000 Subject: [PATCH 065/216] chore(deps): bump rack from 2.0.7 to 2.0.8 in /plugins/tenant/omu Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8) Signed-off-by: dependabot[bot] --- plugins/tenant/omu/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/tenant/omu/Gemfile.lock b/plugins/tenant/omu/Gemfile.lock index 66f21def7..cd6b1ea8e 100644 --- a/plugins/tenant/omu/Gemfile.lock +++ b/plugins/tenant/omu/Gemfile.lock @@ -100,7 +100,7 @@ GEM nio4r (2.5.2) nokogiri (1.10.5) mini_portile2 (~> 2.4.0) - rack (2.0.7) + rack (2.0.8) rack-test (1.1.0) rack (>= 1.0, < 3) rails (6.0.1) From 145f08d2360b63b09b417fe540d724100ab11ffd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2019 20:16:11 +0000 Subject: [PATCH 066/216] chore(deps): bump rack from 2.0.7 to 2.0.8 in /plugins/tenant/acme Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8) Signed-off-by: dependabot[bot] --- plugins/tenant/acme/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/tenant/acme/Gemfile.lock b/plugins/tenant/acme/Gemfile.lock index 609ade97b..fe8630254 100644 --- a/plugins/tenant/acme/Gemfile.lock +++ b/plugins/tenant/acme/Gemfile.lock @@ -100,7 +100,7 @@ GEM nio4r (2.5.2) nokogiri (1.10.5) mini_portile2 (~> 2.4.0) - rack (2.0.7) + rack (2.0.8) rack-test (1.1.0) rack (>= 1.0, < 3) rails (6.0.1) From 43232f4090e2ae86646977b93e6815d704deb021 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2019 20:16:12 +0000 Subject: [PATCH 067/216] chore(deps): bump rack from 2.0.7 to 2.0.8 in /plugins/support Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8) Signed-off-by: dependabot[bot] --- plugins/support/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/support/Gemfile.lock b/plugins/support/Gemfile.lock index fc0b20ab2..5ca96b0c6 100644 --- a/plugins/support/Gemfile.lock +++ b/plugins/support/Gemfile.lock @@ -87,7 +87,7 @@ GEM nio4r (2.5.2) nokogiri (1.10.5) mini_portile2 (~> 2.4.0) - rack (2.0.7) + rack (2.0.8) rack-test (1.1.0) rack (>= 1.0, < 3) rails (6.0.1) From f85517102e8fb1a5bde7073a87c577d2068b9de1 Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Thu, 19 Dec 2019 11:55:44 +0300 Subject: [PATCH 068/216] Add classroom model test --- test/fixtures/buildings.yml | 9 +++++++ test/fixtures/classrooms.yml | 48 ++++++++++++++--------------------- test/models/classroom_test.rb | 8 +++--- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/test/fixtures/buildings.yml b/test/fixtures/buildings.yml index 4e3489b81..9eb4ad8a6 100644 --- a/test/fixtures/buildings.yml +++ b/test/fixtures/buildings.yml @@ -16,6 +16,15 @@ muhendislik_fakultesi_b_blok: place_type: egitim unit: muhendislik_fakultesi +muhendislik_fakultesi_c_blok: + meksis_id: 1249030246 + name: Mühendislik Fakültesi / C Blok + code: Müh-fak-c + indoor_area: 14606.6 + active: true + place_type: egitim + unit: muhendislik_fakultesi + egitim_fakultesi_d_blok: meksis_id: 1249030245 name: Eğitim Fakültesi / D Blok diff --git a/test/fixtures/classrooms.yml b/test/fixtures/classrooms.yml index 5c3d7c7c4..14e0b5bae 100644 --- a/test/fixtures/classrooms.yml +++ b/test/fixtures/classrooms.yml @@ -1,31 +1,21 @@ -# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - meksis_id: 1 - name: MyString - code: MyString +muh_fak_c_z1: + meksis_id: 44868 + name: Müh-fak-c-z-1 + code: Ed-z-1 room_number: 1 - student_capacity: 1 - exam_capacity: 1 - available_space: 1.5 - height: 1.5 - width: 1.5 - length: 1.5 - volume: 1.5 - place_type: one - building: one + student_capacity: 72 + exam_capacity: 36 + available_space: 59.7 + place_type: derslik + building: muhendislik_fakultesi_c_blok -two: - meksis_id: 1 - name: MyString - code: MyString - room_number: 1 - student_capacity: 1 - exam_capacity: 1 - available_space: 1.5 - height: 1.5 - width: 1.5 - length: 1.5 - volume: 1.5 - place_type: two - building: two +muh_fak_c_z2: + meksis_id: 44874 + name: Müh-fak-c-z-2 + code: Ed-z-2 + room_number: 2 + student_capacity: 72 + exam_capacity: 36 + available_space: 59.7 + place_type: derslik + building: muhendislik_fakultesi_c_blok diff --git a/test/models/classroom_test.rb b/test/models/classroom_test.rb index d7c23f7b9..99cac834f 100644 --- a/test/models/classroom_test.rb +++ b/test/models/classroom_test.rb @@ -3,7 +3,9 @@ require 'test_helper' class ClassroomTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end + extend Support::Minitest::AssociationHelper + + # relations + belongs_to :place_type + belongs_to :building end From b96ab207200363e0492f956343328ee0d0a286da Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Fri, 20 Dec 2019 10:41:27 +0300 Subject: [PATCH 069/216] Fix meksis routes --- config/routes/meksis.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/routes/meksis.rb b/config/routes/meksis.rb index 2151d4777..24cff8b78 100644 --- a/config/routes/meksis.rb +++ b/config/routes/meksis.rb @@ -3,8 +3,8 @@ namespace :meksis do get '/', to: 'dashboard#index' - resources :place_types - resources :buildings do - resources :classrooms + resources :place_types, only: %i[index show] + resources :buildings, except: %i[new create destroy] do + resources :classrooms, only: %i[index show] end end From 212c65607cc8a517f78e1b1ede7c94fd3ded2cbf Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Fri, 20 Dec 2019 10:43:20 +0300 Subject: [PATCH 070/216] Create building controller test --- .../controllers/meksis/buildings.en.yml | 2 ++ .../controllers/meksis/buildings.tr.yml | 2 ++ .../meksis/buildings_controller_test.rb | 34 +++++++++++++++++-- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/config/locales/controllers/meksis/buildings.en.yml b/config/locales/controllers/meksis/buildings.en.yml index 3b2aa6d01..8f24dab2c 100644 --- a/config/locales/controllers/meksis/buildings.en.yml +++ b/config/locales/controllers/meksis/buildings.en.yml @@ -49,3 +49,5 @@ en: chart_of_available_spaces: Numeric Distribution of Available Spaces by Classroom chart_of_classrooms: Numeric Distribution of Classrooms by Place Type chart_of_place_numbers: Numeric Distribution of Place Numbers by Place Type + update: + success: Building successfully updated. diff --git a/config/locales/controllers/meksis/buildings.tr.yml b/config/locales/controllers/meksis/buildings.tr.yml index 0b123f6b7..7a36fd6a5 100644 --- a/config/locales/controllers/meksis/buildings.tr.yml +++ b/config/locales/controllers/meksis/buildings.tr.yml @@ -49,3 +49,5 @@ tr: chart_of_available_spaces: Sınıf Tiplerine Göre Mevcut Alan Miktarı chart_of_classrooms: Mekan Türüne Göre Sınıflar chart_of_place_numbers: Türüne Göre Mekan Sayıları + update: + success: Bina başarıyla güncellenmiştir. diff --git a/test/controllers/meksis/buildings_controller_test.rb b/test/controllers/meksis/buildings_controller_test.rb index cbb3a213b..c7ed4c5c6 100644 --- a/test/controllers/meksis/buildings_controller_test.rb +++ b/test/controllers/meksis/buildings_controller_test.rb @@ -4,8 +4,36 @@ module Meksis class BuildingsControllerTest < ActionDispatch::IntegrationTest - # test "the truth" do - # assert true - # end + setup do + @user = users(:john) + @building = buildings(:muhendislik_fakultesi_a_blok) + sign_in @user + end + + test 'should get index' do + get meksis_buildings_path + assert_response :success + end + + test 'should get show' do + get meksis_building_path(@building) + assert_response :success + end + + test 'should update buildings' do + patch meksis_building_path(@building), params: { + building: { + latitude: 41.36442543, + longitude: 36.18540287 + } + } + + @building.reload + + assert_equal @building.latitude, 41.36442543 + assert_equal @building.longitude, 36.18540287 + assert_redirected_to meksis_building_path(@building) + assert_equal translate('meksis.buildings.update.success'), flash[:notice] + end end end From 2d8c414b92fc56ac6e03d833452796324a8abe8b Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Fri, 20 Dec 2019 10:44:10 +0300 Subject: [PATCH 071/216] Create place type and meksis dashboard controller test --- .../meksis/dashboard_controller_test.rb | 11 ++++++++--- .../meksis/place_types_controller_test.rb | 17 ++++++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/test/controllers/meksis/dashboard_controller_test.rb b/test/controllers/meksis/dashboard_controller_test.rb index 4f4f1dd9b..d94328359 100644 --- a/test/controllers/meksis/dashboard_controller_test.rb +++ b/test/controllers/meksis/dashboard_controller_test.rb @@ -4,8 +4,13 @@ module Meksis class DashboardControllerTest < ActionDispatch::IntegrationTest - # test "the truth" do - # assert true - # end + setup do + sign_in users(:john) + end + + test 'should get index' do + get meksis_path + assert_response :success + end end end diff --git a/test/controllers/meksis/place_types_controller_test.rb b/test/controllers/meksis/place_types_controller_test.rb index 71381505f..7f44637cd 100644 --- a/test/controllers/meksis/place_types_controller_test.rb +++ b/test/controllers/meksis/place_types_controller_test.rb @@ -4,8 +4,19 @@ module Meksis class PlaceTypesControllerTest < ActionDispatch::IntegrationTest - # test "the truth" do - # assert true - # end + setup do + @user = users(:john) + sign_in @user + end + + test 'should get index' do + get meksis_place_types_path + assert_response :success + end + + test 'should get show' do + get meksis_place_type_path(place_types(:egitim)) + assert_response :success + end end end From 2afdf5613fb314297e98e525397b340d24cc2974 Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Fri, 20 Dec 2019 11:05:04 +0300 Subject: [PATCH 072/216] Create classroom controller test remove redundant assignment --- .../meksis/classrooms_controller_test.rb | 17 ++++++++++++++--- .../meksis/place_types_controller_test.rb | 3 +-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/test/controllers/meksis/classrooms_controller_test.rb b/test/controllers/meksis/classrooms_controller_test.rb index 0afd37976..a7ddc7d2f 100644 --- a/test/controllers/meksis/classrooms_controller_test.rb +++ b/test/controllers/meksis/classrooms_controller_test.rb @@ -4,8 +4,19 @@ module Meksis class ClassroomsControllerTest < ActionDispatch::IntegrationTest - # test "the truth" do - # assert true - # end + setup do + sign_in users(:john) + @building = buildings(:muhendislik_fakultesi_c_blok) + end + + test 'should get index' do + get meksis_building_classrooms_path(@building) + assert_response :success + end + + test 'should get show' do + get meksis_building_classroom_path(@building, @building.classrooms.first) + assert_response :success + end end end diff --git a/test/controllers/meksis/place_types_controller_test.rb b/test/controllers/meksis/place_types_controller_test.rb index 7f44637cd..52bff6a6c 100644 --- a/test/controllers/meksis/place_types_controller_test.rb +++ b/test/controllers/meksis/place_types_controller_test.rb @@ -5,8 +5,7 @@ module Meksis class PlaceTypesControllerTest < ActionDispatch::IntegrationTest setup do - @user = users(:john) - sign_in @user + sign_in users(:john) end test 'should get index' do From 6292ea7322d8933d5bc58cd07486b0bd1734c119 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:16:01 +0000 Subject: [PATCH 073/216] chore(deps): bump browserslist from 4.8.0 to 4.8.2 Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.8.0 to 4.8.2. - [Release notes](https://github.com/browserslist/browserslist/releases) - [Changelog](https://github.com/browserslist/browserslist/blob/master/CHANGELOG.md) - [Commits](https://github.com/browserslist/browserslist/compare/4.8.0...4.8.2) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 86 ++++++++++++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 48 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4cece4166..bc6a5f170 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1536,16 +1536,7 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.6.4: - version "4.8.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.0.tgz#6f06b0f974a7cc3a84babc2ccc56493668e3c789" - integrity sha512-HYnxc/oLRWvJ3TsGegR0SRL/UDnknGq2s/a8dYYEO+kOQ9m9apKoS5oiathLKZdh/e9uE+/J3j92qPlGD/vTqA== - dependencies: - caniuse-lite "^1.0.30001012" - electron-to-chromium "^1.3.317" - node-releases "^1.1.41" - -browserslist@^4.8.2: +browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.6.4, browserslist@^4.8.2: version "4.8.2" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289" integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA== @@ -1710,20 +1701,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981: - version "1.0.30001005" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001005.tgz#823054210be638c725521edcb869435dae46728d" - integrity sha512-g78miZm1Z5njjYR216a5812oPiLgV1ssndgGxITHWUopmjUrCswMisA0a2kSB7a0vZRox6JOKhM51+efmYN8Mg== - -caniuse-lite@^1.0.30001012: - version "1.0.30001012" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001012.tgz#653ec635e815b9e0fb801890923b0c2079eb34ec" - integrity sha512-7RR4Uh04t9K1uYRWzOJmzplgEOAXbfK72oVNokCdMzA67trrhPzy93ahKk1AWHiA0c58tD2P+NHqxrA8FZ+Trg== - -caniuse-lite@^1.0.30001015: - version "1.0.30001015" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0" - integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001015: + version "1.0.30001016" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001016.tgz#16ea48d7d6e8caf3cad3295c2d746fe38c4e7f66" + integrity sha512-yYQ2QfotceRiH4U+h1Us86WJXtVHDmy3nEKIdYPsZCYnOV5/tMgGbmoIlrMzmh2VXlproqYtVaKeGDBkMZifFA== case-sensitive-paths-webpack-plugin@^2.2.0: version "2.2.0" @@ -2717,11 +2698,6 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.317: - version "1.3.320" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.320.tgz#3b101b4ba1db2f97da72f187826b4e78c30f30fd" - integrity sha512-GVyRfGaKs/Vsf915WDaK5NG9vfud8nJFyapyQcrVS+sp8IeMpfml/YMvhthXsSOLlc0rzwdtnkNJE/+q4EPbTA== - electron-to-chromium@^1.3.322: version "1.3.322" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8" @@ -2826,22 +2802,22 @@ es-abstract@^1.17.0-next.1: string.prototype.trimleft "^2.1.0" string.prototype.trimright "^2.1.0" -es-abstract@^1.17.0-next.1: - version "1.17.0-next.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172" - integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw== +es-abstract@^1.5.1: + version "1.17.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0.tgz#f42a517d0036a5591dbb2c463591dc8bb50309b1" + integrity sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" has "^1.0.3" has-symbols "^1.0.1" - is-callable "^1.1.4" - is-regex "^1.0.4" + is-callable "^1.1.5" + is-regex "^1.0.5" object-inspect "^1.7.0" object-keys "^1.1.1" object.assign "^4.1.0" - string.prototype.trimleft "^2.1.0" - string.prototype.trimright "^2.1.0" + string.prototype.trimleft "^2.1.1" + string.prototype.trimright "^2.1.1" es-abstract@^1.7.0: version "1.16.0" @@ -4241,6 +4217,11 @@ is-callable@^1.1.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-callable@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" + integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== + is-color-stop@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" @@ -4415,7 +4396,7 @@ is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= -is-regex@^1.0.4: +is-regex@^1.0.4, is-regex@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== @@ -5344,17 +5325,10 @@ node-pre-gyp@^0.12.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.41: - version "1.1.41" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.41.tgz#57674a82a37f812d18e3b26118aefaf53a00afed" - integrity sha512-+IctMa7wIs8Cfsa8iYzeaLTFwv5Y4r5jZud+4AnfymzeEXKBCavFX0KBgzVaPVqf0ywa6PrO8/b+bPqdwjGBSg== - dependencies: - semver "^6.3.0" - node-releases@^1.1.42: - version "1.1.42" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.42.tgz#a999f6a62f8746981f6da90627a8d2fc090bbad7" - integrity sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA== + version "1.1.43" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.43.tgz#2c6ca237f88ce11d49631f11190bb01f8d0549f2" + integrity sha512-Rmfnj52WNhvr83MvuAWHEqXVoZXCcDQssSOffU4n4XOL9sPrP61mSZ88g25NqmABDvH7PiAlFCzoSCSdzA293w== dependencies: semver "^6.3.0" @@ -7746,6 +7720,14 @@ string.prototype.trimleft@^2.1.0: define-properties "^1.1.3" function-bind "^1.1.1" +string.prototype.trimleft@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" + integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + string.prototype.trimright@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58" @@ -7754,6 +7736,14 @@ string.prototype.trimright@^2.1.0: define-properties "^1.1.3" function-bind "^1.1.1" +string.prototype.trimright@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" + integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" From 66c87e878f0b25a2b0240067791e180cdd9afc54 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:16:49 +0000 Subject: [PATCH 074/216] chore(deps): bump aws-sdk-kms from 1.26.0 to 1.27.0 Bumps [aws-sdk-kms](https://github.com/aws/aws-sdk-ruby) from 1.26.0 to 1.27.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-kms/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.26.0...1.27.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2159a3aea..4942be914 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,13 +92,13 @@ GEM authy (2.7.5) httpclient (>= 2.5.3.3) aws-eventstream (1.0.3) - aws-partitions (1.255.0) + aws-partitions (1.259.0) aws-sdk-core (3.86.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.26.0) + aws-sdk-kms (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.59.0) From 12fd5469ccf8cc38b110d1df51f7c2df6d2896c1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:17:24 +0000 Subject: [PATCH 075/216] chore(deps): bump aws-sdk-s3 from 1.59.0 to 1.60.1 Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.59.0 to 1.60.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.59.0...v1.60.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2159a3aea..4b009ccbc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,16 +92,16 @@ GEM authy (2.7.5) httpclient (>= 2.5.3.3) aws-eventstream (1.0.3) - aws-partitions (1.255.0) + aws-partitions (1.259.0) aws-sdk-core (3.86.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.26.0) + aws-sdk-kms (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.59.0) + aws-sdk-s3 (1.60.1) aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) From 181ad0f2a76c0148260e0b8fa53b99bf406ef076 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:17:31 +0000 Subject: [PATCH 076/216] chore(deps): bump intl-tel-input from 16.0.7 to 16.0.8 Bumps [intl-tel-input](https://github.com/jackocnr/intl-tel-input) from 16.0.7 to 16.0.8. - [Release notes](https://github.com/jackocnr/intl-tel-input/releases) - [Changelog](https://github.com/jackocnr/intl-tel-input/blob/master/CHANGELOG.md) - [Commits](https://github.com/jackocnr/intl-tel-input/compare/v16.0.7...v16.0.8) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 47 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 3bcad63f9..c801d68e1 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@rails/webpacker": "4.1.0", "chalk": "^3.0.0", "flatpickr": "^4.6.3", - "intl-tel-input": "^16.0.7", + "intl-tel-input": "^16.0.8", "jquery.maskedinput": "^1.4.1", "select2": "^4.0.12", "toastr": "^2.1.4", diff --git a/yarn.lock b/yarn.lock index 4cece4166..a1a891202 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2826,22 +2826,22 @@ es-abstract@^1.17.0-next.1: string.prototype.trimleft "^2.1.0" string.prototype.trimright "^2.1.0" -es-abstract@^1.17.0-next.1: - version "1.17.0-next.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172" - integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw== +es-abstract@^1.5.1: + version "1.17.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0.tgz#f42a517d0036a5591dbb2c463591dc8bb50309b1" + integrity sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" has "^1.0.3" has-symbols "^1.0.1" - is-callable "^1.1.4" - is-regex "^1.0.4" + is-callable "^1.1.5" + is-regex "^1.0.5" object-inspect "^1.7.0" object-keys "^1.1.1" object.assign "^4.1.0" - string.prototype.trimleft "^2.1.0" - string.prototype.trimright "^2.1.0" + string.prototype.trimleft "^2.1.1" + string.prototype.trimright "^2.1.1" es-abstract@^1.7.0: version "1.16.0" @@ -4143,10 +4143,10 @@ interpret@1.2.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== -intl-tel-input@^16.0.7: - version "16.0.7" - resolved "https://registry.yarnpkg.com/intl-tel-input/-/intl-tel-input-16.0.7.tgz#e9d69b608978fec846f93369b4bf4c6880641e5f" - integrity sha512-Ufus9DzgxUGt5NNSO5CNATusIvUkvMvjE6s4z9g+oeOQolw8zOul5ktMc8xjqPfZsNaWC2YmfcSFjHFjFTcyhg== +intl-tel-input@^16.0.8: + version "16.0.8" + resolved "https://registry.yarnpkg.com/intl-tel-input/-/intl-tel-input-16.0.8.tgz#b723a10774e5c09a450a4ffef205a722b058a0fc" + integrity sha512-/6psSwgqI9WvbeBr6d9Ac8tcprboPJovk6qqLuSmAxQzzGaGmk4D/lwWeYpesW75DfWRnooMvM1L8YKK72U4mw== invariant@^2.2.2: version "2.2.4" @@ -4241,6 +4241,11 @@ is-callable@^1.1.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-callable@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" + integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== + is-color-stop@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" @@ -4415,7 +4420,7 @@ is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= -is-regex@^1.0.4: +is-regex@^1.0.4, is-regex@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== @@ -7746,6 +7751,14 @@ string.prototype.trimleft@^2.1.0: define-properties "^1.1.3" function-bind "^1.1.1" +string.prototype.trimleft@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" + integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + string.prototype.trimright@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58" @@ -7754,6 +7767,14 @@ string.prototype.trimright@^2.1.0: define-properties "^1.1.3" function-bind "^1.1.1" +string.prototype.trimright@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" + integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" From 552c28c7c916729870f0a03a8f1c69c8c5283a9a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:18:09 +0000 Subject: [PATCH 077/216] chore(deps): bump rack-attack from 6.2.1 to 6.2.2 Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 6.2.1 to 6.2.2. - [Release notes](https://github.com/kickstarter/rack-attack/releases) - [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/kickstarter/rack-attack/compare/v6.2.1...v6.2.2) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2159a3aea..a40a0cecc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,7 +280,7 @@ GEM activesupport (>= 3.0.0) pwned (2.0.0) rack (2.0.8) - rack-attack (6.2.1) + rack-attack (6.2.2) rack (>= 1.0, < 3) rack-mini-profiler (1.1.4) rack (>= 1.2.0) From de406e08175864e84b897f544f38fac8d1acf6db Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:18:30 +0000 Subject: [PATCH 078/216] chore(deps): bump terser-webpack-plugin from 1.4.1 to 1.4.3 Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 1.4.1 to 1.4.3. - [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/v1.4.3/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v1.4.1...v1.4.3) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 79 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4cece4166..0957f8ad8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2826,22 +2826,22 @@ es-abstract@^1.17.0-next.1: string.prototype.trimleft "^2.1.0" string.prototype.trimright "^2.1.0" -es-abstract@^1.17.0-next.1: - version "1.17.0-next.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172" - integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw== +es-abstract@^1.5.1: + version "1.17.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0.tgz#f42a517d0036a5591dbb2c463591dc8bb50309b1" + integrity sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" has "^1.0.3" has-symbols "^1.0.1" - is-callable "^1.1.4" - is-regex "^1.0.4" + is-callable "^1.1.5" + is-regex "^1.0.5" object-inspect "^1.7.0" object-keys "^1.1.1" object.assign "^4.1.0" - string.prototype.trimleft "^2.1.0" - string.prototype.trimright "^2.1.0" + string.prototype.trimleft "^2.1.1" + string.prototype.trimright "^2.1.1" es-abstract@^1.7.0: version "1.16.0" @@ -3603,7 +3603,7 @@ glob@7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1, glob@~7.1.2: +glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1, glob@~7.1.2: version "7.1.5" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0" integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ== @@ -3615,7 +3615,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.6: +glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -4241,6 +4241,11 @@ is-callable@^1.1.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-callable@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" + integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== + is-color-stop@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" @@ -4415,7 +4420,7 @@ is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= -is-regex@^1.0.4: +is-regex@^1.0.4, is-regex@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== @@ -7321,11 +7326,6 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -serialize-javascript@^1.7.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb" - integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A== - serialize-javascript@^2.1.1, serialize-javascript@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" @@ -7694,9 +7694,9 @@ stream-http@^2.7.2: xtend "^4.0.0" stream-shift@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" - integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= + version "1.0.1" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" + integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== strict-uri-encode@^1.0.0: version "1.1.0" @@ -7746,6 +7746,14 @@ string.prototype.trimleft@^2.1.0: define-properties "^1.1.3" function-bind "^1.1.1" +string.prototype.trimleft@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" + integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + string.prototype.trimright@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58" @@ -7754,6 +7762,14 @@ string.prototype.trimright@^2.1.0: define-properties "^1.1.3" function-bind "^1.1.1" +string.prototype.trimright@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" + integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -7940,15 +7956,15 @@ tar@^4: yallist "^3.0.3" terser-webpack-plugin@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4" - integrity sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg== + version "1.4.3" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" + integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA== dependencies: cacache "^12.0.2" find-cache-dir "^2.1.0" is-wsl "^1.1.0" schema-utils "^1.0.0" - serialize-javascript "^1.7.0" + serialize-javascript "^2.1.2" source-map "^0.6.1" terser "^4.1.2" webpack-sources "^1.4.0" @@ -7968,19 +7984,10 @@ terser-webpack-plugin@^2.2.1: terser "^4.4.2" webpack-sources "^1.4.3" -terser@^4.1.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.1.tgz#f3a469c125d9a0eb52f1e6a7fdff587bd6e35902" - integrity sha512-e05giplw+8sIYh50qXYHZmr0b76O5dOSm9JwSDebGFLri4ItYzxsnumiAK+yuI56R+H7uIjT9KbVEKNkrprzHw== - dependencies: - commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" - -terser@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.2.tgz#448fffad0245f4c8a277ce89788b458bfd7706e8" - integrity sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ== +terser@^4.1.2, terser@^4.4.2: + version "4.4.3" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.3.tgz#401abc52b88869cf904412503b1eb7da093ae2f0" + integrity sha512-0ikKraVtRDKGzHrzkCv5rUNDzqlhmhowOBqC0XqUHFpW+vJ45+20/IFBcebwKfiS2Z9fJin6Eo+F1zLZsxi8RA== dependencies: commander "^2.20.0" source-map "~0.6.1" From a87b01de09845c121d6d889c61145772e30ee0c6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:18:37 +0000 Subject: [PATCH 079/216] chore(deps): bump request_store from 1.4.1 to 1.5.0 Bumps [request_store](https://github.com/steveklabnik/request_store) from 1.4.1 to 1.5.0. - [Release notes](https://github.com/steveklabnik/request_store/releases) - [Commits](https://github.com/steveklabnik/request_store/compare/v1.4.1...v1.5.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2159a3aea..4798494e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -332,7 +332,7 @@ GEM rein (5.0.0) activerecord (>= 4.0.0) activesupport (>= 4.0.0) - request_store (1.4.1) + request_store (1.5.0) rack (>= 1.4) responders (3.0.0) actionpack (>= 5.0) From 829b7f034c8cc4f9a7546fc9af0babf207cf168e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:19:41 +0000 Subject: [PATCH 080/216] chore(deps): bump rollbar from 2.22.1 to 2.23.1 Bumps [rollbar](https://github.com/rollbar/rollbar-gem) from 2.22.1 to 2.23.1. - [Release notes](https://github.com/rollbar/rollbar-gem/releases) - [Changelog](https://github.com/rollbar/rollbar-gem/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollbar/rollbar-gem/compare/v2.22.1...v2.23.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2159a3aea..5dbdc4f90 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -337,7 +337,7 @@ GEM responders (3.0.0) actionpack (>= 5.0) railties (>= 5.0) - rollbar (2.22.1) + rollbar (2.23.1) rubocop (0.77.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) From 6f853f9b11149bbfa8afd7b2e1dba547a6afab30 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:19:55 +0000 Subject: [PATCH 081/216] chore(deps): bump string.prototype.trimleft from 2.1.0 to 2.1.1 Bumps [string.prototype.trimleft](https://github.com/es-shims/String.prototype.trimLeft) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/es-shims/String.prototype.trimLeft/releases) - [Changelog](https://github.com/es-shims/String.prototype.trimLeft/blob/master/CHANGELOG.md) - [Commits](https://github.com/es-shims/String.prototype.trimLeft/compare/v2.1.0...v2.1.1) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4cece4166..8717ddee7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2826,22 +2826,22 @@ es-abstract@^1.17.0-next.1: string.prototype.trimleft "^2.1.0" string.prototype.trimright "^2.1.0" -es-abstract@^1.17.0-next.1: - version "1.17.0-next.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172" - integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw== +es-abstract@^1.5.1: + version "1.17.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0.tgz#f42a517d0036a5591dbb2c463591dc8bb50309b1" + integrity sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" has "^1.0.3" has-symbols "^1.0.1" - is-callable "^1.1.4" - is-regex "^1.0.4" + is-callable "^1.1.5" + is-regex "^1.0.5" object-inspect "^1.7.0" object-keys "^1.1.1" object.assign "^4.1.0" - string.prototype.trimleft "^2.1.0" - string.prototype.trimright "^2.1.0" + string.prototype.trimleft "^2.1.1" + string.prototype.trimright "^2.1.1" es-abstract@^1.7.0: version "1.16.0" @@ -4241,6 +4241,11 @@ is-callable@^1.1.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-callable@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" + integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== + is-color-stop@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" @@ -4415,7 +4420,7 @@ is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= -is-regex@^1.0.4: +is-regex@^1.0.4, is-regex@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== @@ -7738,10 +7743,10 @@ string-width@^4.1.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.trimleft@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634" - integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw== +string.prototype.trimleft@^2.1.0, string.prototype.trimleft@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" + integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== dependencies: define-properties "^1.1.3" function-bind "^1.1.1" @@ -7754,6 +7759,14 @@ string.prototype.trimright@^2.1.0: define-properties "^1.1.3" function-bind "^1.1.1" +string.prototype.trimright@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" + integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" From 1df6ec12631e72408eecf9779eb2fdea06f7d4da Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:20:25 +0000 Subject: [PATCH 082/216] chore(deps): bump telephone_number from 1.4.4 to 1.4.5 Bumps [telephone_number](https://github.com/mobi/telephone_number) from 1.4.4 to 1.4.5. - [Release notes](https://github.com/mobi/telephone_number/releases) - [Commits](https://github.com/mobi/telephone_number/compare/v1.4.4...v1.4.5) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2159a3aea..fb76db328 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -400,7 +400,7 @@ GEM attr_required (>= 0.0.5) httpclient (>= 2.4) swearjar (1.3.1) - telephone_number (1.4.4) + telephone_number (1.4.5) thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) From 12451052a124367e10bab05bc66e880d3246f41b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:21:10 +0000 Subject: [PATCH 083/216] chore(deps): bump rails from 6.0.2 to 6.0.2.1 Bumps [rails](https://github.com/rails/rails) from 6.0.2 to 6.0.2.1. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v6.0.2...v6.0.2.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 102 +++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2159a3aea..9bf5036a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,56 +27,56 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.0.2) - actionpack (= 6.0.2) + actioncable (6.0.2.1) + actionpack (= 6.0.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.2) - actionpack (= 6.0.2) - activejob (= 6.0.2) - activerecord (= 6.0.2) - activestorage (= 6.0.2) - activesupport (= 6.0.2) + actionmailbox (6.0.2.1) + actionpack (= 6.0.2.1) + activejob (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) mail (>= 2.7.1) - actionmailer (6.0.2) - actionpack (= 6.0.2) - actionview (= 6.0.2) - activejob (= 6.0.2) + actionmailer (6.0.2.1) + actionpack (= 6.0.2.1) + actionview (= 6.0.2.1) + activejob (= 6.0.2.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.2) - actionview (= 6.0.2) - activesupport (= 6.0.2) - rack (~> 2.0) + actionpack (6.0.2.1) + actionview (= 6.0.2.1) + activesupport (= 6.0.2.1) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.2) - actionpack (= 6.0.2) - activerecord (= 6.0.2) - activestorage (= 6.0.2) - activesupport (= 6.0.2) + actiontext (6.0.2.1) + actionpack (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) nokogiri (>= 1.8.5) - actionview (6.0.2) - activesupport (= 6.0.2) + actionview (6.0.2.1) + activesupport (= 6.0.2.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.2) - activesupport (= 6.0.2) + activejob (6.0.2.1) + activesupport (= 6.0.2.1) globalid (>= 0.3.6) - activemodel (6.0.2) - activesupport (= 6.0.2) - activerecord (6.0.2) - activemodel (= 6.0.2) - activesupport (= 6.0.2) - activestorage (6.0.2) - actionpack (= 6.0.2) - activejob (= 6.0.2) - activerecord (= 6.0.2) + 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) + activestorage (6.0.2.1) + actionpack (= 6.0.2.1) + activejob (= 6.0.2.1) + activerecord (= 6.0.2.1) marcel (~> 0.3.1) - activesupport (6.0.2) + activesupport (6.0.2.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -296,29 +296,29 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.2) - actioncable (= 6.0.2) - actionmailbox (= 6.0.2) - actionmailer (= 6.0.2) - actionpack (= 6.0.2) - actiontext (= 6.0.2) - actionview (= 6.0.2) - activejob (= 6.0.2) - activemodel (= 6.0.2) - activerecord (= 6.0.2) - activestorage (= 6.0.2) - activesupport (= 6.0.2) + rails (6.0.2.1) + actioncable (= 6.0.2.1) + actionmailbox (= 6.0.2.1) + actionmailer (= 6.0.2.1) + actionpack (= 6.0.2.1) + actiontext (= 6.0.2.1) + actionview (= 6.0.2.1) + activejob (= 6.0.2.1) + activemodel (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) bundler (>= 1.3.0) - railties (= 6.0.2) + railties (= 6.0.2.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.2) - actionpack (= 6.0.2) - activesupport (= 6.0.2) + railties (6.0.2.1) + actionpack (= 6.0.2.1) + activesupport (= 6.0.2.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) From e11c491094e88d5cab910f70628bda2b476c824a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:21:40 +0000 Subject: [PATCH 084/216] chore(deps): bump aws-partitions from 1.255.0 to 1.259.0 Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.255.0 to 1.259.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2159a3aea..81a193a2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,7 +92,7 @@ GEM authy (2.7.5) httpclient (>= 2.5.3.3) aws-eventstream (1.0.3) - aws-partitions (1.255.0) + aws-partitions (1.259.0) aws-sdk-core (3.86.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) From 832be96fc8d683638e95862466ae8c09a42feb5d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:22:16 +0000 Subject: [PATCH 085/216] chore(deps): bump twilio-ruby from 5.31.0 to 5.31.1 Bumps [twilio-ruby](https://github.com/twilio/twilio-ruby) from 5.31.0 to 5.31.1. - [Release notes](https://github.com/twilio/twilio-ruby/releases) - [Changelog](https://github.com/twilio/twilio-ruby/blob/master/CHANGES.md) - [Commits](https://github.com/twilio/twilio-ruby/compare/5.31.0...5.31.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2159a3aea..ceae40fe3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -404,7 +404,7 @@ GEM thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) - twilio-ruby (5.31.0) + twilio-ruby (5.31.1) faraday (~> 0.9) jwt (>= 1.5, <= 2.5) nokogiri (>= 1.6, < 2.0) From 6ef2fe686444e8fcda6485ecd7e1996900e04a3d Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Mon, 23 Dec 2019 09:43:19 +0300 Subject: [PATCH 086/216] Create certification model test --- test/fixtures/certifications.yml | 16 +++++++++++ test/models/certification_test.rb | 47 +++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 test/fixtures/certifications.yml create mode 100644 test/models/certification_test.rb diff --git a/test/fixtures/certifications.yml b/test/fixtures/certifications.yml new file mode 100644 index 000000000..c95f0fcf1 --- /dev/null +++ b/test/fixtures/certifications.yml @@ -0,0 +1,16 @@ +one: + yoksis_id: 755 + type: research + name: Pyrimicroquik'in Düzce İlinde Fındık Kurduna Karşı Biyolojik Etkinlik Denemesi + content: Pyrimicroquik İsimli İlacın Ruhsata Esas Olmak Üzere Batı Karadeniz Bölgesinde Fındık Kurduna Karşı Biyolojik Etkinlik Denemesinin Kurulması + location: Fındık Bahçesi + scope: national + start_date: Mon, 02 Mar 2015 + end_date: Thu, 10 Sep 2015 + title: Doçent + number_of_authors: 3 + city_and_country: Düzce + last_update: Fri, 15 Jan 2016 20:43:56 EET +02:00 + incentive_point: 3.0 + status: active + user: john diff --git a/test/models/certification_test.rb b/test/models/certification_test.rb new file mode 100644 index 000000000..3033102ea --- /dev/null +++ b/test/models/certification_test.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +require 'test_helper' + +class CertificationTest < ActiveSupport::TestCase + extend Support::Minitest::AssociationHelper + extend Support::Minitest::EnumerationHelper + extend Support::Minitest::ValidationHelper + + # relations + belongs_to :user + + # enums + enum type: { + certification: 1, + course: 2, + research: 3, + study: 4, + report: 5, + workshop: 6, + interview: 7, + essay: 8, + evaluation: 9, + conversation: 10, + translation: 11 + } + enum scope: { national: 0, international: 1 } + enum status: { active: 1, passive: 2 } + + # validations: presence + validates_presence_of :title + validates_presence_of :yoksis_id + + # validations: length + validates_length_of :title + validates_length_of :name + validates_length_of :content, maximum: 65_535 + validates_length_of :location + validates_length_of :duration + validates_length_of :city_and_country + + # validations: numericality + validates_numericality_of :number_of_authors + validates_numericality_of :yoksis_id + validates_numerical_range :number_of_authors, greater_than: 0 + validates_numerical_range :yoksis_id, greater_than: 0 +end From def745db6e66a92658601e887971ec7d58a538c0 Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Mon, 23 Dec 2019 11:03:22 +0300 Subject: [PATCH 087/216] Fix typo --- test/fixtures/place_types.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixtures/place_types.yml b/test/fixtures/place_types.yml index 817214854..3627fe4fa 100644 --- a/test/fixtures/place_types.yml +++ b/test/fixtures/place_types.yml @@ -25,5 +25,5 @@ derslik: amfi: meksis_id: 12 - name: amfi + name: Amfi ancestry: <%= ActiveRecord::FixtureSet.identify(:egitim) %> From dc364af31845011bdebc60a8ae84615db7c1b21e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Mon, 23 Dec 2019 11:52:48 +0300 Subject: [PATCH 088/216] Bump rubocop from 0.77.0 to 0.78.0 --- .erb-lint.yml | 2 +- .rubocop.yml | 2 +- .rubocop_common.yml | 2 +- Gemfile.lock | 2 +- plugins/support/.rubocop.yml | 2 +- plugins/tenant/acme/.rubocop.yml | 2 +- plugins/tenant/common/.rubocop.yml | 6 +++++- plugins/tenant/omu/.rubocop.yml | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.erb-lint.yml b/.erb-lint.yml index 55b6b7c26..ac5e6e316 100644 --- a/.erb-lint.yml +++ b/.erb-lint.yml @@ -14,7 +14,7 @@ linters: Enabled: false Style/FrozenStringLiteralComment: Enabled: false - Metrics/LineLength: + Layout/LineLength: Enabled: false Lint/UselessAssignment: Enabled: false diff --git a/.rubocop.yml b/.rubocop.yml index cc6ba965d..f47a455e3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -11,7 +11,7 @@ Rails/UnknownEnv: - development - production - test -Metrics/LineLength: +Layout/LineLength: Exclude: - app/validators/employee_validator.rb # Won't fix Metrics/BlockLength: diff --git a/.rubocop_common.yml b/.rubocop_common.yml index f79509356..e06768be5 100644 --- a/.rubocop_common.yml +++ b/.rubocop_common.yml @@ -7,7 +7,7 @@ Layout/HashAlignment: EnforcedHashRocketStyle: table EnforcedColonStyle: table -Metrics/LineLength: +Layout/LineLength: Max: 120 Naming/MemoizedInstanceVariableName: diff --git a/Gemfile.lock b/Gemfile.lock index 638acc645..28f8d9b71 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -338,7 +338,7 @@ GEM actionpack (>= 5.0) railties (>= 5.0) rollbar (2.23.1) - rubocop (0.77.0) + rubocop (0.78.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) diff --git a/plugins/support/.rubocop.yml b/plugins/support/.rubocop.yml index dd1a8247a..f999f9487 100644 --- a/plugins/support/.rubocop.yml +++ b/plugins/support/.rubocop.yml @@ -4,7 +4,7 @@ Style/Lambda: Enabled: false Style/Documentation: Enabled: false -Metrics/LineLength: +Layout/LineLength: Max: 120 Naming/FileName: Exclude: diff --git a/plugins/tenant/acme/.rubocop.yml b/plugins/tenant/acme/.rubocop.yml index 3c2bd710b..e451261e9 100644 --- a/plugins/tenant/acme/.rubocop.yml +++ b/plugins/tenant/acme/.rubocop.yml @@ -4,7 +4,7 @@ Style/Lambda: Enabled: false Style/Documentation: Enabled: false -Metrics/LineLength: +Layout/LineLength: Max: 120 Naming/FileName: Exclude: diff --git a/plugins/tenant/common/.rubocop.yml b/plugins/tenant/common/.rubocop.yml index ce83d9883..7dcc86803 100644 --- a/plugins/tenant/common/.rubocop.yml +++ b/plugins/tenant/common/.rubocop.yml @@ -5,11 +5,15 @@ Style/Lambda: Enabled: false Style/Documentation: Enabled: false -Metrics/LineLength: +Layout/LineLength: Max: 120 Layout/HashAlignment: EnforcedHashRocketStyle: table EnforcedColonStyle: table +Lint/NonDeterministicRequireOrder: + Exclude: + - lib/nokul/tenant/tasks.rb + - lib/nokul/tenant/tests.rb Naming/FileName: Exclude: - lib/nokul-tenant.rb diff --git a/plugins/tenant/omu/.rubocop.yml b/plugins/tenant/omu/.rubocop.yml index 3c2bd710b..e451261e9 100644 --- a/plugins/tenant/omu/.rubocop.yml +++ b/plugins/tenant/omu/.rubocop.yml @@ -4,7 +4,7 @@ Style/Lambda: Enabled: false Style/Documentation: Enabled: false -Metrics/LineLength: +Layout/LineLength: Max: 120 Naming/FileName: Exclude: From 704861193a661ab5bf444f9bfda52146b098e14c Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Mon, 23 Dec 2019 12:26:36 +0300 Subject: [PATCH 089/216] Create article model test --- test/fixtures/articles.yml | 20 +++++++ test/models/article_test.rb | 104 ++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 test/fixtures/articles.yml create mode 100644 test/models/article_test.rb diff --git a/test/fixtures/articles.yml b/test/fixtures/articles.yml new file mode 100644 index 000000000..c54086900 --- /dev/null +++ b/test/fixtures/articles.yml @@ -0,0 +1,20 @@ +one: + yoksis_id: 669229 + scope: international + review: reviewed + index: sci_expanded + title: Bayesian İnference Of Bivariate Generalized Linear Model İn Diagnosing Renal Arterial Obstruction + authors: John Doe + number_of_authors: 1 + journal: The Statistical Methodology + language_of_publication: İngilizce + month: 1 + year: 2005 + volume: 2 + first_page: 168 + last_page: 174 + discipline: Fen Bilimleri ve Matematik Temel Alanı + last_update: Fri, 28 Feb 2014 15:44:10 EET +02:00 + status: active + type: original_article + user: john diff --git a/test/models/article_test.rb b/test/models/article_test.rb new file mode 100644 index 000000000..e53abca04 --- /dev/null +++ b/test/models/article_test.rb @@ -0,0 +1,104 @@ +# frozen_string_literal: true + +require 'test_helper' + +class ArticleTest < ActiveSupport::TestCase + extend Support::Minitest::AssociationHelper + extend Support::Minitest::EnumerationHelper + extend Support::Minitest::ValidationHelper + + # relations + belongs_to :user + + # enums + enum scope: { national: 0, international: 1 } + enum review: { reviewed: 0, unreviewed: 1 } + enum access_type: { printed: 1, electronic: 2, printed_and_electronic: 3 } + enum status: { deleted: 0, active: 1 } + + enum index: { + ssci: 5, + sci_expanded: 6, + ahci: 7, + field_indexes: 8, + well_established_indexes: 9, + sci: 40, + unindexed: 42, + turkish_index: 45, + ebsco: 46, + index_islamicus: 47, + index_medicus: 48, + dental_index: 49, + engineering_index: 50, + compumath_index: 51, + education_index: 52, + australian_education_index: 53, + british_education_index: 54, + eric: 55, + esci: 56, + index_chemicus: 59, + architectural_periodicals: 60, + design_and_applied_art: 61, + art_index: 62, + iconda: 63, + economics_abstracts: 64, + education_full_text: 65 + } + + enum type: { + original_article: 1, + technical_note: 2, + commentary: 3, + case_report: 4, + letter_to_the_editor: 5, + abstract: 6, + book_review: 7, + research_note: 8, + expert_report: 9, + review_article: 10, + short_article: 11 + } + + # validations: presence + validates_presence_of :authors + validates_presence_of :title + validates_presence_of :yoksis_id + + # validations: length + validates_length_of :access_link, maximum: 65_535 + validates_length_of :authors, maximum: 65_535 + validates_length_of :city + validates_length_of :discipline, maximum: 65_535 + validates_length_of :doi + validates_length_of :issn + validates_length_of :issue + validates_length_of :journal + validates_length_of :keyword + validates_length_of :language_of_publication + validates_length_of :special_issue_name + validates_length_of :sponsored_by + validates_length_of :title, maximum: 65_535 + validates_length_of :volume + + # validations: numericality + validates_numericality_of :author_id + validates_numericality_of :country + validates_numericality_of :first_page + validates_numericality_of :incentive_point + validates_numericality_of :last_page + validates_numericality_of :month + validates_numericality_of :number_of_authors + validates_numericality_of :special_issue + validates_numericality_of :year + validates_numericality_of :yoksis_id + validates_numerical_range :author_id, greater_than: 0 + validates_numerical_range :country, greater_than: 0 + validates_numerical_range :first_page, greater_than: 0, less_than_or_equal_to: 15_000 + validates_numerical_range :incentive_point, greater_than_or_equal_to: 0 + validates_numerical_range :last_page, greater_than: 0, less_than_or_equal_to: 15_000 + validates_numerical_range :month, greater_than: 0, less_than_or_equal_to: 12 + validates_numerical_range :number_of_authors, greater_than: 0 + validates_numerical_range :special_issue, greater_than_or_equal_to: 0 + validates_numerical_range :year, greater_than_or_equal_to: 1950, less_than_or_equal_to: 2050 + validates_numerical_range :yoksis_id, greater_than: 0 +end From 33993fe3ead585f6844e12355ead283c61e1447a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Mon, 23 Dec 2019 14:00:03 +0300 Subject: [PATCH 090/216] Upgrade js packages --- package.json | 2 +- yarn.lock | 592 ++++++++++++++++++++++----------------------------- 2 files changed, 255 insertions(+), 339 deletions(-) diff --git a/package.json b/package.json index c801d68e1..049acc305 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "nokul", "private": true, "dependencies": { - "@coreui/coreui-free-bootstrap-admin-template": "https://github.com/coreui/coreui-free-bootstrap-admin-template.git", + "@coreui/coreui-free-bootstrap-admin-template": "https://github.com/coreui/coreui-free-bootstrap-admin-template.git#master", "@rails/actioncable": "^6.0.0-alpha", "@rails/actiontext": "^6.0.2", "@rails/activestorage": "^6.0.0-alpha", diff --git a/yarn.lock b/yarn.lock index bd89a14fb..df10bc56e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,14 +10,14 @@ "@babel/highlight" "^7.0.0" "@babel/core@^7.7.2": - version "7.7.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.5.tgz#ae1323cd035b5160293307f50647e83f8ba62f7e" - integrity sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw== + version "7.7.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.7.tgz#ee155d2e12300bcc0cff6a8ad46f2af5063803e9" + integrity sha512-jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ== dependencies: "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.7.4" + "@babel/generator" "^7.7.7" "@babel/helpers" "^7.7.4" - "@babel/parser" "^7.7.5" + "@babel/parser" "^7.7.7" "@babel/template" "^7.7.4" "@babel/traverse" "^7.7.4" "@babel/types" "^7.7.4" @@ -29,10 +29,10 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369" - integrity sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg== +"@babel/generator@^7.7.4", "@babel/generator@^7.7.7": + version "7.7.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.7.tgz#859ac733c44c74148e1a72980a64ec84b85f4f45" + integrity sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ== dependencies: "@babel/types" "^7.7.4" jsesc "^2.5.1" @@ -232,10 +232,10 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.7.4", "@babel/parser@^7.7.5": - version "7.7.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71" - integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig== +"@babel/parser@^7.7.4", "@babel/parser@^7.7.7": + version "7.7.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.7.tgz#1b886595419cf92d811316d5b715a53ff38b4937" + integrity sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw== "@babel/plugin-proposal-async-generator-functions@^7.7.4": version "7.7.4" @@ -270,10 +270,10 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-json-strings" "^7.7.4" -"@babel/plugin-proposal-object-rest-spread@^7.6.2", "@babel/plugin-proposal-object-rest-spread@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71" - integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ== +"@babel/plugin-proposal-object-rest-spread@^7.6.2", "@babel/plugin-proposal-object-rest-spread@^7.7.7": + version "7.7.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.7.tgz#9f27075004ab99be08c5c1bd653a2985813cb370" + integrity sha512-3qp9I8lelgzNedI3hrhkvhaEYree6+WHnyA/q4Dza9z7iEIs1eyhWyJnetk3jJ69RT0AT4G0UhEGwyGFJ7GUuQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-object-rest-spread" "^7.7.4" @@ -286,10 +286,10 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-optional-catch-binding" "^7.7.4" -"@babel/plugin-proposal-unicode-property-regex@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb" - integrity sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA== +"@babel/plugin-proposal-unicode-property-regex@^7.7.7": + version "7.7.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.7.tgz#433fa9dac64f953c12578b29633f456b68831c4e" + integrity sha512-80PbkKyORBUVm1fbTLrHpYdJxMThzM1UqFGh0ALEhO9TYbG86Ah9zQYAB/84axz2vcxefDLdZwWwZNlYARlu9w== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" @@ -301,14 +301,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-dynamic-import@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612" - integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-syntax-dynamic-import@^7.7.4": +"@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec" integrity sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg== @@ -395,24 +388,17 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-destructuring@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz#44bbe08b57f4480094d57d9ffbcd96d309075ba6" - integrity sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-destructuring@^7.7.4": +"@babel/plugin-transform-destructuring@^7.6.0", "@babel/plugin-transform-destructuring@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz#2b713729e5054a1135097b6a67da1b6fe8789267" integrity sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-dotall-regex@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96" - integrity sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw== +"@babel/plugin-transform-dotall-regex@^7.7.7": + version "7.7.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.7.tgz#3e9713f1b69f339e87fa796b097d73ded16b937b" + integrity sha512-b4in+YlTeE/QmTgrllnb3bHA0HntYvjz8O3Mcbx75UBPJA2xhb5A8nle498VhxSXJHQefjtQxpnLPehDJ4TRlg== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" @@ -519,10 +505,10 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-replace-supers" "^7.7.4" -"@babel/plugin-transform-parameters@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce" - integrity sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw== +"@babel/plugin-transform-parameters@^7.7.7": + version "7.7.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.7.tgz#7a884b2460164dc5f194f668332736584c760007" + integrity sha512-OhGSrf9ZBrr1fw84oFXj5hgi8Nmg+E2w5L7NhnG0lPvpDtqd7dbyilM2/vR8CKbJ907RyxPh2kj6sBCSSfI9Ew== dependencies: "@babel/helper-call-delegate" "^7.7.4" "@babel/helper-get-function-arity" "^7.7.4" @@ -605,18 +591,18 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/preset-env@^7.7.1": - version "7.7.6" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.6.tgz#39ac600427bbb94eec6b27953f1dfa1d64d457b2" - integrity sha512-k5hO17iF/Q7tR9Jv8PdNBZWYW6RofxhnxKjBMc0nG4JTaWvOTiPoO/RLFwAKcA4FpmuBFm6jkoqaRJLGi0zdaQ== + version "7.7.7" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.7.tgz#c294167b91e53e7e36d820e943ece8d0c7fe46ac" + integrity sha512-pCu0hrSSDVI7kCVUOdcMNQEbOPJ52E+LrQ14sN8uL2ALfSqePZQlKrOy+tM4uhEdYlCHi4imr8Zz2cZe9oSdIg== dependencies: "@babel/helper-module-imports" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-proposal-async-generator-functions" "^7.7.4" "@babel/plugin-proposal-dynamic-import" "^7.7.4" "@babel/plugin-proposal-json-strings" "^7.7.4" - "@babel/plugin-proposal-object-rest-spread" "^7.7.4" + "@babel/plugin-proposal-object-rest-spread" "^7.7.7" "@babel/plugin-proposal-optional-catch-binding" "^7.7.4" - "@babel/plugin-proposal-unicode-property-regex" "^7.7.4" + "@babel/plugin-proposal-unicode-property-regex" "^7.7.7" "@babel/plugin-syntax-async-generators" "^7.7.4" "@babel/plugin-syntax-dynamic-import" "^7.7.4" "@babel/plugin-syntax-json-strings" "^7.7.4" @@ -630,7 +616,7 @@ "@babel/plugin-transform-classes" "^7.7.4" "@babel/plugin-transform-computed-properties" "^7.7.4" "@babel/plugin-transform-destructuring" "^7.7.4" - "@babel/plugin-transform-dotall-regex" "^7.7.4" + "@babel/plugin-transform-dotall-regex" "^7.7.7" "@babel/plugin-transform-duplicate-keys" "^7.7.4" "@babel/plugin-transform-exponentiation-operator" "^7.7.4" "@babel/plugin-transform-for-of" "^7.7.4" @@ -644,7 +630,7 @@ "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4" "@babel/plugin-transform-new-target" "^7.7.4" "@babel/plugin-transform-object-super" "^7.7.4" - "@babel/plugin-transform-parameters" "^7.7.4" + "@babel/plugin-transform-parameters" "^7.7.7" "@babel/plugin-transform-property-literals" "^7.7.4" "@babel/plugin-transform-regenerator" "^7.7.5" "@babel/plugin-transform-reserved-words" "^7.7.4" @@ -656,15 +642,15 @@ "@babel/plugin-transform-unicode-regex" "^7.7.4" "@babel/types" "^7.7.4" browserslist "^4.6.0" - core-js-compat "^3.4.7" + core-js-compat "^3.6.0" invariant "^2.2.2" js-levenshtein "^1.1.3" semver "^5.5.0" "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2": - version "7.7.6" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f" - integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw== + version "7.7.7" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.7.tgz#194769ca8d6d7790ec23605af9ee3e42a0aa79cf" + integrity sha512-uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA== dependencies: regenerator-runtime "^0.13.2" @@ -701,9 +687,9 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" -"@coreui/coreui-free-bootstrap-admin-template@https://github.com/coreui/coreui-free-bootstrap-admin-template.git": +"@coreui/coreui-free-bootstrap-admin-template@https://github.com/coreui/coreui-free-bootstrap-admin-template.git#master": version "2.1.15" - resolved "https://github.com/coreui/coreui-free-bootstrap-admin-template.git#0cb1d81a8471ff4b6eb80c41b45c61a8e2ab3ef6" + resolved "https://github.com/coreui/coreui-free-bootstrap-admin-template.git#112721fb4be70038e8eb808d27e65d19cb823310" dependencies: "@coreui/coreui" "^2.1.12" "@coreui/coreui-plugin-chartjs-custom-tooltips" "^1.3.1" @@ -733,14 +719,14 @@ integrity sha512-yeeoWp+bNS84nP1977Y8UCiQ9pssO+f4QuVj3i0/gYZFjjvOgxx0dnyWhtowD5sLYnCRMPlPpqyjwXze3SlkYg== "@coreui/coreui@^2.1.12": - version "2.1.12" - resolved "https://registry.yarnpkg.com/@coreui/coreui/-/coreui-2.1.12.tgz#778b03a59984becb5441410a7595f6a064d388cd" - integrity sha512-wO2olnHWyvzW6CHaiU4oRq/tomuuHItiifcyU40UBN00vACjBUH4kpxfhZGGjwM031GRZRL6LnAWzwZb9wg8Lw== + version "2.1.16" + resolved "https://registry.yarnpkg.com/@coreui/coreui/-/coreui-2.1.16.tgz#93efb7d903bcd53092cc4bcc31ef8703de565457" + integrity sha512-1YOnQAlcX2bIgnaX3k9GKaN4lD+wKam7tdDfFj7/ZQTN1XG3dwDELHp4aagWQs78ix2CCO1LyeLrzGpsMcLW3Q== dependencies: "@coreui/coreui-plugin-npm-postinstall" "^1.0.2" bootstrap "^4.3.1" - core-js "^3.1.3" - regenerator-runtime "^0.13.2" + core-js "^3.3.4" + regenerator-runtime "^0.13.3" "@coreui/icons@0.3.0": version "0.3.0" @@ -753,9 +739,9 @@ integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== "@rails/actioncable@^6.0.0-alpha": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.0.tgz#8bff9c902be1531ef7a9e191562e9771efcfdfe1" - integrity sha512-DieouotYHpI6k2EGTCnh1eMvD3W8p3zqjWXEYj4z0khJ+A0qQ5tHxihjTEkio54MVwqHt1DcpUm2woh2n/alCA== + version "6.0.2" + resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.2.tgz#bcba9bcd6ee09a47c6628336e07399a68ca87814" + integrity sha512-vN78gohsXPlC5jxBHlmiwkUI9bv6SulcZaE72kAIg/G4ou+wTdiMWPJK1bf2IxUNf+sfOjhl+tbRmY4AzJcgrw== "@rails/actiontext@^6.0.2": version "6.0.2" @@ -765,16 +751,16 @@ "@rails/activestorage" "^6.0.0-alpha" "@rails/activestorage@^6.0.0-alpha": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.0.0.tgz#6d9cc98f3dcf195c38ca65e80acd2e759336dd7a" - integrity sha512-RZqTVlUYSWcI88pSJ7ImuTtDYQvqVc2PNuOo+5R3hcVupD+d2TO8xmluqQ5TvByjPqKX4acEK0mjEIK5ip9kCg== + version "6.0.2" + resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.0.2.tgz#3882da2716d1f21091840fc52b71091d406a9c43" + integrity sha512-X0uGBLNsSKvVw5n93rH7k+7rbxc3Cq7p0ShiQbrk1cN0xflGjElzEJRY3okZZHsKkCV+h6rFCk0BOBVrLSrJ0A== dependencies: spark-md5 "^3.0.0" "@rails/ujs@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.1.tgz#5eb013bd7f18a1cc7c314602d3b4d68302e20b60" - integrity sha512-IwUGMGke2u5W/hkJLOSU5xcQT3Y0gjIdiEsG27kHyLvsPOzdABKeAD8l37j6romhzeCmM56Wv52OGqSueUmyig== + version "6.0.2" + resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.2.tgz#8d32452d51c5e115374a218fb5475803dc17f4c0" + integrity sha512-KSQjJG8yzSWC1IT+UtFQglefABU37hpJ7uAz39K1/iWtoaJaI9ydGIaxxpJBT/PmYv4kS6lCSjXq13DELeJocw== "@rails/webpacker@4.1.0": version "4.1.0" @@ -845,9 +831,9 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "12.7.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.4.tgz#64db61e0359eb5a8d99b55e05c729f130a678b04" - integrity sha512-W0+n1Y+gK/8G2P/piTkBBN38Qc5Q1ZSO6B5H3QmPCUewaiXOo2GCAWZ4ElZCcNhjJuBSUSLGFUJnmlCn5+nxOQ== + version "12.12.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.21.tgz#aa44a6363291c7037111c47e4661ad210aded23f" + integrity sha512-8sRGhbpU+ck1n0PGAUgVrWrWdjSW2aqNeyC15W88GRsMpSwzv6RJGlLhE7s2RhVSOdyDmxbqlWSeThq4/7xqlA== "@types/parse-json@^4.0.0": version "4.0.0" @@ -1034,9 +1020,9 @@ acorn-jsx@^5.1.0: integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw== acorn@^6.2.1: - version "6.3.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" - integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA== + version "6.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" + integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== acorn@^7.1.0: version "7.1.0" @@ -1197,12 +1183,13 @@ array-flatten@^2.1.0: integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== array-includes@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" - integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0= + version "3.1.1" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" + integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ== dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" + define-properties "^1.1.3" + es-abstract "^1.17.0" + is-string "^1.0.5" array-union@^1.0.1: version "1.0.2" @@ -1221,6 +1208,14 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= +array.prototype.flat@^1.2.1: + version "1.2.3" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" + integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + asn1.js@^4.0.0: version "4.10.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" @@ -1300,17 +1295,17 @@ atob@^2.1.1: integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== autoprefixer@^9.6.1: - version "9.6.1" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47" - integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw== + version "9.7.3" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.3.tgz#fd42ed03f53de9beb4ca0d61fb4f7268a9bb50b4" + integrity sha512-8T5Y1C5Iyj6PgkPSFd0ODvK9DIleuPKUPYniNxybS47g2k2wFgLZ46lGQHlBuGKIAEV8fbCDfKCCRS1tvOgc3Q== dependencies: - browserslist "^4.6.3" - caniuse-lite "^1.0.30000980" + browserslist "^4.8.0" + caniuse-lite "^1.0.30001012" chalk "^2.4.2" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^7.0.17" - postcss-value-parser "^4.0.0" + postcss "^7.0.23" + postcss-value-parser "^4.0.2" aws-sign2@~0.7.0: version "0.7.0" @@ -1318,9 +1313,9 @@ aws-sign2@~0.7.0: integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= aws4@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" - integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== + version "1.9.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c" + integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A== babel-loader@^8.0.6: version "8.0.6" @@ -1393,6 +1388,13 @@ binary-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + block-stream@*: version "0.0.9" resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" @@ -1444,9 +1446,9 @@ boolbase@^1.0.0, boolbase@~1.0.0: integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= bootstrap@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac" - integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag== + version "4.4.1" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz#8582960eea0c5cd2bede84d8b0baf3789c3e8b01" + integrity sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA== brace-expansion@^1.1.7: version "1.1.11" @@ -1536,7 +1538,7 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.6.4, browserslist@^4.8.2: +browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.8.0, browserslist@^4.8.2: version "4.8.2" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289" integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA== @@ -1701,7 +1703,7 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001015: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001015: version "1.0.30001016" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001016.tgz#16ea48d7d6e8caf3cad3295c2d746fe38c4e7f66" integrity sha512-yYQ2QfotceRiH4U+h1Us86WJXtVHDmy3nEKIdYPsZCYnOV5/tMgGbmoIlrMzmh2VXlproqYtVaKeGDBkMZifFA== @@ -1750,9 +1752,9 @@ chardet@^0.7.0: integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== chart.js@^2.8.0: - version "2.9.2" - resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.2.tgz#5f7397f2fc33ca406836dbaed3cc39943bbb9f80" - integrity sha512-AagP9h27gU7hhx8F64BOFpNZGV0R1Pz1nhsi0M1+KLhtniX6ElqLl0z0obKSiuGMl9tcRe6ZhruCGCJWmH6snQ== + version "2.9.3" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.3.tgz#ae3884114dafd381bc600f5b35a189138aac1ef7" + integrity sha512-+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw== dependencies: chartjs-color "^2.1.0" moment "^2.10.2" @@ -2040,13 +2042,18 @@ connect-history-api-fallback@^1.6.0: resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== -console-browserify@1.1.x, console-browserify@^1.1.0: +console-browserify@1.1.x: version "1.1.0" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA= dependencies: date-now "^0.1.4" +console-browserify@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" + integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== + console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" @@ -2108,23 +2115,18 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.4.7: - version "3.4.8" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.8.tgz#f72e6a4ed76437ea710928f44615f926a81607d5" - integrity sha512-l3WTmnXHV2Sfu5VuD7EHE2w7y+K68+kULKt5RJg8ZJk3YhHF1qLD4O8v8AmNq+8vbOwnPFFDvds25/AoEvMqlQ== +core-js-compat@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.0.tgz#4eb6cb69d03d99159ed7c860cd5fcf7d23a62ea9" + integrity sha512-Z3eCNjGgoYluH89Jt4wVkfYsc/VdLrA2/woX5lm0isO/pCT+P+Y+o65bOuEnjDJLthdwTBxbCVzptTXtc18fJg== dependencies: browserslist "^4.8.2" - semver "^6.3.0" + semver "7.0.0" -core-js@^3.1.3, core-js@^3.1.4: - version "3.4.5" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.4.5.tgz#3dda65611d95699b5eb7742ea451ea052d37aa65" - integrity sha512-OuvejWH6vIaUo59Ndlh89purNm4DCIy/v3QoYlcGnn+PkYI8BhNHfCuAESrWX+ZPfq9JccVJ+XXgOMy77PJexg== - -core-js@^3.4.0: - version "3.4.8" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.4.8.tgz#e0fc0c61f2ef90cbc10c531dbffaa46dfb7152dd" - integrity sha512-b+BBmCZmVgho8KnBUOXpvlqEMguko+0P+kXCwD4vIprsXC6ht1qgPxtb1OK6XgSlrySF71wkwBQ0Hv695bk9gQ== +core-js@^3.1.4, core-js@^3.3.4, core-js@^3.4.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.0.tgz#2b854e451de1967d1e29896025cdc13a2518d9ea" + integrity sha512-AHPTNKzyB+YwgDWoSOCaid9PUSEF6781vsfiK8qUz62zRR448/XgK2NtCbpiUGizbep8Lrpt0Du19PpGGZvw3Q== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -2248,9 +2250,9 @@ css-has-pseudo@^0.10.0: postcss-selector-parser "^5.0.0-rc.4" css-loader@^3.2.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.3.2.tgz#41b2086528aa4fbf8c0692e874bc14f081129b21" - integrity sha512-4XSiURS+YEK2fQhmSaM1onnUm0VKWNf6WWBYjkp9YbSDGCBTVZ5XOM6Gkxo8tLgQlzkZOBJvk9trHlDk4gjEYg== + version "3.4.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.0.tgz#9fb263436783117a41d014e45e8eaeba54dd6670" + integrity sha512-JornYo4RAXl1Mzt0lOSVPmArzAMV3rGY2VuwtaDc732WTWjdwTaeS19nCGWMcSCf305Q396lhhDAJEWWM0SgPQ== dependencies: camelcase "^5.3.1" cssesc "^3.0.0" @@ -2427,7 +2429,7 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= -debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -2551,9 +2553,9 @@ depd@~1.1.2: integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= des.js@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" - integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw= + version "1.0.1" + resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" + integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA== dependencies: inherits "^2.0.1" minimalistic-assert "^1.0.0" @@ -2704,9 +2706,9 @@ electron-to-chromium@^1.3.322: integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA== elliptic@^6.0.0: - version "6.5.1" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz#c380f5f909bf1b9b4428d028cd18d3b0efd6b52b" - integrity sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg== + version "6.5.2" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762" + integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw== dependencies: bn.js "^4.4.0" brorand "^1.0.1" @@ -2785,24 +2787,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.0-next.1: - version "1.17.0-next.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172" - integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw== - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.1.4" - is-regex "^1.0.4" - object-inspect "^1.7.0" - object-keys "^1.1.1" - object.assign "^4.1.0" - string.prototype.trimleft "^2.1.0" - string.prototype.trimright "^2.1.0" - -es-abstract@^1.5.1: +es-abstract@^1.17.0, es-abstract@^1.17.0-next.1: version "1.17.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0.tgz#f42a517d0036a5591dbb2c463591dc8bb50309b1" integrity sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug== @@ -2819,22 +2804,6 @@ es-abstract@^1.5.1: string.prototype.trimleft "^2.1.1" string.prototype.trimright "^2.1.1" -es-abstract@^1.7.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz#d3a26dc9c3283ac9750dca569586e976d9dcc06d" - integrity sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg== - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.1.4" - is-regex "^1.0.4" - object-inspect "^1.7.0" - object-keys "^1.1.1" - string.prototype.trimleft "^2.1.0" - string.prototype.trimright "^2.1.0" - es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -2867,12 +2836,12 @@ eslint-import-resolver-node@^0.3.2: debug "^2.6.9" resolve "^1.5.0" -eslint-module-utils@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz#7b4675875bf96b0dbf1b21977456e5bb1f5e018c" - integrity sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw== +eslint-module-utils@^2.4.1: + version "2.5.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.0.tgz#cdf0b40d623032274ccd2abd7e64c4e524d6e19c" + integrity sha512-kCo8pZaNz2dsAW7nCUjuVoI11EBXXpIzfNxmaoLhXoRDOnqXLC4iSGVRdZPhOitfbdEfMEfKOiENaK6wDPZEGw== dependencies: - debug "^2.6.8" + debug "^2.6.9" pkg-dir "^2.0.0" eslint-plugin-es@^2.0.0: @@ -2884,21 +2853,22 @@ eslint-plugin-es@^2.0.0: regexpp "^3.0.0" eslint-plugin-import@^2.16.0: - version "2.18.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6" - integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ== + version "2.19.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.19.1.tgz#5654e10b7839d064dd0d46cd1b88ec2133a11448" + integrity sha512-x68131aKoCZlCae7rDXKSAQmbT5DQuManyXo2sK6fJJ0aK5CWAkv6A6HJZGgqC8IhjQxYPgo6/IY4Oz8AFsbBw== dependencies: array-includes "^3.0.3" + array.prototype.flat "^1.2.1" contains-path "^0.1.0" debug "^2.6.9" doctrine "1.5.0" eslint-import-resolver-node "^0.3.2" - eslint-module-utils "^2.4.0" + eslint-module-utils "^2.4.1" has "^1.0.3" minimatch "^3.0.4" object.values "^1.1.0" read-pkg-up "^2.0.0" - resolve "^1.11.0" + resolve "^1.12.0" eslint-plugin-node@^10.0.0: version "10.0.0" @@ -2951,9 +2921,9 @@ eslint-visitor-keys@^1.1.0: integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== eslint@^6.7.2: - version "6.7.2" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.2.tgz#c17707ca4ad7b2d8af986a33feba71e18a9fecd1" - integrity sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng== + version "6.8.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" + integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig== dependencies: "@babel/code-frame" "^7.0.0" ajv "^6.10.0" @@ -3244,6 +3214,11 @@ file-loader@^4.2.0: loader-utils "^1.2.3" schema-utils "^2.5.0" +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -3276,10 +3251,10 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: make-dir "^2.0.0" pkg-dir "^3.0.0" -find-cache-dir@^3.0.0, find-cache-dir@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.1.0.tgz#9935894999debef4cf9f677fdf646d002c4cdecb" - integrity sha512-zw+EFiNBNPgI2NTrKkDd1xd7q0cs6wr/iWnr/oUkI0yF9K9GqQ+riIt4aiyFaaqpaWbxPrJXHI+QvmNUQbX+0Q== +find-cache-dir@^3.0.0, find-cache-dir@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.2.0.tgz#e7fe44c1abc1299f516146e563108fd1006c1874" + integrity sha512-1JKclkYYsf1q9WIJKLZa9S9muC+08RIjzAlLrK4QcYLJMS6mk9yombQ9qf+zJ7H9LS800k0s44L4sDq9VYzqyg== dependencies: commondir "^1.0.1" make-dir "^3.0.0" @@ -3352,9 +3327,9 @@ flatted@^2.0.0, flatted@^2.0.1: integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg== flatten@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" - integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I= + version "1.0.3" + resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b" + integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg== flush-write-stream@^1.0.0: version "1.1.1" @@ -3450,12 +3425,12 @@ fs.realpath@^1.0.0: integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@^1.2.7: - version "1.2.9" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f" - integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw== + version "1.2.11" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3" + integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw== dependencies: + bindings "^1.5.0" nan "^2.12.1" - node-pre-gyp "^0.12.0" fstream@^1.0.0, fstream@^1.0.12: version "1.0.12" @@ -3579,19 +3554,7 @@ glob@7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1, glob@~7.1.2: - version "7.1.5" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0" - integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.1, glob@~7.1.2: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -3663,9 +3626,9 @@ globby@^6.1.0: pinkie-promise "^2.0.0" globule@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d" - integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ== + version "1.3.0" + resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.0.tgz#41d0e9fb44afd4b80d93a23263714f90b3dec904" + integrity sha512-YlD4kdMqRCQHrhVdonet4TdRtv1/sZKepvoxNT4Nrhrp5HI8XFfc8kFlGlBn2myBo80aGp8Eft259mbcUJhgSg== dependencies: glob "~7.1.1" lodash "~4.17.10" @@ -3996,15 +3959,7 @@ import-fresh@^2.0.0: caller-path "^2.0.0" resolve-from "^3.0.0" -import-fresh@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz#6d33fa1dcef6df930fae003446f33415af905118" - integrity sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -import-fresh@^3.1.0: +import-fresh@^3.0.0, import-fresh@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== @@ -4088,9 +4043,9 @@ ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== inquirer@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz#9e2b032dde77da1db5db804758b8fea3a970519a" - integrity sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ== + version "7.0.1" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.1.tgz#13f7980eedc73c689feff3994b109c4e799c6ebb" + integrity sha512-V1FFQ3TIO15det8PijPLFR9M9baSlnRs9nL7zWu1MNVA2T9YVl9ZbrHJhYs7e9X8jeMZ3lr2JH/rdHFgNCBdYw== dependencies: ansi-escapes "^4.2.1" chalk "^2.4.2" @@ -4101,7 +4056,7 @@ inquirer@^7.0.0: lodash "^4.17.15" mute-stream "0.0.8" run-async "^2.2.0" - rxjs "^6.4.0" + rxjs "^6.5.3" string-width "^4.1.0" strip-ansi "^5.1.0" through "^2.3.6" @@ -4212,12 +4167,7 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" - integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== - -is-callable@^1.1.5: +is-callable@^1.1.4, is-callable@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== @@ -4249,9 +4199,9 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" - integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" + integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== is-descriptor@^0.1.0: version "0.1.6" @@ -4413,6 +4363,11 @@ is-stream@^1.1.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= +is-string@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" + integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== + is-svg@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75" @@ -4536,9 +4491,9 @@ jsesc@~0.5.0: integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= jshint@^2.9.6: - version "2.10.2" - resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.10.2.tgz#ed6626c4f8223c98e94aaea62767435427a49a3d" - integrity sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA== + version "2.10.3" + resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.10.3.tgz#98dc765bf6920b41bc2719f76b8739d6f6e93a9c" + integrity sha512-d8AoXcNNYzmm7cdmulQ3dQApbrPYArtVBO6n4xOICe4QsXGNHCAKDcFORzqP52LhK61KX0VhY39yYzCsNq+bxQ== dependencies: cli "~1.0.0" console-browserify "1.1.x" @@ -4587,9 +4542,9 @@ json5@^1.0.1: minimist "^1.2.0" json5@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" - integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ== + version "2.1.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6" + integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ== dependencies: minimist "^1.2.0" @@ -4787,7 +4742,7 @@ lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.1 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== -loglevel@^1.6.4: +loglevel@^1.6.6: version "1.6.6" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312" integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ== @@ -5013,22 +4968,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.40.0: - version "1.40.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32" - integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA== - -"mime-db@>= 1.40.0 < 2": - version "1.41.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.41.0.tgz#9110408e1f6aa1b34aef51f2c9df3caddf46b6a0" - integrity sha512-B5gxBI+2K431XW8C2rcc/lhppbuji67nf9v39eH8pkWoZDxnAL0PxdpH32KYRScniF8qDHBDlI+ipgg5WrCUYw== +mime-db@1.42.0, "mime-db@>= 1.40.0 < 2": + version "1.42.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac" + integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ== mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.24" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81" - integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ== + version "2.1.25" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437" + integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg== dependencies: - mime-db "1.40.0" + mime-db "1.42.0" mime@1.6.0: version "1.6.0" @@ -5046,9 +4996,9 @@ mimic-fn@^2.0.0, mimic-fn@^2.1.0: integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== mini-css-extract-plugin@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz#81d41ec4fe58c713a96ad7c723cdb2d0bd4d70e1" - integrity sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw== + version "0.8.2" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz#a875e169beb27c88af77dd962771c9eedc3da161" + integrity sha512-a3Y4of27Wz+mqK3qrcd3VhYz6cU0iW5x3Sgvqzbj+XmlrSizmvu8QQMl5oMYJjgHOC4iyt+w7l4umP+dQeW3bw== dependencies: loader-utils "^1.1.0" normalize-url "1.9.1" @@ -5309,10 +5259,10 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-pre-gyp@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" - integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A== +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== dependencies: detect-libc "^1.0.2" mkdirp "^0.5.1" @@ -5323,7 +5273,7 @@ node-pre-gyp@^0.12.0: rc "^1.2.7" rimraf "^2.6.1" semver "^5.3.0" - tar "^4" + tar "^4.4.2" node-releases@^1.1.42: version "1.1.43" @@ -5491,9 +5441,9 @@ object-inspect@^1.7.0: integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== object-is@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6" - integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY= + version "1.0.2" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4" + integrity sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ== object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" @@ -5518,12 +5468,12 @@ object.assign@^4.1.0: object-keys "^1.0.11" object.getownpropertydescriptors@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" - integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY= + version "2.1.0" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" + integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg== dependencies: - define-properties "^1.1.2" - es-abstract "^1.5.1" + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" object.pick@^1.3.0: version "1.3.0" @@ -6628,9 +6578,9 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1: uniq "^1.0.1" postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.24" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.24.tgz#972c3c5be431b32e40caefe6c81b5a19117704c2" - integrity sha512-Xl0XvdNWg+CblAXzNvbSOUvgJXwSjmbAKORqyw9V2AlHrm1js2gFw9y3jibBAhpKZi8b5JzJCVh/FyzPsTtgTA== + version "7.0.25" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.25.tgz#dd2a2a753d50b13bed7a2009b4a18ac14d9db21e" + integrity sha512-NXXVvWq9icrm/TgQC0O6YVFi4StfJz46M1iNd/h6B26Nvh/HKI+q4YZtFN/EjcInZliEscO/WL10BXnc1E5nwg== dependencies: chalk "^2.4.2" source-map "^0.6.1" @@ -6690,9 +6640,9 @@ pseudomap@^1.0.2: integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= psl@^1.1.24: - version "1.3.1" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.3.1.tgz#d5aa3873a35ec450bc7db9012ad5a7246f6fc8bd" - integrity sha512-2KLd5fKOdAfShtY2d/8XDWVRnmp3zp40Qt6ge2zBPFARLXOGUf2fHD5eg+TV/5oxBtQKVhjUaKFsAaE4HnwfSA== + version "1.6.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.6.0.tgz#60557582ee23b6c43719d9890fb4170ecd91e110" + integrity sha512-SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA== public-encrypt@^4.0.0: version "4.0.3" @@ -6977,14 +6927,14 @@ regexpu-core@^4.6.0: unicode-match-property-value-ecmascript "^1.1.0" regjsgen@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd" - integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA== + version "0.5.1" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c" + integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg== regjsparser@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c" - integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ== + version "0.6.2" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.2.tgz#fd62c753991467d9d1ffe0a9f67f27a529024b96" + integrity sha512-E9ghzUtoLwDekPT0DYCp+c4h+bvuUpe6rRHCTYn6eGoqj1LgKXxT6I0Il4WbjhQkOghzi/V+y03bPKvbllL93Q== dependencies: jsesc "~0.5.0" @@ -7086,17 +7036,10 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1: - version "1.12.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" - integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== - dependencies: - path-parse "^1.0.6" - -resolve@^1.12.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16" - integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w== +resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.1.tgz#9e018c540fcf0c427d678b9931cbf45e984bcaff" + integrity sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg== dependencies: path-parse "^1.0.6" @@ -7164,7 +7107,7 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rxjs@^6.4.0: +rxjs@^6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a" integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA== @@ -7266,6 +7209,11 @@ selfsigned@^1.10.7: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== +semver@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== + semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -7295,7 +7243,7 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -serialize-javascript@^2.1.1, serialize-javascript@^2.1.2: +serialize-javascript@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== @@ -7707,14 +7655,6 @@ string-width@^4.1.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.trimleft@^2.1.0, string.prototype.trimleft@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" - integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== - dependencies: - define-properties "^1.1.3" - function-bind "^1.1.1" - string.prototype.trimleft@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" @@ -7723,30 +7663,6 @@ string.prototype.trimleft@^2.1.1: define-properties "^1.1.3" function-bind "^1.1.1" -string.prototype.trimleft@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" - integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== - dependencies: - define-properties "^1.1.3" - function-bind "^1.1.1" - -string.prototype.trimleft@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" - integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== - dependencies: - define-properties "^1.1.3" - function-bind "^1.1.1" - -string.prototype.trimright@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58" - integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg== - dependencies: - define-properties "^1.1.3" - function-bind "^1.1.1" - string.prototype.trimright@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" @@ -7842,9 +7758,9 @@ strip-json-comments@^3.0.1: integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== style-loader@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.1.tgz#aec6d4c61d0ed8d0a442faed741d4dfc6573888a" - integrity sha512-CnpEkSR1C+REjudiTWCv4+ssP7SCiuaQZJTZDWBRwTJoS90mdqkB8uOGMHKgVeUzpaU7IfLWoyQbvvs5Joj3Xw== + version "1.1.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.1.tgz#8290d915dffe820916790cdcab5aa58c38ab605c" + integrity sha512-oIVF12trRq0od4Yojg7q0K3Lq/O6Ix/AYgVosykrVg+kWxxxUyk8KhKCCmekyGSUiVK1xxlAQymLWWdh6S9lOg== dependencies: loader-utils "^1.2.3" schema-utils "^2.0.1" @@ -7927,7 +7843,7 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4: +tar@^4.4.2: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== @@ -7940,7 +7856,7 @@ tar@^4: safe-buffer "^5.1.2" yallist "^3.0.3" -terser-webpack-plugin@^1.4.1: +terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA== @@ -7956,20 +7872,20 @@ terser-webpack-plugin@^1.4.1: worker-farm "^1.7.0" terser-webpack-plugin@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.2.2.tgz#2a6e00237125564a455ad69b22e08ee59420473a" - integrity sha512-/CHMNswPMAwuD2kd++qys8UmBRmsshPSzHw4BlDwurPtK9YjeK93OV89YWkJulHk972cs07K/7Z92V6PNjWF8A== + version "2.3.1" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.1.tgz#6a63c27debc15b25ffd2588562ee2eeabdcab923" + integrity sha512-dNxivOXmDgZqrGxOttBH6B4xaxT4zNC+Xd+2K8jwGDMK5q2CZI+KZMA1AAnSRT+BTRvuzKsDx+fpxzPAmAMVcA== dependencies: cacache "^13.0.1" - find-cache-dir "^3.1.0" + find-cache-dir "^3.2.0" jest-worker "^24.9.0" schema-utils "^2.6.1" - serialize-javascript "^2.1.1" + serialize-javascript "^2.1.2" source-map "^0.6.1" - terser "^4.4.2" + terser "^4.4.3" webpack-sources "^1.4.3" -terser@^4.1.2, terser@^4.4.2: +terser@^4.1.2, terser@^4.4.3: version "4.4.3" resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.3.tgz#401abc52b88869cf904412503b1eb7da093ae2f0" integrity sha512-0ikKraVtRDKGzHrzkCv5rUNDzqlhmhowOBqC0XqUHFpW+vJ45+20/IFBcebwKfiS2Z9fJin6Eo+F1zLZsxi8RA== @@ -8342,9 +8258,9 @@ verror@1.10.0: extsprintf "^1.2.0" vm-browserify@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019" - integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw== + version "1.1.2" + resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" + integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== watchpack@^1.6.0: version "1.6.0" @@ -8404,9 +8320,9 @@ webpack-dev-middleware@^3.7.2: webpack-log "^2.0.0" webpack-dev-server@^3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz#27c3b5d0f6b6677c4304465ac817623c8b27b89c" - integrity sha512-E6uQ4kRrTX9URN9s/lIbqTAztwEPdvzVrcmHE8EQ9YnuT9J8Es5Wrd8n9BKg1a0oZ5EgEke/EQFgUsp18dSTBw== + version "3.10.1" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.1.tgz#1ff3e5cccf8e0897aa3f5909c654e623f69b1c0e" + integrity sha512-AGG4+XrrXn4rbZUueyNrQgO4KGnol+0wm3MPdqGLmmA+NofZl3blZQKxZ9BND6RDNuvAK9OMYClhjOSnxpWRoA== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" @@ -8423,7 +8339,7 @@ webpack-dev-server@^3.9.0: ip "^1.1.5" is-absolute-url "^3.0.3" killable "^1.0.1" - loglevel "^1.6.4" + loglevel "^1.6.6" opn "^5.5.0" p-retry "^3.0.1" portfinder "^1.0.25" @@ -8459,9 +8375,9 @@ webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack- source-map "~0.6.1" webpack@^4.41.2: - version "4.41.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e" - integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A== + version "4.41.4" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.4.tgz#4bec4125224bdf50efa8be6226c19047599cd034" + integrity sha512-Lc+2uB6NjpCWsHI3trkoISOI64h9QYIXenbEWj3bn3oyjfB1lEBXjWAfAyY2sM0rZn41oD5V91OLwKRwS6Wp8Q== dependencies: "@webassemblyjs/ast" "1.8.5" "@webassemblyjs/helper-module-context" "1.8.5" @@ -8483,7 +8399,7 @@ webpack@^4.41.2: node-libs-browser "^2.2.1" schema-utils "^1.0.0" tapable "^1.1.3" - terser-webpack-plugin "^1.4.1" + terser-webpack-plugin "^1.4.3" watchpack "^1.6.0" webpack-sources "^1.4.1" From 86d7acc69311d6ddbef187b8ede6fde7de5b9fde Mon Sep 17 00:00:00 2001 From: ecmelkytz Date: Mon, 23 Dec 2019 16:30:45 +0300 Subject: [PATCH 091/216] Add missing method tests --- test/models/article_test.rb | 8 ++++++++ test/models/place_type_test.rb | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/test/models/article_test.rb b/test/models/article_test.rb index e53abca04..daa46eeaf 100644 --- a/test/models/article_test.rb +++ b/test/models/article_test.rb @@ -101,4 +101,12 @@ class ArticleTest < ActiveSupport::TestCase validates_numerical_range :special_issue, greater_than_or_equal_to: 0 validates_numerical_range :year, greater_than_or_equal_to: 1950, less_than_or_equal_to: 2050 validates_numerical_range :yoksis_id, greater_than: 0 + + test 'unique_count method' do + assert_equal Article.unique_count, Article.active.group_by(&:yoksis_id).count + end + + test 'most_recent method' do + assert_equal Article.most_recent, Article.order(created_at: :desc).limit(10) + end end diff --git a/test/models/place_type_test.rb b/test/models/place_type_test.rb index 06c44b423..532781192 100644 --- a/test/models/place_type_test.rb +++ b/test/models/place_type_test.rb @@ -13,4 +13,8 @@ class PlaceTypeTest < ActiveSupport::TestCase test 'number_of_children method' do assert_equal place_types(:egitim).children.count, place_types(:egitim).number_of_children end + + test 'non_roots method' do + assert_not_includes PlaceType.non_roots, place_types(:egitim) + end end From bef9e0a1d36a0bbe816c9560bf77762e17853b91 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:36:12 +0000 Subject: [PATCH 092/216] chore(deps): bump webpack from 4.41.4 to 4.41.5 Bumps [webpack](https://github.com/webpack/webpack) from 4.41.4 to 4.41.5. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.41.4...v4.41.5) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index df10bc56e..f26b617c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1289,7 +1289,7 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= -atob@^2.1.1: +atob@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== @@ -3431,6 +3431,7 @@ fsevents@^1.2.7: dependencies: bindings "^1.5.0" nan "^2.12.1" + node-pre-gyp "*" fstream@^1.0.0, fstream@^1.0.12: version "1.0.12" @@ -7422,11 +7423,11 @@ source-list-map@^2.0.0: integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== source-map-resolve@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" - integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== dependencies: - atob "^2.1.1" + atob "^2.1.2" decode-uri-component "^0.2.0" resolve-url "^0.2.1" source-map-url "^0.4.0" @@ -8375,9 +8376,9 @@ webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack- source-map "~0.6.1" webpack@^4.41.2: - version "4.41.4" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.4.tgz#4bec4125224bdf50efa8be6226c19047599cd034" - integrity sha512-Lc+2uB6NjpCWsHI3trkoISOI64h9QYIXenbEWj3bn3oyjfB1lEBXjWAfAyY2sM0rZn41oD5V91OLwKRwS6Wp8Q== + version "4.41.5" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz#3210f1886bce5310e62bb97204d18c263341b77c" + integrity sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw== dependencies: "@webassemblyjs/ast" "1.8.5" "@webassemblyjs/helper-module-context" "1.8.5" From e3456e3fb99c267dff7dacae17e8e6b1f79b70de Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:39:26 +0000 Subject: [PATCH 093/216] chore(deps): bump psl from 1.6.0 to 1.7.0 Bumps [psl](https://github.com/lupomontero/psl) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/lupomontero/psl/releases) - [Commits](https://github.com/lupomontero/psl/compare/v1.6.0...v1.7.0) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 124 ++++++------------------------------------------------ 1 file changed, 12 insertions(+), 112 deletions(-) diff --git a/yarn.lock b/yarn.lock index df10bc56e..49dbe4d2b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2436,7 +2436,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2570,11 +2570,6 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -3395,13 +3390,6 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - fs-minipass@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1" @@ -3903,7 +3891,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3927,13 +3915,6 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== - dependencies: - minimatch "^3.0.4" - ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -5053,14 +5034,6 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - minipass@^3.0.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" @@ -5068,13 +5041,6 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -5183,15 +5149,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -needle@^2.2.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" - integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -5259,22 +5216,6 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.42: version "1.1.43" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.43.tgz#2c6ca237f88ce11d49631f11190bb01f8d0549f2" @@ -5312,14 +5253,6 @@ node-sass@^4.13.0: dependencies: abbrev "1" -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= - dependencies: - abbrev "1" - osenv "^0.1.4" - normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -5362,26 +5295,6 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== -npm-bundled@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" - integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== - dependencies: - npm-normalize-package-bin "^1.0.1" - -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-packlist@^1.1.6: - version "1.4.7" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" - integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -5389,7 +5302,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -5593,7 +5506,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0, osenv@^0.1.4: +osenv@0: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -6640,9 +6553,9 @@ pseudomap@^1.0.2: integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= psl@^1.1.24: - version "1.6.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.6.0.tgz#60557582ee23b6c43719d9890fb4170ecd91e110" - integrity sha512-SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA== + version "1.7.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" + integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== public-encrypt@^4.0.0: version "4.0.3" @@ -6764,7 +6677,7 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.7, rc@~1.2.7: +rc@~1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -7071,7 +6984,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7157,7 +7070,7 @@ sass-loader@7.3.1: pify "^4.0.1" semver "^6.3.0" -sax@^1.2.4, sax@~1.2.4: +sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -7204,7 +7117,7 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7843,19 +7756,6 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4.4.2: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -8514,7 +8414,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== From 05bdb0ff075b534d692cb1d85c83695b6d5f7c3d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:39:52 +0000 Subject: [PATCH 094/216] chore(deps): bump chartkick from 3.3.0 to 3.3.1 Bumps [chartkick](https://github.com/ankane/chartkick) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/ankane/chartkick/releases) - [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/chartkick/compare/v3.3.0...v3.3.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 28f8d9b71..c0c3512d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -137,7 +137,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.5) xpath (~> 3.2) - chartkick (3.3.0) + chartkick (3.3.1) childprocess (3.0.0) cocoon (1.2.14) codacy-coverage (2.1.5) From 32b396f42a71ab3b83e1cd82d3a9bcb16c4b6b8c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:39:54 +0000 Subject: [PATCH 095/216] chore(deps): bump fs-minipass from 1.2.7 to 2.0.0 Bumps [fs-minipass](https://github.com/npm/fs-minipass) from 1.2.7 to 2.0.0. - [Release notes](https://github.com/npm/fs-minipass/releases) - [Commits](https://github.com/npm/fs-minipass/compare/v1.2.7...v2.0.0) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 118 +++++------------------------------------------------- 1 file changed, 9 insertions(+), 109 deletions(-) diff --git a/yarn.lock b/yarn.lock index df10bc56e..1d214c8fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2436,7 +2436,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2570,11 +2570,6 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -3395,13 +3390,6 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - fs-minipass@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1" @@ -3903,7 +3891,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3927,13 +3915,6 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== - dependencies: - minimatch "^3.0.4" - ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -5053,14 +5034,6 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - minipass@^3.0.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" @@ -5068,13 +5041,6 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -5183,15 +5149,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -needle@^2.2.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" - integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -5259,22 +5216,6 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.42: version "1.1.43" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.43.tgz#2c6ca237f88ce11d49631f11190bb01f8d0549f2" @@ -5312,14 +5253,6 @@ node-sass@^4.13.0: dependencies: abbrev "1" -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= - dependencies: - abbrev "1" - osenv "^0.1.4" - normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -5362,26 +5295,6 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== -npm-bundled@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" - integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== - dependencies: - npm-normalize-package-bin "^1.0.1" - -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-packlist@^1.1.6: - version "1.4.7" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" - integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -5389,7 +5302,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -5593,7 +5506,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0, osenv@^0.1.4: +osenv@0: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -6764,7 +6677,7 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.7, rc@~1.2.7: +rc@~1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -7071,7 +6984,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7157,7 +7070,7 @@ sass-loader@7.3.1: pify "^4.0.1" semver "^6.3.0" -sax@^1.2.4, sax@~1.2.4: +sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -7204,7 +7117,7 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7843,19 +7756,6 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4.4.2: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -8514,7 +8414,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== From b76af406da6214669113514516dbad048db689d5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:40:25 +0000 Subject: [PATCH 096/216] chore(deps): bump pg from 1.1.4 to 1.2.0 Bumps [pg](https://github.com/ged/ruby-pg) from 1.1.4 to 1.2.0. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/compare/v1.1.4...v1.2.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 28f8d9b71..2feedcd4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -262,7 +262,7 @@ GEM parallel (1.19.1) parser (2.6.5.0) ast (~> 2.4.0) - pg (1.1.4) + pg (1.2.0) pg_search (2.3.0) activerecord (>= 4.2) activesupport (>= 4.2) From a61f483c8fa710d476f5ec142582945c2f11212d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:40:56 +0000 Subject: [PATCH 097/216] chore(deps): bump groupdate from 4.2.0 to 4.3.0 Bumps [groupdate](https://github.com/ankane/groupdate) from 4.2.0 to 4.3.0. - [Release notes](https://github.com/ankane/groupdate/releases) - [Changelog](https://github.com/ankane/groupdate/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/groupdate/compare/v4.2.0...v4.3.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 28f8d9b71..3300b6bbf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,7 +179,7 @@ GEM activerecord (>= 4.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - groupdate (4.2.0) + groupdate (4.3.0) activesupport (>= 5) hashdiff (1.0.0) hashie (3.6.0) @@ -408,7 +408,7 @@ GEM faraday (~> 0.9) jwt (>= 1.5, <= 2.5) nokogiri (>= 1.6, < 2.0) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) From f1e1f324ddda2737950100bec55d39fdc1c5f334 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:41:27 +0000 Subject: [PATCH 098/216] chore(deps): bump image_processing from 1.9.3 to 1.10.0 Bumps [image_processing](https://github.com/janko/image_processing) from 1.9.3 to 1.10.0. - [Release notes](https://github.com/janko/image_processing/releases) - [Changelog](https://github.com/janko/image_processing/blob/master/CHANGELOG.md) - [Commits](https://github.com/janko/image_processing/compare/v1.9.3...v1.10.0) Signed-off-by: dependabot-preview[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 633c86b28..f94ebe567 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem 'ancestry' # active-storage gem 'aws-sdk-s3', require: false -gem 'image_processing', '~> 1.2' +gem 'image_processing', '~> 1.10' gem 'ruby-vips', '~> 2.0.16' # authentication diff --git a/Gemfile.lock b/Gemfile.lock index 28f8d9b71..7dd48dd47 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -187,7 +187,7 @@ GEM httpclient (2.8.3) i18n (1.7.0) concurrent-ruby (~> 1.0) - image_processing (1.9.3) + image_processing (1.10.0) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.13, < 3) jaro_winkler (1.5.4) @@ -478,7 +478,7 @@ DEPENDENCIES font-awesome-rails friendly_id (~> 5.3.0) groupdate - image_processing (~> 1.2) + image_processing (~> 1.10) jbuilder (~> 2.9) letter_opener listen (>= 3.0.5, < 3.3) From 06b1921ae7fb9273956d31d1f0cd3e6f77553a19 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:41:53 +0000 Subject: [PATCH 099/216] chore(deps-dev): bump codacy-coverage from 2.1.5 to 2.2.0 Bumps [codacy-coverage](https://www.codacy.com) from 2.1.5 to 2.2.0. Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 28f8d9b71..101f06f86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -140,7 +140,7 @@ GEM chartkick (3.3.0) childprocess (3.0.0) cocoon (1.2.14) - codacy-coverage (2.1.5) + codacy-coverage (2.2.0) simplecov coderay (1.1.2) concurrent-ruby (1.1.5) From 1ba54af8de86f1f33fc48de8e53747b56c090b9c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:42:28 +0000 Subject: [PATCH 100/216] chore(deps-dev): bump webdrivers from 4.1.3 to 4.2.0 Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.1.3 to 4.2.0. - [Release notes](https://github.com/titusfortner/webdrivers/releases) - [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md) - [Commits](https://github.com/titusfortner/webdrivers/compare/v4.1.3...v4.2.0) Signed-off-by: dependabot-preview[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 633c86b28..015d77d58 100644 --- a/Gemfile +++ b/Gemfile @@ -100,7 +100,7 @@ group :test do gem 'capybara' gem 'codacy-coverage', require: false gem 'minitest-focus' - gem 'webdrivers', '~> 4.1' + gem 'webdrivers', '~> 4.2' gem 'webmock' end diff --git a/Gemfile.lock b/Gemfile.lock index 28f8d9b71..11f7b5fc1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -365,7 +365,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - selenium-webdriver (3.142.6) + selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) sidekiq (6.0.3) @@ -430,7 +430,7 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webdrivers (4.1.3) + webdrivers (4.2.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) @@ -526,7 +526,7 @@ DEPENDENCIES uglifier (>= 1.3.0) valid_email2 web-console - webdrivers (~> 4.1) + webdrivers (~> 4.2) webmock webpacker wicked_pdf From c4f303cfaec32deb30fbf6a2c9d75e770439d55e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:42:55 +0000 Subject: [PATCH 101/216] chore(deps-dev): bump rubocop-rails from 2.4.0 to 2.4.1 Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.0...v2.4.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 28f8d9b71..397bd433e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -260,7 +260,7 @@ GEM orm_adapter (0.5.0) pagy (3.7.1) parallel (1.19.1) - parser (2.6.5.0) + parser (2.7.0.0) ast (~> 2.4.0) pg (1.1.4) pg_search (2.3.0) @@ -349,7 +349,7 @@ GEM rubocop (>= 0.74) rubocop-performance (1.5.1) rubocop (>= 0.71.0) - rubocop-rails (2.4.0) + rubocop-rails (2.4.1) rack (>= 1.1) rubocop (>= 0.72.0) ruby-progressbar (1.10.1) From 61503a9f93f9c04b86d9993bbc910b361e6102bd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:43:25 +0000 Subject: [PATCH 102/216] chore(deps): bump pg_search from 2.3.0 to 2.3.1 Bumps [pg_search](https://github.com/Casecommons/pg_search) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/Casecommons/pg_search/releases) - [Changelog](https://github.com/Casecommons/pg_search/blob/master/CHANGELOG.md) - [Commits](https://github.com/Casecommons/pg_search/compare/v2.3.0...v2.3.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 28f8d9b71..b860ddd02 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -263,9 +263,9 @@ GEM parser (2.6.5.0) ast (~> 2.4.0) pg (1.1.4) - pg_search (2.3.0) - activerecord (>= 4.2) - activesupport (>= 4.2) + pg_search (2.3.1) + activerecord (>= 5.2) + activesupport (>= 5.2) pghero (2.4.1) activerecord (>= 5) pry (0.12.2) @@ -408,7 +408,7 @@ GEM faraday (~> 0.9) jwt (>= 1.5, <= 2.5) nokogiri (>= 1.6, < 2.0) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) From d353a3600cd34946d2e501917bf881fbd7ca7db0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:43:59 +0000 Subject: [PATCH 103/216] chore(deps): bump sidekiq from 6.0.3 to 6.0.4 Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.3 to 6.0.4. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v6.0.3...v6.0.4) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 28f8d9b71..1ab0d2765 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -368,7 +368,7 @@ GEM selenium-webdriver (3.142.6) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sidekiq (6.0.3) + sidekiq (6.0.4) connection_pool (>= 2.2.2) rack (>= 2.0.0) rack-protection (>= 2.0.0) From c0785d6aa57b1cbbdc788a40062ef81e0ef7cf3c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:44:04 +0000 Subject: [PATCH 104/216] chore(deps): bump @rails/webpacker from 4.1.0 to 4.2.2 Bumps [@rails/webpacker](https://github.com/rails/webpacker) from 4.1.0 to 4.2.2. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v4.1.0...v4.2.2) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 126 ++++++--------------------------------------------- 2 files changed, 14 insertions(+), 114 deletions(-) diff --git a/package.json b/package.json index 049acc305..477646017 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "@rails/actiontext": "^6.0.2", "@rails/activestorage": "^6.0.0-alpha", "@rails/ujs": "^6.0.1", - "@rails/webpacker": "4.1.0", + "@rails/webpacker": "4.2.2", "chalk": "^3.0.0", "flatpickr": "^4.6.3", "intl-tel-input": "^16.0.8", diff --git a/yarn.lock b/yarn.lock index df10bc56e..2f850d970 100644 --- a/yarn.lock +++ b/yarn.lock @@ -762,10 +762,10 @@ resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.2.tgz#8d32452d51c5e115374a218fb5475803dc17f4c0" integrity sha512-KSQjJG8yzSWC1IT+UtFQglefABU37hpJ7uAz39K1/iWtoaJaI9ydGIaxxpJBT/PmYv4kS6lCSjXq13DELeJocw== -"@rails/webpacker@4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-4.1.0.tgz#6c2f569cbcc42dae3d3a1c0dd4e92b92b686732f" - integrity sha512-4wtClcDXj/xhoR4yUTuUuZvVrI7MZviQwW+CKecD8GL+1BScqqAjjl97aEFlJJp+uSdEZscl9ugWLROc3weC9Q== +"@rails/webpacker@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-4.2.2.tgz#b9dd3235fdf4d0badbda8e33f6ebee742a9f3abb" + integrity sha512-jzw7qMfSCLdrt9j1X+2IvXjf63huXYqeIPwLujXa9pYFvxtEstbVYRDivuLhiDokzih+PrYpB+dLTGBNgVsnpw== dependencies: "@babel/core" "^7.7.2" "@babel/plugin-proposal-class-properties" "^7.7.0" @@ -2436,7 +2436,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2570,11 +2570,6 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -3395,13 +3390,6 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - fs-minipass@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1" @@ -3903,7 +3891,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3927,13 +3915,6 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== - dependencies: - minimatch "^3.0.4" - ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -5053,14 +5034,6 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - minipass@^3.0.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" @@ -5068,13 +5041,6 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -5183,15 +5149,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -needle@^2.2.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" - integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -5259,22 +5216,6 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.42: version "1.1.43" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.43.tgz#2c6ca237f88ce11d49631f11190bb01f8d0549f2" @@ -5312,14 +5253,6 @@ node-sass@^4.13.0: dependencies: abbrev "1" -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= - dependencies: - abbrev "1" - osenv "^0.1.4" - normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -5362,26 +5295,6 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== -npm-bundled@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" - integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== - dependencies: - npm-normalize-package-bin "^1.0.1" - -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-packlist@^1.1.6: - version "1.4.7" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" - integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -5389,7 +5302,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -5593,7 +5506,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0, osenv@^0.1.4: +osenv@0: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -6764,7 +6677,7 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.7, rc@~1.2.7: +rc@~1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -7071,7 +6984,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7157,7 +7070,7 @@ sass-loader@7.3.1: pify "^4.0.1" semver "^6.3.0" -sax@^1.2.4, sax@~1.2.4: +sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -7204,7 +7117,7 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7843,19 +7756,6 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4.4.2: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -8514,7 +8414,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== From 2e54e8e3a3d864c3f99f3f65a3126e69ab57e5cb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:44:37 +0000 Subject: [PATCH 105/216] chore(deps): bump minipass from 2.9.0 to 3.1.1 Bumps [minipass](https://github.com/isaacs/minipass) from 2.9.0 to 3.1.1. - [Release notes](https://github.com/isaacs/minipass/releases) - [Commits](https://github.com/isaacs/minipass/compare/v2.9.0...v3.1.1) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 118 +++++------------------------------------------------- 1 file changed, 9 insertions(+), 109 deletions(-) diff --git a/yarn.lock b/yarn.lock index df10bc56e..1d214c8fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2436,7 +2436,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2570,11 +2570,6 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -3395,13 +3390,6 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - fs-minipass@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1" @@ -3903,7 +3891,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3927,13 +3915,6 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== - dependencies: - minimatch "^3.0.4" - ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -5053,14 +5034,6 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - minipass@^3.0.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" @@ -5068,13 +5041,6 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -5183,15 +5149,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -needle@^2.2.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" - integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -5259,22 +5216,6 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.42: version "1.1.43" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.43.tgz#2c6ca237f88ce11d49631f11190bb01f8d0549f2" @@ -5312,14 +5253,6 @@ node-sass@^4.13.0: dependencies: abbrev "1" -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= - dependencies: - abbrev "1" - osenv "^0.1.4" - normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -5362,26 +5295,6 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== -npm-bundled@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" - integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== - dependencies: - npm-normalize-package-bin "^1.0.1" - -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-packlist@^1.1.6: - version "1.4.7" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" - integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -5389,7 +5302,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -5593,7 +5506,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0, osenv@^0.1.4: +osenv@0: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -6764,7 +6677,7 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.7, rc@~1.2.7: +rc@~1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -7071,7 +6984,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7157,7 +7070,7 @@ sass-loader@7.3.1: pify "^4.0.1" semver "^6.3.0" -sax@^1.2.4, sax@~1.2.4: +sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -7204,7 +7117,7 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7843,19 +7756,6 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4.4.2: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -8514,7 +8414,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== From f6547c9f7e82b1245d171a0293973e55ada26109 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:45:00 +0000 Subject: [PATCH 106/216] chore(deps): bump public_suffix from 4.0.1 to 4.0.2 Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/weppos/publicsuffix-ruby/releases) - [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/weppos/publicsuffix-ruby/compare/v4.0.1...4.0.2) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 28f8d9b71..e33b27ed5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -273,7 +273,7 @@ GEM method_source (~> 0.9.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.1) + public_suffix (4.0.2) puma (4.3.1) nio4r (~> 2.0) pundit (2.1.0) From a5d833e481bb815bc14c680de4489e7e864c201a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Tue, 31 Dec 2019 11:05:35 +0300 Subject: [PATCH 107/216] =?UTF-8?q?=C3=96rnek=20seed=20verilerine=20cezmi?= =?UTF-8?q?=20kullan=C4=B1c=C4=B1s=C4=B1n=C4=B1=20ekle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/beta_seed/user.rb | 38 ++++++++++++++++++++++++++++++++++++++ db/seeds.rb | 3 --- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 db/beta_seed/user.rb diff --git a/db/beta_seed/user.rb b/db/beta_seed/user.rb new file mode 100644 index 000000000..87ba7dacf --- /dev/null +++ b/db/beta_seed/user.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +user = User.new( + id_number: 11_111_111_111, + email: 'cezmi@baum.omu.edu.tr', + password: '123456', + password_confirmation: '123456', + activated: true +) + +User.skip_callback(:commit, :after, :build_address_information) +User.skip_callback(:commit, :after, :build_identity_information) +user.save(validate: false) +User.after_create_commit :build_address_information +User.after_create_commit :build_identity_information + +Identity.create!( + type: 'informal', + first_name: 'Cezmi Seha', + last_name: 'SAHİR', + mothers_name: 'Bilge', + fathers_name: 'Emre Can', + gender: 'male', + marital_status: 'single', + place_of_birth: 'Samsun', + date_of_birth: Time.zone.now.to_date, + user_id: user.id, + student_id: nil +) + +Address.create!( + type: 'informal', + full_address: 'Ondokuz Mayıs Üniversitesi Rektörlük Binası Kurupelit Kampüsü, 55139 Atakum / SAMSUN', + district_id: 769, + user_id: user.id +) + +user.roles << Patron::Role.all diff --git a/db/seeds.rb b/db/seeds.rb index af255c7dd..7c68aa573 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -65,6 +65,3 @@ def restore_seed_data(encrypted_data_name) # authorization data Rake::Task['patron:all'].invoke - -user = User.find_by(id_number: '11111111111') -user.roles << Patron::Role.all if user From cad94c9b7a46c418c59dc8a69a25bad4ee5e038a Mon Sep 17 00:00:00 2001 From: dilara Date: Thu, 2 Jan 2020 11:34:58 +0300 Subject: [PATCH 108/216] Add semester registration model --- app/models/semester_registration.rb | 14 +++ ...226074849_create_semester_registrations.rb | 18 ++++ db/structure.sql | 85 ++++++++++++++++++- 3 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 app/models/semester_registration.rb create mode 100644 db/migrate/20191226074849_create_semester_registrations.rb diff --git a/app/models/semester_registration.rb b/app/models/semester_registration.rb new file mode 100644 index 000000000..f2eef5408 --- /dev/null +++ b/app/models/semester_registration.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +class SemesterRegistration < ApplicationRecord + # enums + enum status: { draft: 0, saved: 1 } + + # relations + belongs_to :academic_term + belongs_to :student + + # validations + validates :semester, uniqueness: { scope: :student_id } + validates :semester, numericality: { greater_than: 0 } +end diff --git a/db/migrate/20191226074849_create_semester_registrations.rb b/db/migrate/20191226074849_create_semester_registrations.rb new file mode 100644 index 000000000..cc9d1c31f --- /dev/null +++ b/db/migrate/20191226074849_create_semester_registrations.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class CreateSemesterRegistrations < ActiveRecord::Migration[6.0] + def change + create_table :semester_registrations do |t| + t.integer :semester + t.integer :status, null: false, default: 0 + t.references :academic_term, null: false, foreign_key: true + t.references :student, null: false, foreign_key: true + t.timestamps + end + + add_null_constraint :semester_registrations, :semester + + add_numericality_constraint :semester_registrations, :semester, greater_than: 0 + add_numericality_constraint :semester_registrations, :status, greater_than_or_equal_to: 0 + end +end diff --git a/db/structure.sql b/db/structure.sql index 599802745..a3d4c805f 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -2857,6 +2857,43 @@ CREATE SEQUENCE public.scope_assignments_id_seq ALTER SEQUENCE public.scope_assignments_id_seq OWNED BY public.scope_assignments.id; +-- +-- Name: semester_registrations; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.semester_registrations ( + id bigint NOT NULL, + semester integer, + status integer DEFAULT 0 NOT NULL, + academic_term_id bigint NOT NULL, + student_id bigint NOT NULL, + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL, + CONSTRAINT semester_registrations_semester_null CHECK ((semester IS NOT NULL)), + CONSTRAINT semester_registrations_semester_numericality CHECK ((semester > 0)), + CONSTRAINT semester_registrations_status_numericality CHECK ((status >= 0)) +); + + +-- +-- Name: semester_registrations_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.semester_registrations_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: semester_registrations_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.semester_registrations_id_seq OWNED BY public.semester_registrations.id; + + -- -- Name: student_disability_types; Type: TABLE; Schema: public; Owner: - -- @@ -4042,6 +4079,13 @@ ALTER TABLE ONLY public.roles ALTER COLUMN id SET DEFAULT nextval('public.roles_ ALTER TABLE ONLY public.scope_assignments ALTER COLUMN id SET DEFAULT nextval('public.scope_assignments_id_seq'::regclass); +-- +-- Name: semester_registrations id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.semester_registrations ALTER COLUMN id SET DEFAULT nextval('public.semester_registrations_id_seq'::regclass); + + -- -- Name: student_disability_types id; Type: DEFAULT; Schema: public; Owner: - -- @@ -4839,6 +4883,14 @@ ALTER TABLE ONLY public.scope_assignments ADD CONSTRAINT scope_assignments_pkey PRIMARY KEY (id); +-- +-- Name: semester_registrations semester_registrations_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.semester_registrations + ADD CONSTRAINT semester_registrations_pkey PRIMARY KEY (id); + + -- -- Name: student_disability_types student_disability_types_code_unique; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -5915,6 +5967,20 @@ CREATE INDEX index_scope_assignments_on_query_store_id ON public.scope_assignmen CREATE INDEX index_scope_assignments_on_user_id ON public.scope_assignments USING btree (user_id); +-- +-- Name: index_semester_registrations_on_academic_term_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_semester_registrations_on_academic_term_id ON public.semester_registrations USING btree (academic_term_id); + + +-- +-- Name: index_semester_registrations_on_student_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_semester_registrations_on_student_id ON public.semester_registrations USING btree (student_id); + + -- -- Name: index_students_on_unit_id; Type: INDEX; Schema: public; Owner: - -- @@ -6244,6 +6310,14 @@ ALTER TABLE ONLY public.course_groups ADD CONSTRAINT fk_rails_4af2ef6ebe FOREIGN KEY (course_group_type_id) REFERENCES public.course_group_types(id); +-- +-- Name: semester_registrations fk_rails_4de980fa38; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.semester_registrations + ADD CONSTRAINT fk_rails_4de980fa38 FOREIGN KEY (academic_term_id) REFERENCES public.academic_terms(id); + + -- -- Name: calendar_committee_decisions fk_rails_4f3eb3da94; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -6484,6 +6558,14 @@ ALTER TABLE ONLY public.scope_assignments ADD CONSTRAINT fk_rails_9d2d00a9ee FOREIGN KEY (user_id) REFERENCES public.users(id); +-- +-- Name: semester_registrations fk_rails_a47620f287; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.semester_registrations + ADD CONSTRAINT fk_rails_a47620f287 FOREIGN KEY (student_id) REFERENCES public.students(id); + + -- -- Name: prospective_students fk_rails_a6111d55a4; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -6899,6 +6981,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20191021073002'), ('20191111082956'), ('20191113054514'), -('20191127055945'); +('20191127055945'), +('20191226074849'); From debeba84346ae1ee6e2ed8a6b34f429e4f8cbabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Thu, 2 Jan 2020 14:26:41 +0300 Subject: [PATCH 109/216] Handle unverified request with reset_session --- app/controllers/application_controller.rb | 9 +++++++-- config/locales/errors/en.yml | 1 + config/locales/errors/tr.yml | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f822f87bc..3489bb908 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -4,14 +4,14 @@ class ApplicationController < ActionController::Base include Pundit include Patron::Sudoable - protect_from_forgery with: :exception + protect_from_forgery with: :reset_session before_action :configure_permitted_parameters, if: :devise_controller? before_action :authenticate_user! before_action :set_locale rescue_from ActiveRecord::RecordNotFound, with: :not_found - rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized + rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized def set_locale update_preferred_language if user_signed_in? @@ -54,6 +54,11 @@ def configure_permitted_parameters private + def handle_unverified_request + super + redirect_back(fallback_location: root_path, alert: t('errors.invalid_authenticity_token')) + end + def user_not_authorized(exception) flash[:alert] = t( "#{exception.policy.class.name.underscore}.#{exception.query}", diff --git a/config/locales/errors/en.yml b/config/locales/errors/en.yml index 099bf84f6..1f113f7d5 100644 --- a/config/locales/errors/en.yml +++ b/config/locales/errors/en.yml @@ -6,3 +6,4 @@ en: invalid_email: This is not a valid e-mail address! system_error: The system error has occurred. Please try later. unicode_not_supported: Receiver does not support unicode encoding! + invalid_authenticity_token: Invalid authenticity token! Please try again. diff --git a/config/locales/errors/tr.yml b/config/locales/errors/tr.yml index 2b9967d6b..575209ba7 100644 --- a/config/locales/errors/tr.yml +++ b/config/locales/errors/tr.yml @@ -6,3 +6,4 @@ tr: invalid_email: Geçerli bir e-mail adresi değil! system_error: Sistemsel bir hata oluştu. Lütfen daha sonra tekrar deneyin. unicode_not_supported: Alıcı numara unicode desteklemiyor! + invalid_authenticity_token: Geçersiz kimlik doğrulama jetonu! Lütfen tekrar deneyin. From 2a598b7ab7e4b7c62cb4baacc263abf623efde32 Mon Sep 17 00:00:00 2001 From: dilara Date: Thu, 2 Jan 2020 14:54:12 +0300 Subject: [PATCH 110/216] Remove semester & student from course enrollments --- app/models/course_enrollment.rb | 13 +---------- app/models/student.rb | 1 - ...udent_reference_from_course_enrollments.rb | 8 +++++++ db/structure.sql | 22 ++----------------- 4 files changed, 11 insertions(+), 33 deletions(-) create mode 100644 db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb diff --git a/app/models/course_enrollment.rb b/app/models/course_enrollment.rb index 638b5dccc..c72664a58 100644 --- a/app/models/course_enrollment.rb +++ b/app/models/course_enrollment.rb @@ -1,26 +1,15 @@ # frozen_string_literal: true class CourseEnrollment < ApplicationRecord - # callbacks - before_validation :assign_semester - # enums enum status: { draft: 0, saved: 1 } # relations - belongs_to :student belongs_to :available_course # validations - validates :student, uniqueness: { scope: :available_course } - validates :semester, numericality: { greater_than: 0 } + validates :available_course, uniqueness: { scope: :semester_registration_id } # delegates delegate :ects, to: :available_course - - private - - def assign_semester - self.semester = student&.semester - end end diff --git a/app/models/student.rb b/app/models/student.rb index af7f57bef..f4dbf6761 100644 --- a/app/models/student.rb +++ b/app/models/student.rb @@ -11,7 +11,6 @@ class Student < ApplicationRecord has_one :identity, dependent: :destroy has_many :calendars, -> { Calendar.active }, through: :unit has_many :curriculums, through: :unit - has_many :course_enrollments, dependent: :destroy # scopes # TODO: Query will be organized according to activity status diff --git a/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb b/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb new file mode 100644 index 000000000..4191d3b49 --- /dev/null +++ b/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb @@ -0,0 +1,8 @@ +class RemoveSemesterAndStudentReferenceFromCourseEnrollments < ActiveRecord::Migration[6.0] + def change + remove_reference :course_enrollments, :student, null: false, foreign_key: true + remove_numericality_constraint :course_enrollments, :semester, greater_than: 0 + remove_null_constraint :course_enrollments, :semester + remove_column :course_enrollments, :semester, :integer + end +end diff --git a/db/structure.sql b/db/structure.sql index a3d4c805f..0b8bd2553 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1242,14 +1242,10 @@ ALTER SEQUENCE public.course_assessment_methods_id_seq OWNED BY public.course_as CREATE TABLE public.course_enrollments ( id bigint NOT NULL, - semester integer, - student_id bigint NOT NULL, available_course_id bigint NOT NULL, status integer DEFAULT 0 NOT NULL, created_at timestamp(6) without time zone NOT NULL, updated_at timestamp(6) without time zone NOT NULL, - CONSTRAINT course_enrollments_semester_null CHECK ((semester IS NOT NULL)), - CONSTRAINT course_enrollments_semester_numericality CHECK ((semester > 0)), CONSTRAINT course_enrollments_status_numericality CHECK ((status >= 0)) ); @@ -5526,13 +5522,6 @@ CREATE INDEX index_course_assessment_methods_on_course_evaluation_type_id ON pub CREATE INDEX index_course_enrollments_on_available_course_id ON public.course_enrollments USING btree (available_course_id); --- --- Name: index_course_enrollments_on_student_id; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX index_course_enrollments_on_student_id ON public.course_enrollments USING btree (student_id); - - -- -- Name: index_course_evaluation_types_on_available_course_id; Type: INDEX; Schema: public; Owner: - -- @@ -6478,14 +6467,6 @@ ALTER TABLE ONLY public.units ADD CONSTRAINT fk_rails_8ab0da65e4 FOREIGN KEY (unit_instruction_type_id) REFERENCES public.unit_instruction_types(id); --- --- Name: course_enrollments fk_rails_8ab18ea2b7; Type: FK CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.course_enrollments - ADD CONSTRAINT fk_rails_8ab18ea2b7 FOREIGN KEY (student_id) REFERENCES public.students(id); - - -- -- Name: positions fk_rails_8d264a5cbc; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -6982,6 +6963,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20191111082956'), ('20191113054514'), ('20191127055945'), -('20191226074849'); +('20191226074849'), +('20200102083531'); From 0af72c43f71dbe418570a80bd06c2f0961827764 Mon Sep 17 00:00:00 2001 From: dilara Date: Thu, 2 Jan 2020 14:58:17 +0300 Subject: [PATCH 111/216] Add semester registration to course enrollments --- app/models/course_enrollment.rb | 1 + app/models/semester_registration.rb | 1 + ...tration_reference_to_course_enrollments.rb | 5 +++++ db/structure.sql | 19 ++++++++++++++++++- 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200102083736_add_semester_registration_reference_to_course_enrollments.rb diff --git a/app/models/course_enrollment.rb b/app/models/course_enrollment.rb index c72664a58..c5af7552f 100644 --- a/app/models/course_enrollment.rb +++ b/app/models/course_enrollment.rb @@ -6,6 +6,7 @@ class CourseEnrollment < ApplicationRecord # relations belongs_to :available_course + belongs_to :semester_registration # validations validates :available_course, uniqueness: { scope: :semester_registration_id } diff --git a/app/models/semester_registration.rb b/app/models/semester_registration.rb index f2eef5408..17adedb5a 100644 --- a/app/models/semester_registration.rb +++ b/app/models/semester_registration.rb @@ -7,6 +7,7 @@ class SemesterRegistration < ApplicationRecord # relations belongs_to :academic_term belongs_to :student + has_many :course_enrollments, dependent: :destroy # validations validates :semester, uniqueness: { scope: :student_id } diff --git a/db/migrate/20200102083736_add_semester_registration_reference_to_course_enrollments.rb b/db/migrate/20200102083736_add_semester_registration_reference_to_course_enrollments.rb new file mode 100644 index 000000000..8e701c830 --- /dev/null +++ b/db/migrate/20200102083736_add_semester_registration_reference_to_course_enrollments.rb @@ -0,0 +1,5 @@ +class AddSemesterRegistrationReferenceToCourseEnrollments < ActiveRecord::Migration[6.0] + def change + add_reference :course_enrollments, :semester_registration, null: false, foreign_key: true + end +end diff --git a/db/structure.sql b/db/structure.sql index 0b8bd2553..5b0628516 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1246,6 +1246,7 @@ CREATE TABLE public.course_enrollments ( status integer DEFAULT 0 NOT NULL, created_at timestamp(6) without time zone NOT NULL, updated_at timestamp(6) without time zone NOT NULL, + semester_registration_id bigint NOT NULL, CONSTRAINT course_enrollments_status_numericality CHECK ((status >= 0)) ); @@ -5522,6 +5523,13 @@ CREATE INDEX index_course_assessment_methods_on_course_evaluation_type_id ON pub CREATE INDEX index_course_enrollments_on_available_course_id ON public.course_enrollments USING btree (available_course_id); +-- +-- Name: index_course_enrollments_on_semester_registration_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_course_enrollments_on_semester_registration_id ON public.course_enrollments USING btree (semester_registration_id); + + -- -- Name: index_course_evaluation_types_on_available_course_id; Type: INDEX; Schema: public; Owner: - -- @@ -6635,6 +6643,14 @@ ALTER TABLE ONLY public.academic_credentials ADD CONSTRAINT fk_rails_b9d9c54fa8 FOREIGN KEY (country_id) REFERENCES public.countries(id); +-- +-- Name: course_enrollments fk_rails_baabe22f29; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.course_enrollments + ADD CONSTRAINT fk_rails_baabe22f29 FOREIGN KEY (semester_registration_id) REFERENCES public.semester_registrations(id); + + -- -- Name: course_evaluation_types fk_rails_bb4be290e9; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -6964,6 +6980,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20191113054514'), ('20191127055945'), ('20191226074849'), -('20200102083531'); +('20200102083531'), +('20200102083736'); From f23c9b90d9871b8402e994d7357273bb6fa68d42 Mon Sep 17 00:00:00 2001 From: dilara Date: Thu, 2 Jan 2020 14:59:38 +0300 Subject: [PATCH 112/216] Set academic term and semester of registration --- app/models/semester_registration.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/models/semester_registration.rb b/app/models/semester_registration.rb index 17adedb5a..bacbfdd5d 100644 --- a/app/models/semester_registration.rb +++ b/app/models/semester_registration.rb @@ -1,6 +1,10 @@ # frozen_string_literal: true class SemesterRegistration < ApplicationRecord + # callbacks + before_validation :assign_academic_term + before_validation :assign_semester + # enums enum status: { draft: 0, saved: 1 } @@ -12,4 +16,14 @@ class SemesterRegistration < ApplicationRecord # validations validates :semester, uniqueness: { scope: :student_id } validates :semester, numericality: { greater_than: 0 } + + private + + def assign_academic_term + self.academic_term = AcademicTerm.current + end + + def assign_semester + self.semester = student&.semester + end end From 15baa7e94746ea02b18f5f0123fd5030f7633dee Mon Sep 17 00:00:00 2001 From: dilara Date: Thu, 2 Jan 2020 15:03:30 +0300 Subject: [PATCH 113/216] Add current semester registration method --- app/models/student.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/models/student.rb b/app/models/student.rb index f4dbf6761..b55d3af19 100644 --- a/app/models/student.rb +++ b/app/models/student.rb @@ -11,6 +11,7 @@ class Student < ApplicationRecord has_one :identity, dependent: :destroy has_many :calendars, -> { Calendar.active }, through: :unit has_many :curriculums, through: :unit + has_many :semester_registrations, dependent: :destroy # scopes # TODO: Query will be organized according to activity status @@ -37,6 +38,11 @@ def gpa student_number.to_s[-2..].to_f / 25 end + def current_registration + @current_registration = + semester_registrations.where(semester: semester).last || semester_registrations.create + end + private def build_identity_information From 30bb307d7e6e53d55e22bb739274e2f489976aa6 Mon Sep 17 00:00:00 2001 From: dilara Date: Thu, 2 Jan 2020 15:09:43 +0300 Subject: [PATCH 114/216] Add semester registration relation to academic term --- app/models/academic_term.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/academic_term.rb b/app/models/academic_term.rb index cc05b59c1..83250b240 100644 --- a/app/models/academic_term.rb +++ b/app/models/academic_term.rb @@ -10,6 +10,7 @@ class AcademicTerm < ApplicationRecord has_many :calendars, dependent: :nullify has_many :prospective_students, dependent: :nullify has_many :registration_documents, dependent: :nullify + has_many :semester_registrations, dependent: :nullify # validations validates :active, inclusion: { in: [true, false] } From 310db914f4c42670977eb3d540f69fda496984dd Mon Sep 17 00:00:00 2001 From: dilara Date: Thu, 2 Jan 2020 15:15:26 +0300 Subject: [PATCH 115/216] Refactor student course enrollment service --- .../course_enrollments_controller.rb | 29 ++++++++----------- .../student_course_enrollment_service.rb | 25 +++++++++++----- .../course_enrollments/_student_info.html.erb | 2 +- .../course_enrollments/index.html.erb | 8 ++--- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/app/controllers/studentship/course_enrollments_controller.rb b/app/controllers/studentship/course_enrollments_controller.rb index c55453c14..a78a3eb2a 100644 --- a/app/controllers/studentship/course_enrollments_controller.rb +++ b/app/controllers/studentship/course_enrollments_controller.rb @@ -3,8 +3,7 @@ module Studentship class CourseEnrollmentsController < ApplicationController before_action :set_student - before_action :set_service - before_action :build_catalog, only: :new + before_action :set_service, except: :index before_action :set_course_enrollment, only: :destroy before_action :check_registrability, except: :index before_action :check_enrollment_status, except: %i[index list] @@ -15,26 +14,26 @@ def index def list; end - def new; end + def new + @service.build_catalog + end def create - course_enrollment = @student.course_enrollments.new(course_enrollment_params) - @service.enrollable!(course_enrollment.available_course) - - redirect_with(course_enrollment.save ? t('.success') : t('.error')) + message = @service.enroll(course_enrollment_params) ? t('.success') : t('.error') + redirect_with(message) rescue StudentCourseEnrollmentService::EnrollableError => e redirect_with(e.message) end def destroy - @service.dropable!(@course_enrollment.available_course) - redirect_with(@course_enrollment.destroy ? t('.success') : t('.error')) + message = @service.drop(@course_enrollment) ? t('.success') : t('.error') + redirect_with(message) rescue StudentCourseEnrollmentService::EnrollableError => e redirect_with(e.message) end def save - message = @service.course_enrollments.update(status: :saved) ? t('.success') : t('.error') + message = @service.save ? t('.success') : t('.error') redirect_to(list_student_course_enrollments_path(@student), flash: { info: message }) end @@ -53,12 +52,8 @@ def set_service @service = StudentCourseEnrollmentService.new(@student) end - def build_catalog - @service.build_catalog - end - def set_course_enrollment - @course_enrollment = @student.course_enrollments.find(params[:id]) + @course_enrollment = @student.current_registration.course_enrollments.find(params[:id]) end def check_registrability @@ -68,9 +63,9 @@ def check_registrability end def check_enrollment_status - return if @service.enrollment_status != :saved + return if @student.current_registration.draft? - redirect_to(student_course_enrollments_path(@student), alert: t('.errors.registration completed')) + redirect_to(student_course_enrollments_path(@student), alert: t('.errors.enrollment_completed')) end def course_enrollment_params diff --git a/app/services/student_course_enrollment_service.rb b/app/services/student_course_enrollment_service.rb index 19c7d7850..54ef61e06 100644 --- a/app/services/student_course_enrollment_service.rb +++ b/app/services/student_course_enrollment_service.rb @@ -35,16 +35,25 @@ def remaining_ects def course_enrollments @course_enrollments ||= - student.course_enrollments - .where(semester: @student.semester) - .includes(available_course: [curriculum_course: %i[course curriculum_semester]]) + @student.current_registration + .course_enrollments + .includes(available_course: [curriculum_course: %i[course curriculum_semester]]) end - def enrollment_status - @enrollment_status ||= - if course_enrollments.any? - course_enrollments.exists?(status: :draft) ? :draft : :saved - end + def enroll(course_enrollment_params) + course_enrollment = @student.current_registration.course_enrollments.new(course_enrollment_params) + enrollable!(course_enrollment.available_course) + course_enrollment.save + end + + def drop(course_enrollment) + dropable!(course_enrollment.available_course) + course_enrollment.destroy + end + + def save + @student.current_registration.course_enrollments.update(status: :saved) + @student.current_registration.update(status: :saved) end def enrollable(available_course) diff --git a/app/views/studentship/course_enrollments/_student_info.html.erb b/app/views/studentship/course_enrollments/_student_info.html.erb index 818419fa5..842664100 100644 --- a/app/views/studentship/course_enrollments/_student_info.html.erb +++ b/app/views/studentship/course_enrollments/_student_info.html.erb @@ -26,7 +26,7 @@ <%= t('.enrollment_status') %> - <%= t('activerecord.enums.course_enrollment.statuses')[@service.enrollment_status] %> + <%= t('activerecord.enums.semester_enrollment.statuses')[@student.current_registration.status.to_sym] %> diff --git a/app/views/studentship/course_enrollments/index.html.erb b/app/views/studentship/course_enrollments/index.html.erb index 810855bed..a728a0966 100644 --- a/app/views/studentship/course_enrollments/index.html.erb +++ b/app/views/studentship/course_enrollments/index.html.erb @@ -10,10 +10,10 @@
- <% if @service.enrollment_status != :saved %> - <% url = new_student_course_enrollment_url(@student) %> - <% else %> + <% if @student.current_registration.saved? %> <% url = list_student_course_enrollments_url(@student) %> + <% else %> + <% url = new_student_course_enrollment_url(@student) %> <% end %> <%= link_to url, class: 'list-group-item list-group-item-action align-items-center' do %> @@ -21,7 +21,7 @@
<%= @student.unit.name %>

<%= @student.registation_date_range %>

- <%= "#{t('.enrollment_status')}: #{t('activerecord.enums.course_enrollment.statuses')[@service.enrollment_status]}" if @service.enrollment_status.presence %> + <%= "#{t('.enrollment_status')}: #{t('activerecord.enums.course_enrollment.statuses')[@student.current_registration.status.to_sym]}" %> <% end %>
From 12f0261f55d1740b7fff17d4016b251a1cea85a4 Mon Sep 17 00:00:00 2001 From: dilara Date: Thu, 2 Jan 2020 15:16:59 +0300 Subject: [PATCH 116/216] Add missing locales --- .../locales/controllers/studentship/course_enrollments.en.yml | 4 ++++ .../locales/controllers/studentship/course_enrollments.tr.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/config/locales/controllers/studentship/course_enrollments.en.yml b/config/locales/controllers/studentship/course_enrollments.en.yml index 60787ae18..c011df584 100644 --- a/config/locales/controllers/studentship/course_enrollments.en.yml +++ b/config/locales/controllers/studentship/course_enrollments.en.yml @@ -5,6 +5,10 @@ en: statuses: draft: Draft saved: Saved + semester_enrollment: + statuses: + draft: Draft + saved: Saved studentship: course_enrollments: available_courses: &course_attributes diff --git a/config/locales/controllers/studentship/course_enrollments.tr.yml b/config/locales/controllers/studentship/course_enrollments.tr.yml index a6aef35af..547424d24 100644 --- a/config/locales/controllers/studentship/course_enrollments.tr.yml +++ b/config/locales/controllers/studentship/course_enrollments.tr.yml @@ -5,6 +5,10 @@ tr: statuses: draft: Taslak saved: Kaydedildi + semester_enrollment: + statuses: + draft: Taslak + saved: Kaydedildi studentship: course_enrollments: available_courses: &course_attributes From 65860fb6364440e6437b9425528442e93d624b27 Mon Sep 17 00:00:00 2001 From: dilara Date: Thu, 2 Jan 2020 15:22:22 +0300 Subject: [PATCH 117/216] Add tests for semester registration --- test/fixtures/semester_registrations.yml | 12 ++++++++++ test/models/semester_registration_test.rb | 29 +++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 test/fixtures/semester_registrations.yml create mode 100644 test/models/semester_registration_test.rb diff --git a/test/fixtures/semester_registrations.yml b/test/fixtures/semester_registrations.yml new file mode 100644 index 000000000..64cfa78b8 --- /dev/null +++ b/test/fixtures/semester_registrations.yml @@ -0,0 +1,12 @@ +serhat_first_semester: + academic_term: summer_2018_2019 + semester: 1 + student: serhat +serhat_third_semester: + academic_term: active_term + semester: 3 + student: serhat +john_third_semester: + academic_term: active_term + semester: 3 + student: john \ No newline at end of file diff --git a/test/models/semester_registration_test.rb b/test/models/semester_registration_test.rb new file mode 100644 index 000000000..52917e682 --- /dev/null +++ b/test/models/semester_registration_test.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +require 'test_helper' + +class SemesterRegistrationTest < ActiveSupport::TestCase + extend Support::Minitest::AssociationHelper + extend Support::Minitest::CallbackHelper + extend Support::Minitest::EnumerationHelper + extend Support::Minitest::ValidationHelper + + # callbacks + before_validation :assign_academic_term + before_validation :assign_semester + + # enums + enum status: { draft: 0, saved: 1 } + + # relations + belongs_to :academic_term + belongs_to :student + has_many :course_enrollments, dependent: :destroy + + # validations: uniqueness + test 'uniqueness validations for semester registration of a semester' do + fake = semester_registrations(:serhat_third_semester).dup + assert_not fake.valid? + assert_not_empty fake.errors[:semester] + end +end From a2a23cf0363a71581c87b6fa44de5e2a2ec1ae16 Mon Sep 17 00:00:00 2001 From: dilara Date: Thu, 2 Jan 2020 15:26:20 +0300 Subject: [PATCH 118/216] Fix tests related to course enrollments --- .../course_enrollments_controller_test.rb | 6 ++---- test/fixtures/course_enrollments.yml | 17 ++++++----------- test/models/academic_term_test.rb | 1 + test/models/course_enrollment_test.rb | 10 +++------- test/models/student_test.rb | 2 +- .../student_course_enrollment_service_test.rb | 6 ------ 6 files changed, 13 insertions(+), 29 deletions(-) diff --git a/test/controllers/studentship/course_enrollments_controller_test.rb b/test/controllers/studentship/course_enrollments_controller_test.rb index 662adb673..2ad98c64a 100644 --- a/test/controllers/studentship/course_enrollments_controller_test.rb +++ b/test/controllers/studentship/course_enrollments_controller_test.rb @@ -29,21 +29,19 @@ class CourseEnrollmentsControllerTest < ActionDispatch::IntegrationTest course_enrollment = CourseEnrollment.last assert_equal available_courses(:compulsory_course_2), course_enrollment.available_course - assert_equal @student, course_enrollment.student - assert_equal @student.semester, course_enrollment.semester assert_equal 'draft', course_enrollment.status assert_redirected_to new_student_course_enrollment_path(@student) end test 'should save' do get save_student_course_enrollments_path(@student) - assert_equal StudentCourseEnrollmentService.new(@student).enrollment_status, :saved + assert @student.current_registration.saved? assert_redirected_to list_student_course_enrollments_path end test 'should destroy course_enrollment' do assert_difference('CourseEnrollment.count', -1) do - delete student_course_enrollment_path(@student, CourseEnrollment.last) + delete student_course_enrollment_path(@student, course_enrollments(:compulsory)) end assert_redirected_to new_student_course_enrollment_path(@student) diff --git a/test/fixtures/course_enrollments.yml b/test/fixtures/course_enrollments.yml index 643842097..33b460927 100644 --- a/test/fixtures/course_enrollments.yml +++ b/test/fixtures/course_enrollments.yml @@ -1,24 +1,19 @@ old: - student: serhat + semester_registration: serhat_first_semester available_course: test_fall_2018_2019 - semester: 1 status: saved elective: - student: serhat + semester_registration: serhat_third_semester available_course: elective_course - semester: 3 status: saved failed: - student: serhat + semester_registration: serhat_first_semester available_course: old_course - semester: 1 status: saved compulsory: - student: serhat + semester_registration: serhat_third_semester available_course: compulsory_course - semester: 3 johns_enrollment: - student: john + semester_registration: john_third_semester available_course: compulsory_course - semester: 3 - status: saved + status: saved \ No newline at end of file diff --git a/test/models/academic_term_test.rb b/test/models/academic_term_test.rb index fd15f4909..6300e3e00 100644 --- a/test/models/academic_term_test.rb +++ b/test/models/academic_term_test.rb @@ -12,6 +12,7 @@ class AcademicTermTest < ActiveSupport::TestCase has_many :calendars, dependent: :nullify has_many :prospective_students, dependent: :nullify has_many :registration_documents, dependent: :nullify + has_many :semester_registrations, dependent: :nullify # validations: presence validates_presence_of :active diff --git a/test/models/course_enrollment_test.rb b/test/models/course_enrollment_test.rb index 24f35653e..927f3e497 100644 --- a/test/models/course_enrollment_test.rb +++ b/test/models/course_enrollment_test.rb @@ -4,24 +4,20 @@ class CourseEnrollmentTest < ActiveSupport::TestCase extend Support::Minitest::AssociationHelper - extend Support::Minitest::CallbackHelper extend Support::Minitest::EnumerationHelper extend Support::Minitest::ValidationHelper - # callbacks - before_validation :assign_semester - # enums enum status: { draft: 0, saved: 1 } # relations - belongs_to :student belongs_to :available_course + belongs_to :semester_registration # validations: uniqueness - test 'uniqueness validations for course_enrollment of a student' do + test 'uniqueness validations for course_enrollment of a available_course' do fake = course_enrollments(:elective).dup assert_not fake.valid? - assert_not_empty fake.errors[:student] + assert_not_empty fake.errors[:available_course] end end diff --git a/test/models/student_test.rb b/test/models/student_test.rb index 03823b778..3063d6c01 100644 --- a/test/models/student_test.rb +++ b/test/models/student_test.rb @@ -14,7 +14,7 @@ class StudentTest < ActiveSupport::TestCase has_one :identity, dependent: :destroy has_many :calendars, through: :unit has_many :curriculums, through: :unit - has_many :course_enrollments, dependent: :destroy + has_many :semester_registrations, dependent: :destroy # validations: presence validates_presence_of :student_number diff --git a/test/services/student_course_enrollment_service_test.rb b/test/services/student_course_enrollment_service_test.rb index 02474df57..44e732b37 100644 --- a/test/services/student_course_enrollment_service_test.rb +++ b/test/services/student_course_enrollment_service_test.rb @@ -31,12 +31,6 @@ class StudentCourseEnrollmentServiceTest < ActiveSupport::TestCase assert_includes course_enrollments, course_enrollments(:elective) end - test 'enrollment_status method' do - assert_not StudentCourseEnrollmentService.new(students(:serhat_omu)).enrollment_status - assert_equal StudentCourseEnrollmentService.new(students(:john)).enrollment_status, :saved - assert_equal @service.enrollment_status, :draft - end - test 'catalog method' do @service.build_catalog semester_courses = @service.catalog[curriculum_semesters(:bilgisayar_muh_mufredati_ucuncu_donem)] From cbe02e18895a6311a03c2ea5dcd0ef0877d71b90 Mon Sep 17 00:00:00 2001 From: dilara Date: Sat, 4 Jan 2020 13:34:36 +0300 Subject: [PATCH 119/216] Fix wrong naming of locale key --- app/views/studentship/course_enrollments/_student_info.html.erb | 2 +- app/views/studentship/course_enrollments/index.html.erb | 2 +- .../locales/controllers/studentship/course_enrollments.en.yml | 2 +- .../locales/controllers/studentship/course_enrollments.tr.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/studentship/course_enrollments/_student_info.html.erb b/app/views/studentship/course_enrollments/_student_info.html.erb index 842664100..2f2d618f2 100644 --- a/app/views/studentship/course_enrollments/_student_info.html.erb +++ b/app/views/studentship/course_enrollments/_student_info.html.erb @@ -26,7 +26,7 @@ <%= t('.enrollment_status') %> - <%= t('activerecord.enums.semester_enrollment.statuses')[@student.current_registration.status.to_sym] %> + <%= t('activerecord.enums.semester_registration.statuses')[@student.current_registration.status.to_sym] %> diff --git a/app/views/studentship/course_enrollments/index.html.erb b/app/views/studentship/course_enrollments/index.html.erb index a728a0966..ff68a9486 100644 --- a/app/views/studentship/course_enrollments/index.html.erb +++ b/app/views/studentship/course_enrollments/index.html.erb @@ -21,7 +21,7 @@
<%= @student.unit.name %>

<%= @student.registation_date_range %>

- <%= "#{t('.enrollment_status')}: #{t('activerecord.enums.course_enrollment.statuses')[@student.current_registration.status.to_sym]}" %> + <%= "#{t('.enrollment_status')}: #{t('activerecord.enums.semester_registration.statuses')[@student.current_registration.status.to_sym]}" %> <% end %> diff --git a/config/locales/controllers/studentship/course_enrollments.en.yml b/config/locales/controllers/studentship/course_enrollments.en.yml index c011df584..75516e761 100644 --- a/config/locales/controllers/studentship/course_enrollments.en.yml +++ b/config/locales/controllers/studentship/course_enrollments.en.yml @@ -5,7 +5,7 @@ en: statuses: draft: Draft saved: Saved - semester_enrollment: + semester_registration: statuses: draft: Draft saved: Saved diff --git a/config/locales/controllers/studentship/course_enrollments.tr.yml b/config/locales/controllers/studentship/course_enrollments.tr.yml index 547424d24..31fd2b103 100644 --- a/config/locales/controllers/studentship/course_enrollments.tr.yml +++ b/config/locales/controllers/studentship/course_enrollments.tr.yml @@ -5,7 +5,7 @@ tr: statuses: draft: Taslak saved: Kaydedildi - semester_enrollment: + semester_registration: statuses: draft: Taslak saved: Kaydedildi From 0673b3a84dcd498ec56d2f9186b96a28b496021d Mon Sep 17 00:00:00 2001 From: dilara Date: Sat, 4 Jan 2020 13:40:40 +0300 Subject: [PATCH 120/216] Add missing tests --- .../student_course_enrollment_service_test.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/services/student_course_enrollment_service_test.rb b/test/services/student_course_enrollment_service_test.rb index 44e732b37..9db66992d 100644 --- a/test/services/student_course_enrollment_service_test.rb +++ b/test/services/student_course_enrollment_service_test.rb @@ -31,6 +31,22 @@ class StudentCourseEnrollmentServiceTest < ActiveSupport::TestCase assert_includes course_enrollments, course_enrollments(:elective) end + test 'enroll method' do + available_course = available_courses(:compulsory_course_2) + @service.enroll(available_course_id: available_course.id) + assert_includes @service.course_enrollments.pluck(:available_course_id), available_course.id + end + + test 'drop method' do + @service.drop(course_enrollments(:elective)) + assert_not_includes @service.course_enrollments, course_enrollments(:elective) + end + + test 'save method' do + @service.save + assert @service.student.current_registration.saved? + end + test 'catalog method' do @service.build_catalog semester_courses = @service.catalog[curriculum_semesters(:bilgisayar_muh_mufredati_ucuncu_donem)] From 55c0645af50145be9a718a920356f90f7bcae50d Mon Sep 17 00:00:00 2001 From: dilara Date: Sat, 4 Jan 2020 13:44:29 +0300 Subject: [PATCH 121/216] Change enrollment status as registration status --- app/controllers/studentship/course_enrollments_controller.rb | 4 ++-- .../studentship/course_enrollments/_student_info.html.erb | 2 +- app/views/studentship/course_enrollments/index.html.erb | 2 +- .../locales/controllers/studentship/course_enrollments.en.yml | 4 ++-- .../locales/controllers/studentship/course_enrollments.tr.yml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/studentship/course_enrollments_controller.rb b/app/controllers/studentship/course_enrollments_controller.rb index a78a3eb2a..e7b3cf27e 100644 --- a/app/controllers/studentship/course_enrollments_controller.rb +++ b/app/controllers/studentship/course_enrollments_controller.rb @@ -6,7 +6,7 @@ class CourseEnrollmentsController < ApplicationController before_action :set_service, except: :index before_action :set_course_enrollment, only: :destroy before_action :check_registrability, except: :index - before_action :check_enrollment_status, except: %i[index list] + before_action :check_registration_status, except: %i[index list] def index @students = current_user.students.includes(:unit) @@ -62,7 +62,7 @@ def check_registrability redirect_to(student_course_enrollments_path(@student), alert: t('.errors.not_proper_register_event_range')) end - def check_enrollment_status + def check_registration_status return if @student.current_registration.draft? redirect_to(student_course_enrollments_path(@student), alert: t('.errors.enrollment_completed')) diff --git a/app/views/studentship/course_enrollments/_student_info.html.erb b/app/views/studentship/course_enrollments/_student_info.html.erb index 2f2d618f2..42dfa4332 100644 --- a/app/views/studentship/course_enrollments/_student_info.html.erb +++ b/app/views/studentship/course_enrollments/_student_info.html.erb @@ -25,7 +25,7 @@ <%= @student.gpa %> - <%= t('.enrollment_status') %> + <%= t('.registration_status') %> <%= t('activerecord.enums.semester_registration.statuses')[@student.current_registration.status.to_sym] %> diff --git a/app/views/studentship/course_enrollments/index.html.erb b/app/views/studentship/course_enrollments/index.html.erb index ff68a9486..f920714bb 100644 --- a/app/views/studentship/course_enrollments/index.html.erb +++ b/app/views/studentship/course_enrollments/index.html.erb @@ -21,7 +21,7 @@
<%= @student.unit.name %>

<%= @student.registation_date_range %>

- <%= "#{t('.enrollment_status')}: #{t('activerecord.enums.semester_registration.statuses')[@student.current_registration.status.to_sym]}" %> + <%= "#{t('.registration_status')}: #{t('activerecord.enums.semester_registration.statuses')[@student.current_registration.status.to_sym]}" %> <% end %> diff --git a/config/locales/controllers/studentship/course_enrollments.en.yml b/config/locales/controllers/studentship/course_enrollments.en.yml index 75516e761..f4145bf0f 100644 --- a/config/locales/controllers/studentship/course_enrollments.en.yml +++ b/config/locales/controllers/studentship/course_enrollments.en.yml @@ -36,7 +36,7 @@ en: registration completed: You can not perform this action since you have completed the course selection. index: course_enrollments: Course Enrollments - enrollment_status: Enrollment Status + registration_status: Enrollment Status registration_date_range: "Online Course Registration Dates: %{start_time} - %{end_time}" list: <<: *course_attributes @@ -58,7 +58,7 @@ en: success: Selected courses successfully saved. student_info: academic_term: Academic Term - enrollment_status: Enrollment Status + registration_status: Enrollment Status gpa: GPA program: Program student_info: Student Information diff --git a/config/locales/controllers/studentship/course_enrollments.tr.yml b/config/locales/controllers/studentship/course_enrollments.tr.yml index 31fd2b103..f7ae57363 100644 --- a/config/locales/controllers/studentship/course_enrollments.tr.yml +++ b/config/locales/controllers/studentship/course_enrollments.tr.yml @@ -36,7 +36,7 @@ tr: registration completed: Ders seçimini tamamladığınız için bu işlemi gerçekleştiremezsiniz. index: course_enrollments: Ders Kayıtları - enrollment_status: Kayıtlanma Durumu + registration_status: Kayıt Durumu registration_date_range: "Çevrimiçi Ders Kayıt Tarihleri: %{start_time} - %{end_time}" list: <<: *course_attributes @@ -58,7 +58,7 @@ tr: success: Seçilen dersler başarıyla kaydedildi. student_info: academic_term: Akademik Dönem - enrollment_status: Kayıtlanma Durumu + registration_status: Kayıtlanma Durumu gpa: GANO program: Program student_info: Öğrenci Bilgileri From 3d437b5dd7cf58fc5cf53f041df3eba884959b3a Mon Sep 17 00:00:00 2001 From: dilara Date: Sat, 4 Jan 2020 14:10:51 +0300 Subject: [PATCH 122/216] Do not save when there is no selected course --- .../studentship/course_enrollments_controller.rb | 8 ++++++-- .../controllers/studentship/course_enrollments.en.yml | 1 + .../controllers/studentship/course_enrollments.tr.yml | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/studentship/course_enrollments_controller.rb b/app/controllers/studentship/course_enrollments_controller.rb index e7b3cf27e..092bca055 100644 --- a/app/controllers/studentship/course_enrollments_controller.rb +++ b/app/controllers/studentship/course_enrollments_controller.rb @@ -33,8 +33,12 @@ def destroy end def save - message = @service.save ? t('.success') : t('.error') - redirect_to(list_student_course_enrollments_path(@student), flash: { info: message }) + if @service.course_enrollments.any? + message = @service.save ? t('.success') : t('.error') + redirect_to(list_student_course_enrollments_path(@student), flash: { info: message }) + else + redirect_with(t('.errors.empty_selected_courses_list')) + end end private diff --git a/config/locales/controllers/studentship/course_enrollments.en.yml b/config/locales/controllers/studentship/course_enrollments.en.yml index f4145bf0f..b442b5c6b 100644 --- a/config/locales/controllers/studentship/course_enrollments.en.yml +++ b/config/locales/controllers/studentship/course_enrollments.en.yml @@ -29,6 +29,7 @@ en: success: The course successfully removed from selected courses. errors: already_enrolled_at_group: The maximum amount of ECTS that can be selected from the course group is selected. + empty_selected_courses_list: The list of selected courses is empty. quota_full: The course has reached its quota. must_drop_first: Courses taken from the top semester must be dropped first. not_enough_ects: The amount of ECTS that can be selected is not enough for you to take this course. diff --git a/config/locales/controllers/studentship/course_enrollments.tr.yml b/config/locales/controllers/studentship/course_enrollments.tr.yml index f7ae57363..09f73e346 100644 --- a/config/locales/controllers/studentship/course_enrollments.tr.yml +++ b/config/locales/controllers/studentship/course_enrollments.tr.yml @@ -29,6 +29,7 @@ tr: success: Ders seçilen derslerden çıkarıldı. errors: already_enrolled_at_group: Ders grubundan seçilebilecek maksimum AKTS miktarı kadar ders seçilmiş. + empty_selected_courses_list: Seçilen dersler listesi boş. quota_full: Ders için belirlenen kontenjan dolmuş. must_drop_first: Öncelikli olarak en üst dönemden alınan dersler çıkarılmalı. not_enough_ects: Seçilebilecek AKTS miktarı bu dersi alabilmeniz için yeterli değil. From 6d246fe8d20e8a8631959afab9e680338f005f8f Mon Sep 17 00:00:00 2001 From: dilara Date: Sat, 4 Jan 2020 14:41:46 +0300 Subject: [PATCH 123/216] Refactor student course enrollment service --- .../student_course_enrollment_service.rb | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/app/services/student_course_enrollment_service.rb b/app/services/student_course_enrollment_service.rb index 54ef61e06..f13a29801 100644 --- a/app/services/student_course_enrollment_service.rb +++ b/app/services/student_course_enrollment_service.rb @@ -42,13 +42,19 @@ def course_enrollments def enroll(course_enrollment_params) course_enrollment = @student.current_registration.course_enrollments.new(course_enrollment_params) - enrollable!(course_enrollment.available_course) - course_enrollment.save + available_course = course_enrollment.available_course + + return course_enrollment.save if enrollable(available_course).errors.empty? + + raise EnrollableError, available_course.errors.full_messages.first end def drop(course_enrollment) - dropable!(course_enrollment.available_course) - course_enrollment.destroy + available_course = course_enrollment.available_course + + return course_enrollment.destroy if dropable(available_course).errors.empty? + + raise EnrollableError, available_course.errors.full_messages.first end def save @@ -63,12 +69,6 @@ def enrollable(available_course) available_course end - def enrollable!(available_course) - return true if enrollable(available_course).errors.empty? - - raise EnrollableError, available_course.errors.full_messages.first - end - def dropable(available_course) sequence = available_course.curriculum_course.curriculum_semester.sequence available_course.errors.add(:base, translate('must_drop_first')) if max_sequence > sequence @@ -76,12 +76,6 @@ def dropable(available_course) available_course end - def dropable!(available_course) - return true if dropable(available_course).errors.empty? - - raise EnrollableError, available_course.errors.full_messages.first - end - private def extra_ects From 85e3744edb323c6b8d8aff7ff3f702a2f055f424 Mon Sep 17 00:00:00 2001 From: dilara Date: Sat, 4 Jan 2020 14:42:09 +0300 Subject: [PATCH 124/216] Remove unnecessary tests --- test/services/student_course_enrollment_service_test.rb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/test/services/student_course_enrollment_service_test.rb b/test/services/student_course_enrollment_service_test.rb index 9db66992d..2f561c575 100644 --- a/test/services/student_course_enrollment_service_test.rb +++ b/test/services/student_course_enrollment_service_test.rb @@ -66,10 +66,6 @@ class StudentCourseEnrollmentServiceTest < ActiveSupport::TestCase assert_equal available_course.errors.full_messages.first, translate('already_enrolled_at_group') end - test 'enrollabe! method' do - assert @service.enrollable(available_courses(:compulsory_course_2)) - end - test 'dropable method' do assert_empty @service.dropable(available_courses(:elective_course)).errors end @@ -79,10 +75,6 @@ class StudentCourseEnrollmentServiceTest < ActiveSupport::TestCase assert_equal available_course.errors.full_messages.first, translate('must_drop_first') end - test 'dropable! method' do - assert @service.dropable(available_courses(:elective_course)) - end - private def translate(key, params = {}) From aadf3c969b722536109823ed6a1a4652967eb6de Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:33:32 +0000 Subject: [PATCH 125/216] chore(deps): bump css-loader from 3.4.0 to 3.4.1 Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.4.0...v3.4.1) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 130 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 115 insertions(+), 15 deletions(-) diff --git a/yarn.lock b/yarn.lock index 799ee3087..a623e799d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2250,9 +2250,9 @@ css-has-pseudo@^0.10.0: postcss-selector-parser "^5.0.0-rc.4" css-loader@^3.2.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.0.tgz#9fb263436783117a41d014e45e8eaeba54dd6670" - integrity sha512-JornYo4RAXl1Mzt0lOSVPmArzAMV3rGY2VuwtaDc732WTWjdwTaeS19nCGWMcSCf305Q396lhhDAJEWWM0SgPQ== + version "3.4.1" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.1.tgz#dfb7968aa9bffb26bd20375afdffe77d5a234b77" + integrity sha512-+ybmv7sVxxNEenQhkifQDvny/1iNQM7YooJbSfVUdQQvisyg1aKIqgGjCjoFSyVLJMp17z9rfZFQaR5HGHcMbw== dependencies: camelcase "^5.3.1" cssesc "^3.0.0" @@ -2436,7 +2436,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: +debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2570,6 +2570,11 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -3390,6 +3395,13 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" +fs-minipass@^1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" + integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== + dependencies: + minipass "^2.6.0" + fs-minipass@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1" @@ -3892,7 +3904,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3916,6 +3928,13 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= +ignore-walk@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" + integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== + dependencies: + minimatch "^3.0.4" + ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -5035,6 +5054,14 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" +minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + minipass@^3.0.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" @@ -5042,6 +5069,13 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" +minizlib@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" + integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== + dependencies: + minipass "^2.9.0" + mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -5150,6 +5184,15 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +needle@^2.2.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" + integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -5217,6 +5260,22 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + node-releases@^1.1.42: version "1.1.43" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.43.tgz#2c6ca237f88ce11d49631f11190bb01f8d0549f2" @@ -5254,6 +5313,14 @@ node-sass@^4.13.0: dependencies: abbrev "1" +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= + dependencies: + abbrev "1" + osenv "^0.1.4" + normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -5296,6 +5363,26 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== +npm-bundled@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" + integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== + dependencies: + npm-normalize-package-bin "^1.0.1" + +npm-normalize-package-bin@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + +npm-packlist@^1.1.6: + version "1.4.7" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" + integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -5303,7 +5390,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -5507,7 +5594,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0: +osenv@0, osenv@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -6492,9 +6579,9 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1: uniq "^1.0.1" postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.25" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.25.tgz#dd2a2a753d50b13bed7a2009b4a18ac14d9db21e" - integrity sha512-NXXVvWq9icrm/TgQC0O6YVFi4StfJz46M1iNd/h6B26Nvh/HKI+q4YZtFN/EjcInZliEscO/WL10BXnc1E5nwg== + version "7.0.26" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz#5ed615cfcab35ba9bbb82414a4fa88ea10429587" + integrity sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA== dependencies: chalk "^2.4.2" source-map "^0.6.1" @@ -6678,7 +6765,7 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@~1.2.7: +rc@^1.2.7, rc@~1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -6985,7 +7072,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7071,7 +7158,7 @@ sass-loader@7.3.1: pify "^4.0.1" semver "^6.3.0" -sax@~1.2.4: +sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -7118,7 +7205,7 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7757,6 +7844,19 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" +tar@^4.4.2: + version "4.4.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" + integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.8.6" + minizlib "^1.2.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.3" + terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -8415,7 +8515,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.2: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== From edfea5fed914a6a8122613288be68dc9987a335e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:35:47 +0000 Subject: [PATCH 126/216] chore(deps): bump style-loader from 1.1.1 to 1.1.2 Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/webpack-contrib/style-loader/releases) - [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/style-loader/compare/v1.1.1...v1.1.2) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 124 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 112 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index 799ee3087..561b5b688 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2436,7 +2436,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: +debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2570,6 +2570,11 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -3390,6 +3395,13 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" +fs-minipass@^1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" + integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== + dependencies: + minipass "^2.6.0" + fs-minipass@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1" @@ -3892,7 +3904,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3916,6 +3928,13 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= +ignore-walk@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" + integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== + dependencies: + minimatch "^3.0.4" + ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -5035,6 +5054,14 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" +minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + minipass@^3.0.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" @@ -5042,6 +5069,13 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" +minizlib@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" + integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== + dependencies: + minipass "^2.9.0" + mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -5150,6 +5184,15 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +needle@^2.2.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" + integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -5217,6 +5260,22 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + node-releases@^1.1.42: version "1.1.43" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.43.tgz#2c6ca237f88ce11d49631f11190bb01f8d0549f2" @@ -5254,6 +5313,14 @@ node-sass@^4.13.0: dependencies: abbrev "1" +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= + dependencies: + abbrev "1" + osenv "^0.1.4" + normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -5296,6 +5363,26 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== +npm-bundled@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" + integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== + dependencies: + npm-normalize-package-bin "^1.0.1" + +npm-normalize-package-bin@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + +npm-packlist@^1.1.6: + version "1.4.7" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" + integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -5303,7 +5390,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -5507,7 +5594,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0: +osenv@0, osenv@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -6678,7 +6765,7 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@~1.2.7: +rc@^1.2.7, rc@~1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -6985,7 +7072,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7071,7 +7158,7 @@ sass-loader@7.3.1: pify "^4.0.1" semver "^6.3.0" -sax@~1.2.4: +sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -7118,7 +7205,7 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7672,9 +7759,9 @@ strip-json-comments@^3.0.1: integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== style-loader@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.1.tgz#8290d915dffe820916790cdcab5aa58c38ab605c" - integrity sha512-oIVF12trRq0od4Yojg7q0K3Lq/O6Ix/AYgVosykrVg+kWxxxUyk8KhKCCmekyGSUiVK1xxlAQymLWWdh6S9lOg== + version "1.1.2" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.2.tgz#1b519c19faf548df6182b93e72ea1a4156022c2f" + integrity sha512-0Mpq1ZHFDCNq1F+6avNBgv+7q8V+mWRuzehxyJT+aKgzyN/yfKTwjYqaYwBgx+11UpQxL21zNQfzzlz+JcGURw== dependencies: loader-utils "^1.2.3" schema-utils "^2.0.1" @@ -7757,6 +7844,19 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" +tar@^4.4.2: + version "4.4.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" + integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.8.6" + minizlib "^1.2.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.3" + terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -8415,7 +8515,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.2: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== From 641dda161f8d8a921648673a590be7c9d1159c9f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:36:39 +0000 Subject: [PATCH 127/216] chore(deps): bump inquirer from 7.0.1 to 7.0.2 Bumps [inquirer](https://github.com/SBoudrias/Inquirer.js) from 7.0.1 to 7.0.2. - [Release notes](https://github.com/SBoudrias/Inquirer.js/releases) - [Commits](https://github.com/SBoudrias/Inquirer.js/compare/inquirer@7.0.1...inquirer@7.0.2) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 130 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 115 insertions(+), 15 deletions(-) diff --git a/yarn.lock b/yarn.lock index 799ee3087..b9161d46b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2436,7 +2436,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: +debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2570,6 +2570,11 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -3390,6 +3395,13 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" +fs-minipass@^1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" + integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== + dependencies: + minipass "^2.6.0" + fs-minipass@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1" @@ -3892,7 +3904,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3916,6 +3928,13 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= +ignore-walk@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" + integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== + dependencies: + minimatch "^3.0.4" + ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -4025,9 +4044,9 @@ ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== inquirer@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.1.tgz#13f7980eedc73c689feff3994b109c4e799c6ebb" - integrity sha512-V1FFQ3TIO15det8PijPLFR9M9baSlnRs9nL7zWu1MNVA2T9YVl9ZbrHJhYs7e9X8jeMZ3lr2JH/rdHFgNCBdYw== + version "7.0.2" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.2.tgz#b39b205b95c9424839a1fd991d60426cf9bbc0e9" + integrity sha512-cZGvHaHwcR9E3xK9EGO5pHKELU+yaeJO7l2qGKIbqk4bCuDuAn15LCoUTS2nSkfv9JybFlnAGrOcVpCDZZOLhw== dependencies: ansi-escapes "^4.2.1" chalk "^2.4.2" @@ -5035,6 +5054,14 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" +minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + minipass@^3.0.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" @@ -5042,6 +5069,13 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" +minizlib@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" + integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== + dependencies: + minipass "^2.9.0" + mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -5150,6 +5184,15 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +needle@^2.2.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" + integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -5217,6 +5260,22 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + node-releases@^1.1.42: version "1.1.43" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.43.tgz#2c6ca237f88ce11d49631f11190bb01f8d0549f2" @@ -5254,6 +5313,14 @@ node-sass@^4.13.0: dependencies: abbrev "1" +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= + dependencies: + abbrev "1" + osenv "^0.1.4" + normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -5296,6 +5363,26 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== +npm-bundled@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" + integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== + dependencies: + npm-normalize-package-bin "^1.0.1" + +npm-normalize-package-bin@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + +npm-packlist@^1.1.6: + version "1.4.7" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" + integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -5303,7 +5390,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -5507,7 +5594,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0: +osenv@0, osenv@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -6678,7 +6765,7 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@~1.2.7: +rc@^1.2.7, rc@~1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -6985,7 +7072,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7022,9 +7109,9 @@ run-queue@^1.0.0, run-queue@^1.0.3: aproba "^1.1.1" rxjs@^6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a" - integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA== + version "6.5.4" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" + integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== dependencies: tslib "^1.9.0" @@ -7071,7 +7158,7 @@ sass-loader@7.3.1: pify "^4.0.1" semver "^6.3.0" -sax@~1.2.4: +sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -7118,7 +7205,7 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7757,6 +7844,19 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" +tar@^4.4.2: + version "4.4.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" + integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.8.6" + minizlib "^1.2.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.3" + terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -8415,7 +8515,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.2: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== From 251b7689ca1ece402508631bfab40651249fea49 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:39:19 +0000 Subject: [PATCH 128/216] chore(deps): bump rxjs from 6.5.3 to 6.5.4 Bumps [rxjs](https://github.com/reactivex/rxjs) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/reactivex/rxjs/releases) - [Changelog](https://github.com/ReactiveX/rxjs/blob/6.5.4/CHANGELOG.md) - [Commits](https://github.com/reactivex/rxjs/compare/6.5.3...6.5.4) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 124 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 112 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index 799ee3087..f21b4eee0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2436,7 +2436,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: +debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2570,6 +2570,11 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -3390,6 +3395,13 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" +fs-minipass@^1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" + integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== + dependencies: + minipass "^2.6.0" + fs-minipass@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1" @@ -3892,7 +3904,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3916,6 +3928,13 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= +ignore-walk@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" + integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== + dependencies: + minimatch "^3.0.4" + ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -5035,6 +5054,14 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" +minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + minipass@^3.0.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" @@ -5042,6 +5069,13 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" +minizlib@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" + integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== + dependencies: + minipass "^2.9.0" + mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -5150,6 +5184,15 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +needle@^2.2.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" + integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -5217,6 +5260,22 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + node-releases@^1.1.42: version "1.1.43" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.43.tgz#2c6ca237f88ce11d49631f11190bb01f8d0549f2" @@ -5254,6 +5313,14 @@ node-sass@^4.13.0: dependencies: abbrev "1" +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= + dependencies: + abbrev "1" + osenv "^0.1.4" + normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -5296,6 +5363,26 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== +npm-bundled@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" + integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== + dependencies: + npm-normalize-package-bin "^1.0.1" + +npm-normalize-package-bin@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + +npm-packlist@^1.1.6: + version "1.4.7" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" + integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -5303,7 +5390,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -5507,7 +5594,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0: +osenv@0, osenv@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -6678,7 +6765,7 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@~1.2.7: +rc@^1.2.7, rc@~1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -6985,7 +7072,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7022,9 +7109,9 @@ run-queue@^1.0.0, run-queue@^1.0.3: aproba "^1.1.1" rxjs@^6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a" - integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA== + version "6.5.4" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" + integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== dependencies: tslib "^1.9.0" @@ -7071,7 +7158,7 @@ sass-loader@7.3.1: pify "^4.0.1" semver "^6.3.0" -sax@~1.2.4: +sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -7118,7 +7205,7 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7757,6 +7844,19 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" +tar@^4.4.2: + version "4.4.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" + integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.8.6" + minizlib "^1.2.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.3" + terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -8415,7 +8515,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.2: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== From 3660abce64e9efa462eb42ccf1b2afeed8d8783c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:40:17 +0000 Subject: [PATCH 129/216] chore(deps): bump node-releases from 1.1.43 to 1.1.44 Bumps [node-releases](https://github.com/chicoxyzzy/node-releases) from 1.1.43 to 1.1.44. - [Release notes](https://github.com/chicoxyzzy/node-releases/releases) - [Commits](https://github.com/chicoxyzzy/node-releases/compare/v1.1.43...v1.1.44) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 124 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 112 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index 799ee3087..bdfbeb2bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2436,7 +2436,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: +debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2570,6 +2570,11 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -3390,6 +3395,13 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" +fs-minipass@^1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" + integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== + dependencies: + minipass "^2.6.0" + fs-minipass@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1" @@ -3892,7 +3904,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3916,6 +3928,13 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= +ignore-walk@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" + integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== + dependencies: + minimatch "^3.0.4" + ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -5035,6 +5054,14 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" +minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + minipass@^3.0.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" @@ -5042,6 +5069,13 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" +minizlib@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" + integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== + dependencies: + minipass "^2.9.0" + mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -5150,6 +5184,15 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +needle@^2.2.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" + integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -5217,10 +5260,26 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + node-releases@^1.1.42: - version "1.1.43" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.43.tgz#2c6ca237f88ce11d49631f11190bb01f8d0549f2" - integrity sha512-Rmfnj52WNhvr83MvuAWHEqXVoZXCcDQssSOffU4n4XOL9sPrP61mSZ88g25NqmABDvH7PiAlFCzoSCSdzA293w== + version "1.1.44" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.44.tgz#cd66438a6eb875e3eb012b6a12e48d9f4326ffd7" + integrity sha512-NwbdvJyR7nrcGrXvKAvzc5raj/NkoJudkarh2yIpJ4t0NH4aqjUDz/486P+ynIW5eokKOfzGNRdYoLfBlomruw== dependencies: semver "^6.3.0" @@ -5254,6 +5313,14 @@ node-sass@^4.13.0: dependencies: abbrev "1" +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= + dependencies: + abbrev "1" + osenv "^0.1.4" + normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -5296,6 +5363,26 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== +npm-bundled@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" + integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== + dependencies: + npm-normalize-package-bin "^1.0.1" + +npm-normalize-package-bin@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + +npm-packlist@^1.1.6: + version "1.4.7" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" + integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -5303,7 +5390,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -5507,7 +5594,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0: +osenv@0, osenv@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -6678,7 +6765,7 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@~1.2.7: +rc@^1.2.7, rc@~1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -6985,7 +7072,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7071,7 +7158,7 @@ sass-loader@7.3.1: pify "^4.0.1" semver "^6.3.0" -sax@~1.2.4: +sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -7118,7 +7205,7 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7757,6 +7844,19 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" +tar@^4.4.2: + version "4.4.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" + integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.8.6" + minizlib "^1.2.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.3" + terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -8415,7 +8515,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.2: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== From 310a78caaff1a6441b048a81119a14f3f58266c7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:47:20 +0000 Subject: [PATCH 130/216] chore(deps-dev): bump rubocop-performance from 1.5.1 to 1.5.2 Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.5.1 to 1.5.2. - [Release notes](https://github.com/rubocop-hq/rubocop-performance/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-performance/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-performance/compare/v1.5.1...v1.5.2) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c99543fbd..9dd0e7ae8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -260,7 +260,7 @@ GEM orm_adapter (0.5.0) pagy (3.7.1) parallel (1.19.1) - parser (2.7.0.0) + parser (2.7.0.1) ast (~> 2.4.0) pg (1.2.0) pg_search (2.3.1) @@ -347,7 +347,7 @@ GEM unicode-display_width (>= 1.4.0, < 1.7) rubocop-minitest (0.5.0) rubocop (>= 0.74) - rubocop-performance (1.5.1) + rubocop-performance (1.5.2) rubocop (>= 0.71.0) rubocop-rails (2.4.1) rack (>= 1.1) From c9d60789461cb299dad7521054fb133b267348bf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:47:53 +0000 Subject: [PATCH 131/216] chore(deps-dev): bump rubocop-minitest from 0.5.0 to 0.5.1 Bumps [rubocop-minitest](https://github.com/rubocop-hq/rubocop-minitest) from 0.5.0 to 0.5.1. - [Release notes](https://github.com/rubocop-hq/rubocop-minitest/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-minitest/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-minitest/compare/v0.5.0...v0.5.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c99543fbd..064558c55 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -260,7 +260,7 @@ GEM orm_adapter (0.5.0) pagy (3.7.1) parallel (1.19.1) - parser (2.7.0.0) + parser (2.7.0.1) ast (~> 2.4.0) pg (1.2.0) pg_search (2.3.1) @@ -345,7 +345,7 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-minitest (0.5.0) + rubocop-minitest (0.5.1) rubocop (>= 0.74) rubocop-performance (1.5.1) rubocop (>= 0.71.0) From e1049d10b6b9c2cfd8e69dc9f0cf6eb1f4b26690 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:48:23 +0000 Subject: [PATCH 132/216] chore(deps): bump pg from 1.2.0 to 1.2.1 Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/compare/v1.2.0...v1.2.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c99543fbd..fb1f34798 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -262,7 +262,7 @@ GEM parallel (1.19.1) parser (2.7.0.0) ast (~> 2.4.0) - pg (1.2.0) + pg (1.2.1) pg_search (2.3.1) activerecord (>= 5.2) activesupport (>= 5.2) From 0855a8a3e122997edae3f4c7457ae1a3eda64fca Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:49:16 +0000 Subject: [PATCH 133/216] chore(deps-dev): bump bullet from 6.0.2 to 6.1.0 Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.0.2 to 6.1.0. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.0.2...6.1.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c99543fbd..b90eb5780 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,7 +122,7 @@ GEM msgpack (~> 1.0) brakeman (4.7.2) builder (3.2.4) - bullet (6.0.2) + bullet (6.1.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) bundler-audit (0.6.1) From 5365f1cd113bb8f4ab9eb441dac7dda721a4dc3b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:49:47 +0000 Subject: [PATCH 134/216] chore(deps): bump rack-protection from 2.0.7 to 2.0.8.1 Bumps [rack-protection](https://github.com/sinatra/sinatra) from 2.0.7 to 2.0.8.1. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v2.0.7...v2.0.8.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c99543fbd..9d969ec42 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -290,7 +290,7 @@ GEM httpclient json-jwt (>= 1.11.0) rack - rack-protection (2.0.7) + rack-protection (2.0.8.1) rack rack-proxy (0.6.5) rack From d4e4c80ca57944443d7d85dc9db354f73ae92865 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:50:24 +0000 Subject: [PATCH 135/216] chore(deps): bump faraday from 0.17.1 to 0.17.3 Bumps [faraday](https://github.com/lostisland/faraday) from 0.17.1 to 0.17.3. - [Release notes](https://github.com/lostisland/faraday/releases) - [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md) - [Commits](https://github.com/lostisland/faraday/compare/v0.17.1...v0.17.3) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c99543fbd..49f04e1ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -168,7 +168,7 @@ GEM smart_properties erubi (1.9.0) execjs (2.7.0) - faraday (0.17.1) + faraday (0.17.3) multipart-post (>= 1.2, < 3) ffi (1.11.3) fit-commit (3.8.1) From 7bf32563f493e130defc55996487cdabdfcc8a86 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:50:55 +0000 Subject: [PATCH 136/216] chore(deps): bump public_suffix from 4.0.2 to 4.0.3 Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby) from 4.0.2 to 4.0.3. - [Release notes](https://github.com/weppos/publicsuffix-ruby/releases) - [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/weppos/publicsuffix-ruby/compare/4.0.2...4.0.3) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c99543fbd..bf62ffba1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -273,7 +273,7 @@ GEM method_source (~> 0.9.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.2) + public_suffix (4.0.3) puma (4.3.1) nio4r (~> 2.0) pundit (2.1.0) From aa4e40e8d1669ffdd2b0a74052988c641c09c55d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:51:27 +0000 Subject: [PATCH 137/216] chore(deps-dev): bump capybara from 3.29.0 to 3.30.0 Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.29.0 to 3.30.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.29.0...3.30.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c99543fbd..118efd7fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -129,7 +129,7 @@ GEM bundler (>= 1.2.0, < 3) thor (~> 0.18) byebug (11.0.1) - capybara (3.29.0) + capybara (3.30.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -273,7 +273,7 @@ GEM method_source (~> 0.9.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.2) + public_suffix (4.0.3) puma (4.3.1) nio4r (~> 2.0) pundit (2.1.0) From 03f54fef9e52b4c175d11ab9e63d615313f5af00 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:52:04 +0000 Subject: [PATCH 138/216] chore(deps): bump aws-partitions from 1.259.0 to 1.261.0 Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.259.0 to 1.261.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c99543fbd..a124fe3a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,7 +92,7 @@ GEM authy (2.7.5) httpclient (>= 2.5.3.3) aws-eventstream (1.0.3) - aws-partitions (1.259.0) + aws-partitions (1.261.0) aws-sdk-core (3.86.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) From 72e15985b580a8ee8e867b89cc8cdfbd30152310 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 00:52:42 +0000 Subject: [PATCH 139/216] chore(deps): bump parser from 2.7.0.0 to 2.7.0.1 Bumps [parser](https://github.com/whitequark/parser) from 2.7.0.0 to 2.7.0.1. - [Release notes](https://github.com/whitequark/parser/releases) - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/parser/compare/v2.7.0.0...v2.7.0.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c99543fbd..50a40785f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -260,7 +260,7 @@ GEM orm_adapter (0.5.0) pagy (3.7.1) parallel (1.19.1) - parser (2.7.0.0) + parser (2.7.0.1) ast (~> 2.4.0) pg (1.2.0) pg_search (2.3.1) From ce82beacfef3583a5e65200eae1df66dd79e51d3 Mon Sep 17 00:00:00 2001 From: Dilara Koca Date: Mon, 6 Jan 2020 13:41:35 +0300 Subject: [PATCH 140/216] Remove not null constraint --- ...add_semester_registration_reference_to_course_enrollments.rb | 2 +- db/structure.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db/migrate/20200102083736_add_semester_registration_reference_to_course_enrollments.rb b/db/migrate/20200102083736_add_semester_registration_reference_to_course_enrollments.rb index 8e701c830..9fe625a29 100644 --- a/db/migrate/20200102083736_add_semester_registration_reference_to_course_enrollments.rb +++ b/db/migrate/20200102083736_add_semester_registration_reference_to_course_enrollments.rb @@ -1,5 +1,5 @@ class AddSemesterRegistrationReferenceToCourseEnrollments < ActiveRecord::Migration[6.0] def change - add_reference :course_enrollments, :semester_registration, null: false, foreign_key: true + add_reference :course_enrollments, :semester_registration, foreign_key: true end end diff --git a/db/structure.sql b/db/structure.sql index 5b0628516..fee1ba08b 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1246,7 +1246,7 @@ CREATE TABLE public.course_enrollments ( status integer DEFAULT 0 NOT NULL, created_at timestamp(6) without time zone NOT NULL, updated_at timestamp(6) without time zone NOT NULL, - semester_registration_id bigint NOT NULL, + semester_registration_id bigint, CONSTRAINT course_enrollments_status_numericality CHECK ((status >= 0)) ); From 641553c1cbe37315370a0487484445172943022b Mon Sep 17 00:00:00 2001 From: Dilara Koca Date: Mon, 6 Jan 2020 13:54:40 +0300 Subject: [PATCH 141/216] Fix wrong written locale keys --- app/controllers/studentship/course_enrollments_controller.rb | 2 +- .../locales/controllers/studentship/course_enrollments.en.yml | 2 +- .../locales/controllers/studentship/course_enrollments.tr.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/studentship/course_enrollments_controller.rb b/app/controllers/studentship/course_enrollments_controller.rb index 092bca055..8be1660ba 100644 --- a/app/controllers/studentship/course_enrollments_controller.rb +++ b/app/controllers/studentship/course_enrollments_controller.rb @@ -69,7 +69,7 @@ def check_registrability def check_registration_status return if @student.current_registration.draft? - redirect_to(student_course_enrollments_path(@student), alert: t('.errors.enrollment_completed')) + redirect_to(student_course_enrollments_path(@student), alert: t('.errors.registration_completed')) end def course_enrollment_params diff --git a/config/locales/controllers/studentship/course_enrollments.en.yml b/config/locales/controllers/studentship/course_enrollments.en.yml index b442b5c6b..87bb590ce 100644 --- a/config/locales/controllers/studentship/course_enrollments.en.yml +++ b/config/locales/controllers/studentship/course_enrollments.en.yml @@ -34,7 +34,7 @@ en: must_drop_first: Courses taken from the top semester must be dropped first. not_enough_ects: The amount of ECTS that can be selected is not enough for you to take this course. not_proper_register_event_range: There is no online course registration activity covering the date range today. - registration completed: You can not perform this action since you have completed the course selection. + registration_completed: You can not perform this action since you have completed the course selection. index: course_enrollments: Course Enrollments registration_status: Enrollment Status diff --git a/config/locales/controllers/studentship/course_enrollments.tr.yml b/config/locales/controllers/studentship/course_enrollments.tr.yml index 09f73e346..5916503a9 100644 --- a/config/locales/controllers/studentship/course_enrollments.tr.yml +++ b/config/locales/controllers/studentship/course_enrollments.tr.yml @@ -34,7 +34,7 @@ tr: must_drop_first: Öncelikli olarak en üst dönemden alınan dersler çıkarılmalı. not_enough_ects: Seçilebilecek AKTS miktarı bu dersi alabilmeniz için yeterli değil. not_proper_register_event_range: Tarih aralığı bugünü kapsayan çevrimiçi ders kayıtlanma aktivitesi bulunmamaktadır. - registration completed: Ders seçimini tamamladığınız için bu işlemi gerçekleştiremezsiniz. + registration_completed: Ders seçimini tamamladığınız için bu işlemi gerçekleştiremezsiniz. index: course_enrollments: Ders Kayıtları registration_status: Kayıt Durumu From 4f4bc690edc609d85815363389fb4b91bc1abe59 Mon Sep 17 00:00:00 2001 From: Dilara Koca Date: Mon, 6 Jan 2020 14:21:27 +0300 Subject: [PATCH 142/216] Add default value to semester --- ...ve_semester_and_student_reference_from_course_enrollments.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb b/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb index 4191d3b49..a4b02e61e 100644 --- a/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb +++ b/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb @@ -3,6 +3,6 @@ def change remove_reference :course_enrollments, :student, null: false, foreign_key: true remove_numericality_constraint :course_enrollments, :semester, greater_than: 0 remove_null_constraint :course_enrollments, :semester - remove_column :course_enrollments, :semester, :integer + remove_column :course_enrollments, :semester, :integer, default: 1 end end From 8314ed0de0c33471c135e95a1ec5cd512a98c443 Mon Sep 17 00:00:00 2001 From: Dilara Koca Date: Mon, 6 Jan 2020 14:24:11 +0300 Subject: [PATCH 143/216] Remove not null constraint --- ...ve_semester_and_student_reference_from_course_enrollments.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb b/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb index a4b02e61e..8223b680e 100644 --- a/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb +++ b/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb @@ -1,6 +1,6 @@ class RemoveSemesterAndStudentReferenceFromCourseEnrollments < ActiveRecord::Migration[6.0] def change - remove_reference :course_enrollments, :student, null: false, foreign_key: true + remove_reference :course_enrollments, :student, foreign_key: true remove_numericality_constraint :course_enrollments, :semester, greater_than: 0 remove_null_constraint :course_enrollments, :semester remove_column :course_enrollments, :semester, :integer, default: 1 From 78fe329ab7fb44bac53bd5995a588a4d36657d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Tekinaslan?= Date: Mon, 6 Jan 2020 16:01:42 +0300 Subject: [PATCH 144/216] Bump Ruby version to 2.7.0 :tada: --- .ruby-version | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ruby-version b/.ruby-version index 2714f5313..24ba9a38d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.4 +2.7.0 diff --git a/Gemfile.lock b/Gemfile.lock index 07120e5dd..c4ab527f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -532,7 +532,7 @@ DEPENDENCIES wicked_pdf RUBY VERSION - ruby 2.6.4p104 + ruby 2.7.0p0 BUNDLED WITH - 2.0.2 + 2.1.2 From 612e165256c6c2f843d66eb8a53f12eb277b9bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Tekinaslan?= Date: Mon, 6 Jan 2020 16:02:07 +0300 Subject: [PATCH 145/216] Fix deprecation warnings in our own codes --- app/decorators/student_decorator.rb | 2 +- app/lib/patron/scope/dsl.rb | 6 +++--- app/services/student_course_enrollment_service.rb | 2 +- .../support/lib/nokul/support/codification/coder.rb | 3 ++- test/pundit_test_case.rb | 12 ++++++------ .../student_course_enrollment_service_test.rb | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/decorators/student_decorator.rb b/app/decorators/student_decorator.rb index bd7167ff5..7e32d2670 100644 --- a/app/decorators/student_decorator.rb +++ b/app/decorators/student_decorator.rb @@ -24,6 +24,6 @@ def event_online_course_registrations end def translate(key, params = {}) - I18n.t("studentship.course_enrollments.#{key}", params) + I18n.t("studentship.course_enrollments.#{key}", **params) end end diff --git a/app/lib/patron/scope/dsl.rb b/app/lib/patron/scope/dsl.rb index 9c30153dd..2964a381e 100644 --- a/app/lib/patron/scope/dsl.rb +++ b/app/lib/patron/scope/dsl.rb @@ -32,7 +32,7 @@ def preview_attributes(*attributes) def filter(attribute, **options) exist!(attribute) - filters[attribute] = Option.new(attribute, options) + filters[attribute] = Option.new(attribute, **options) end def filters @@ -64,7 +64,7 @@ class Option :i18n_key def initialize(attribute, **args) - @collection = collection_to_proc(args) + @collection = collection_to_proc(**args) @multiple = args.fetch(:multiple, false) @type = forecast_type(args) @i18n_key = args.fetch(:i18n_key, attribute) @@ -93,7 +93,7 @@ def collection? private - def collection_to_proc(args) + def collection_to_proc(**args) collection = args.fetch(:collection, proc { nil }) case collection diff --git a/app/services/student_course_enrollment_service.rb b/app/services/student_course_enrollment_service.rb index 19c7d7850..d9e67e26c 100644 --- a/app/services/student_course_enrollment_service.rb +++ b/app/services/student_course_enrollment_service.rb @@ -154,6 +154,6 @@ def group_completed?(group) end def translate(key, params = {}) - I18n.t("studentship.course_enrollments.errors.#{key}", params) + I18n.t("studentship.course_enrollments.errors.#{key}", **params) end end diff --git a/plugins/support/lib/nokul/support/codification/coder.rb b/plugins/support/lib/nokul/support/codification/coder.rb index b177876c1..7de32e8b2 100644 --- a/plugins/support/lib/nokul/support/codification/coder.rb +++ b/plugins/support/lib/nokul/support/codification/coder.rb @@ -12,7 +12,8 @@ class Coder def initialize(code, **options) @code = code.must_be_any_of! Code - @processor = Processor.new @options = default_options.merge(options) + @options = default_options.merge(**options) + @processor = Processor.new(**@options) setup if defined? setup end diff --git a/test/pundit_test_case.rb b/test/pundit_test_case.rb index f9ff7760d..deb7b157a 100644 --- a/test/pundit_test_case.rb +++ b/test/pundit_test_case.rb @@ -19,9 +19,9 @@ def assert_permit(user, **options) Expected %{policy_class} to grant %{permission} on %{record} for user but it didn't MSG - }.merge(options) + }.merge(**options) - pundit_test(user, options) + pundit_test(user, **options) end # Usage: @@ -36,17 +36,17 @@ def assert_not_permit(user, **options) Expected %{policy_class} not to grant %{permission} on %{record} for user but it did MSG - }.merge(options) + }.merge(**options) - pundit_test(user, options) + pundit_test(user, **options) end private # rubocop:disable Metrics/MethodLength def pundit_test(user, **options) - permissions = resolve_permissions(options) - policy = policy_instance(user, options) + permissions = resolve_permissions(**options) + policy = policy_instance(user, **options) permissions.each do |permission| public_send( diff --git a/test/services/student_course_enrollment_service_test.rb b/test/services/student_course_enrollment_service_test.rb index 02474df57..9881b9857 100644 --- a/test/services/student_course_enrollment_service_test.rb +++ b/test/services/student_course_enrollment_service_test.rb @@ -76,6 +76,6 @@ class StudentCourseEnrollmentServiceTest < ActiveSupport::TestCase private def translate(key, params = {}) - I18n.t("studentship.course_enrollments.errors.#{key}", params) + I18n.t("studentship.course_enrollments.errors.#{key}", **params) end end From fa4611b8b0e3c0acd760644cbf14f269ee66f72a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Tekinaslan?= Date: Mon, 6 Jan 2020 16:07:47 +0300 Subject: [PATCH 146/216] Use up to date Docker image in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4ecec547c..571052a99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ondokuz/ruby:buster-19.1 +FROM ondokuz/ruby:buster-20.1 ENV PATH=/app/bin:$PATH From 65a27883750c6eebcbb060a1b2a87ac7e801e08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Tekinaslan?= Date: Tue, 7 Jan 2020 01:17:45 +0300 Subject: [PATCH 147/216] Upgrade the Ruby version of all tenants --- plugins/support/.ruby-version | 2 +- plugins/support/Gemfile.lock | 4 ++-- plugins/tenant/acme/.ruby-version | 2 +- plugins/tenant/acme/Gemfile.lock | 4 ++-- plugins/tenant/common/.ruby-version | 2 +- plugins/tenant/common/Gemfile.lock | 4 ++-- plugins/tenant/omu/.ruby-version | 2 +- plugins/tenant/omu/Gemfile.lock | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/support/.ruby-version b/plugins/support/.ruby-version index 2714f5313..24ba9a38d 100644 --- a/plugins/support/.ruby-version +++ b/plugins/support/.ruby-version @@ -1 +1 @@ -2.6.4 +2.7.0 diff --git a/plugins/support/Gemfile.lock b/plugins/support/Gemfile.lock index 5ca96b0c6..6b51814c1 100644 --- a/plugins/support/Gemfile.lock +++ b/plugins/support/Gemfile.lock @@ -142,7 +142,7 @@ DEPENDENCIES rails (~> 6.0) RUBY VERSION - ruby 2.6.4p104 + ruby 2.7.0p0 BUNDLED WITH - 2.0.2 + 2.1.2 diff --git a/plugins/tenant/acme/.ruby-version b/plugins/tenant/acme/.ruby-version index 2714f5313..24ba9a38d 100644 --- a/plugins/tenant/acme/.ruby-version +++ b/plugins/tenant/acme/.ruby-version @@ -1 +1 @@ -2.6.4 +2.7.0 diff --git a/plugins/tenant/acme/Gemfile.lock b/plugins/tenant/acme/Gemfile.lock index fe8630254..d9bb33445 100644 --- a/plugins/tenant/acme/Gemfile.lock +++ b/plugins/tenant/acme/Gemfile.lock @@ -158,7 +158,7 @@ DEPENDENCIES sqlite3 RUBY VERSION - ruby 2.6.4p104 + ruby 2.7.0p0 BUNDLED WITH - 2.0.2 + 2.1.2 diff --git a/plugins/tenant/common/.ruby-version b/plugins/tenant/common/.ruby-version index 2714f5313..24ba9a38d 100644 --- a/plugins/tenant/common/.ruby-version +++ b/plugins/tenant/common/.ruby-version @@ -1 +1 @@ -2.6.4 +2.7.0 diff --git a/plugins/tenant/common/Gemfile.lock b/plugins/tenant/common/Gemfile.lock index 052b54ef2..216f73fb3 100644 --- a/plugins/tenant/common/Gemfile.lock +++ b/plugins/tenant/common/Gemfile.lock @@ -149,7 +149,7 @@ DEPENDENCIES rails (~> 6.0) RUBY VERSION - ruby 2.6.4p104 + ruby 2.7.0p0 BUNDLED WITH - 2.0.2 + 2.1.2 diff --git a/plugins/tenant/omu/.ruby-version b/plugins/tenant/omu/.ruby-version index 2714f5313..24ba9a38d 100644 --- a/plugins/tenant/omu/.ruby-version +++ b/plugins/tenant/omu/.ruby-version @@ -1 +1 @@ -2.6.4 +2.7.0 diff --git a/plugins/tenant/omu/Gemfile.lock b/plugins/tenant/omu/Gemfile.lock index cd6b1ea8e..37d72eac8 100644 --- a/plugins/tenant/omu/Gemfile.lock +++ b/plugins/tenant/omu/Gemfile.lock @@ -158,7 +158,7 @@ DEPENDENCIES sqlite3 RUBY VERSION - ruby 2.6.4p104 + ruby 2.7.0p0 BUNDLED WITH - 2.0.2 + 2.1.2 From b1ecb39761e5b921f6a3267772b796c5e916bf30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Tekinaslan?= Date: Tue, 7 Jan 2020 01:24:23 +0300 Subject: [PATCH 148/216] Fix app version in app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index d74e36a28..ce37deeea 100644 --- a/app.json +++ b/app.json @@ -7,7 +7,7 @@ "rails" ], "repository": "https://github.com/omu/nokul", - "version": "0.7.2", + "version": "0.7.3", "scripts": { "dokku": { "predeploy": "bin/plugdo bundle install -j4 --path /app/vendor/bundle --without development:test && bundle exec rails assets:precompile && bundle exec rails db:migrate" From f478bf12b5ba4dbbcfd020aac7e04ffd30e3d444 Mon Sep 17 00:00:00 2001 From: Dilara Koca Date: Tue, 7 Jan 2020 22:41:52 +0300 Subject: [PATCH 149/216] Put validations of a attibute on the same line --- app/models/semester_registration.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/semester_registration.rb b/app/models/semester_registration.rb index bacbfdd5d..f904f421f 100644 --- a/app/models/semester_registration.rb +++ b/app/models/semester_registration.rb @@ -14,8 +14,7 @@ class SemesterRegistration < ApplicationRecord has_many :course_enrollments, dependent: :destroy # validations - validates :semester, uniqueness: { scope: :student_id } - validates :semester, numericality: { greater_than: 0 } + validates :semester, uniqueness: { scope: :student_id }, numericality: { greater_than: 0 } private From 8f91ab56bbccc514b43f9b550a7af58054d4da1d Mon Sep 17 00:00:00 2001 From: Dilara Koca Date: Tue, 7 Jan 2020 22:46:14 +0300 Subject: [PATCH 150/216] Remove default value for semester --- ...ve_semester_and_student_reference_from_course_enrollments.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb b/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb index 8223b680e..fc0eef96f 100644 --- a/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb +++ b/db/migrate/20200102083531_remove_semester_and_student_reference_from_course_enrollments.rb @@ -3,6 +3,6 @@ def change remove_reference :course_enrollments, :student, foreign_key: true remove_numericality_constraint :course_enrollments, :semester, greater_than: 0 remove_null_constraint :course_enrollments, :semester - remove_column :course_enrollments, :semester, :integer, default: 1 + remove_column :course_enrollments, :semester, :integer end end From fc54134b365f95d9a256cd68122d30a0fd6c9f0d Mon Sep 17 00:00:00 2001 From: Dilara Koca Date: Tue, 7 Jan 2020 22:49:44 +0300 Subject: [PATCH 151/216] Add course enrollment relation --- app/models/student.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/student.rb b/app/models/student.rb index b55d3af19..244208601 100644 --- a/app/models/student.rb +++ b/app/models/student.rb @@ -12,6 +12,7 @@ class Student < ApplicationRecord has_many :calendars, -> { Calendar.active }, through: :unit has_many :curriculums, through: :unit has_many :semester_registrations, dependent: :destroy + has_many :course_enrollments, through: :semester_registrations # scopes # TODO: Query will be organized according to activity status From 1072342b14a68153a0f01363f579410a4a07dd1f Mon Sep 17 00:00:00 2001 From: Dilara Koca Date: Tue, 7 Jan 2020 23:03:33 +0300 Subject: [PATCH 152/216] Use assign_attributes --- app/models/semester_registration.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/models/semester_registration.rb b/app/models/semester_registration.rb index f904f421f..0716851c4 100644 --- a/app/models/semester_registration.rb +++ b/app/models/semester_registration.rb @@ -2,8 +2,7 @@ class SemesterRegistration < ApplicationRecord # callbacks - before_validation :assign_academic_term - before_validation :assign_semester + before_validation :assign_academic_term_and_semester # enums enum status: { draft: 0, saved: 1 } @@ -18,11 +17,7 @@ class SemesterRegistration < ApplicationRecord private - def assign_academic_term - self.academic_term = AcademicTerm.current - end - - def assign_semester - self.semester = student&.semester + def assign_academic_term_and_semester + assign_attributes(academic_term: AcademicTerm.current, semester: student&.semester) end end From 4648abb2b2d16481a83f2bc9ea07bcdc3fc7d89e Mon Sep 17 00:00:00 2001 From: Dilara Koca Date: Tue, 7 Jan 2020 23:07:45 +0300 Subject: [PATCH 153/216] Add missing tests --- test/models/semester_registration_test.rb | 3 +-- test/models/student_test.rb | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/models/semester_registration_test.rb b/test/models/semester_registration_test.rb index 52917e682..3bbf5a769 100644 --- a/test/models/semester_registration_test.rb +++ b/test/models/semester_registration_test.rb @@ -9,8 +9,7 @@ class SemesterRegistrationTest < ActiveSupport::TestCase extend Support::Minitest::ValidationHelper # callbacks - before_validation :assign_academic_term - before_validation :assign_semester + before_validation :assign_academic_term_and_semester # enums enum status: { draft: 0, saved: 1 } diff --git a/test/models/student_test.rb b/test/models/student_test.rb index 3063d6c01..75ecf6981 100644 --- a/test/models/student_test.rb +++ b/test/models/student_test.rb @@ -15,6 +15,7 @@ class StudentTest < ActiveSupport::TestCase has_many :calendars, through: :unit has_many :curriculums, through: :unit has_many :semester_registrations, dependent: :destroy + has_many :course_enrollments, through: :semester_registrations # validations: presence validates_presence_of :student_number From 6876442290872b7d70563099e31f721cc957f2a2 Mon Sep 17 00:00:00 2001 From: dilara Date: Wed, 8 Jan 2020 11:50:46 +0300 Subject: [PATCH 154/216] Use or equals --- app/models/student.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/student.rb b/app/models/student.rb index 244208601..5598dd823 100644 --- a/app/models/student.rb +++ b/app/models/student.rb @@ -40,7 +40,7 @@ def gpa end def current_registration - @current_registration = + @current_registration ||= semester_registrations.where(semester: semester).last || semester_registrations.create end From 9abb48adb0f5a27f080704bcb6aca0c58bbd5e62 Mon Sep 17 00:00:00 2001 From: dilara Date: Wed, 8 Jan 2020 12:04:37 +0300 Subject: [PATCH 155/216] Use enum_t --- app/views/studentship/course_enrollments/_student_info.html.erb | 2 +- app/views/studentship/course_enrollments/index.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/studentship/course_enrollments/_student_info.html.erb b/app/views/studentship/course_enrollments/_student_info.html.erb index 42dfa4332..09fc2406c 100644 --- a/app/views/studentship/course_enrollments/_student_info.html.erb +++ b/app/views/studentship/course_enrollments/_student_info.html.erb @@ -26,7 +26,7 @@ <%= t('.registration_status') %> - <%= t('activerecord.enums.semester_registration.statuses')[@student.current_registration.status.to_sym] %> + <%= enum_t(@student.current_registration, :status) %> diff --git a/app/views/studentship/course_enrollments/index.html.erb b/app/views/studentship/course_enrollments/index.html.erb index f920714bb..93efebe64 100644 --- a/app/views/studentship/course_enrollments/index.html.erb +++ b/app/views/studentship/course_enrollments/index.html.erb @@ -21,7 +21,7 @@
<%= @student.unit.name %>

<%= @student.registation_date_range %>

- <%= "#{t('.registration_status')}: #{t('activerecord.enums.semester_registration.statuses')[@student.current_registration.status.to_sym]}" %> + <%= "#{t('.registration_status')}: #{enum_t(@student.current_registration, :status)}" %> <% end %> From 26fe7bf6d3026d304433f7aa5dc48a2cfdffbd44 Mon Sep 17 00:00:00 2001 From: dilara Date: Wed, 8 Jan 2020 12:15:30 +0300 Subject: [PATCH 156/216] Use find_by in case of uniqueness --- app/models/student.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/student.rb b/app/models/student.rb index 5598dd823..803a02f71 100644 --- a/app/models/student.rb +++ b/app/models/student.rb @@ -41,7 +41,7 @@ def gpa def current_registration @current_registration ||= - semester_registrations.where(semester: semester).last || semester_registrations.create + semester_registrations.find_by(semester: semester) || semester_registrations.create end private From 02d35b2e981b9ba9fc6f2ceaabb3d4f7a4b9795f Mon Sep 17 00:00:00 2001 From: isubas Date: Wed, 13 Nov 2019 16:44:14 +0300 Subject: [PATCH 157/216] active_flag gemini ekle --- Gemfile | 2 ++ Gemfile.lock | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Gemfile b/Gemfile index 67fb9f347..bb942cdc5 100644 --- a/Gemfile +++ b/Gemfile @@ -126,3 +126,5 @@ Dir['plugins/tenant/**/*.gemspec'].each do |gemspec| gem name, path: File.dirname(gemspec), require: false end + +gem 'active_flag' diff --git a/Gemfile.lock b/Gemfile.lock index c4ab527f0..7ef0bf99b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,6 +63,8 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) + active_flag (1.5.0) + activerecord (>= 5) activejob (6.0.2.1) activesupport (= 6.0.2.1) globalid (>= 0.3.6) @@ -458,6 +460,7 @@ PLATFORMS ruby DEPENDENCIES + active_flag ancestry authy aws-sdk-s3 From 8c15ac819a5853ecfbbdb0d3b6b2cffe4f9e621a Mon Sep 17 00:00:00 2001 From: isubas Date: Wed, 13 Nov 2019 16:54:32 +0300 Subject: [PATCH 158/216] =?UTF-8?q?=C4=B0zin=20ayr=C4=B1cal=C4=B1klar?= =?UTF-8?q?=C4=B1n=C4=B1=20y=C3=B6netmek=20i=C3=A7in=20alt=20yap=C4=B1=20o?= =?UTF-8?q?lu=C5=9Ftur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/lib/patron/permission_builder.rb | 28 +++++++++++++++++++++++----- app/lib/patron/role_builder.rb | 4 ++-- app/lib/patron/roleable.rb | 12 ++++++++++-- app/models/patron/role_permission.rb | 7 +++++++ 4 files changed, 42 insertions(+), 9 deletions(-) diff --git a/app/lib/patron/permission_builder.rb b/app/lib/patron/permission_builder.rb index dc70c8f60..b8255d5d7 100644 --- a/app/lib/patron/permission_builder.rb +++ b/app/lib/patron/permission_builder.rb @@ -2,27 +2,45 @@ module Patron module PermissionBuilder - mattr_accessor :all, default: {} + mattr_accessor :all, default: ActiveSupport::OrderedOptions.new + + PRIVILEGES = %i[ + read + write + destroy + report + ].freeze def permissions - @permissions ||= {} + @permissions ||= ActiveSupport::OrderedOptions.new end # Example # permission :foo, name: 'Foo', description: 'Desc' - def permission(identifier, name:, description:) + def permission(identifier, name:, description:, privileges:) generated_permission = Permission.new( name: name, identifier: identifier, - description: description + description: description, + privileges: available_privileges_check!(privileges) ) permissions[identifier] = generated_permission PermissionBuilder.all[identifier] = generated_permission end - Permission = Struct.new(:name, :identifier, :description, keyword_init: true) + Permission = Struct.new(:name, :identifier, :description, :privileges, keyword_init: true) private_constant :Permission + + private + + def available_privileges_check!(privileges) + privileges.each do |privilege| + raise "Unavailable privilege: #{privilege}" unless PRIVILEGES.include?(privilege) + end + + privileges.inquiry + end end end diff --git a/app/lib/patron/role_builder.rb b/app/lib/patron/role_builder.rb index 5ff960d7a..a1a93c3fa 100644 --- a/app/lib/patron/role_builder.rb +++ b/app/lib/patron/role_builder.rb @@ -24,7 +24,7 @@ class Role def initialize(identifier:, name:, permissions:) @identifier = identifier @name = name - @permissions = Set.new(permissions) + @permissions = permissions check! end @@ -33,7 +33,7 @@ def initialize(identifier:, name:, permissions:) def check! raise ArgumentError, 'Permissions must not be empty' if permissions.blank? - permissions.each do |permission| + permissions.keys.each do |permission| raise ArgumentError, "Permission not found: #{permission}" unless PermissionBuilder.all.key?(permission) end end diff --git a/app/lib/patron/roleable.rb b/app/lib/patron/roleable.rb index 63bf8663a..6f0a9f7c1 100644 --- a/app/lib/patron/roleable.rb +++ b/app/lib/patron/roleable.rb @@ -6,8 +6,9 @@ module Roleable included do has_many :role_assignments, class_name: 'Patron::RoleAssignment', dependent: :destroy - has_many :roles, class_name: 'Patron::Role', through: :role_assignments - has_many :permissions, class_name: 'Patron::Permission', through: :roles + has_many :roles, class_name: 'Patron::Role', through: :role_assignments + has_many :permissions, class_name: 'Patron::Permission', through: :roles + has_many :role_permissions, class_name: 'Patron::RolePermission', through: :roles end def roles?(*identifiers) @@ -26,6 +27,13 @@ def any_permissions?(*identifiers) permissions.exists?(identifier: identifiers) end + def privilege?(permission, *privileges) + role_permissions.includes(:permission) + .where_privileges(*privileges.flatten) + .where(permissions: { identifier: permission }) + .exists? + end + alias role? roles? alias permission? permissions? end diff --git a/app/models/patron/role_permission.rb b/app/models/patron/role_permission.rb index b3cb5992d..a67b786a9 100644 --- a/app/models/patron/role_permission.rb +++ b/app/models/patron/role_permission.rb @@ -8,5 +8,12 @@ class RolePermission < ApplicationRecord # validations validates :permission_id, uniqueness: { scope: :role_id } + validates :privileges, presence: true + + # delegates + delegate :name, :identifier, to: :permission + + # enums + flag :privileges, Patron::PermissionBuilder::PRIVILEGES end end From c819a403b1c3cec33e3a1512751a02e2a8516162 Mon Sep 17 00:00:00 2001 From: isubas Date: Wed, 13 Nov 2019 16:56:10 +0300 Subject: [PATCH 159/216] =?UTF-8?q?Rollere=20g=C3=B6re=20izin=20ayr=C4=B1c?= =?UTF-8?q?al=C4=B1klar=C4=B1n=C4=B1n=20aray=C3=BCz=20=C3=BCzerinden=20bel?= =?UTF-8?q?irlenmesini=20sa=C4=9Fla?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/patron/roles_controller.rb | 8 +++-- app/models/patron/role.rb | 1 + .../components/_role_permissions.html.erb | 34 ++++++++++++++++++ app/views/patron/roles/_form.html.erb | 36 +++++++++++++------ .../roles/_role_permission_fields.html.erb | 17 +++++++++ app/views/patron/roles/show.html.erb | 2 +- .../controllers/patron/permissions.en.yml | 12 ++++++- .../controllers/patron/permissions.tr.yml | 12 ++++++- .../patron/role_permissions.en.yml | 13 +++++++ .../patron/role_permissions.tr.yml | 13 +++++++ 10 files changed, 132 insertions(+), 16 deletions(-) create mode 100644 app/views/patron/components/_role_permissions.html.erb create mode 100644 app/views/patron/roles/_role_permission_fields.html.erb create mode 100644 config/locales/controllers/patron/role_permissions.en.yml create mode 100644 config/locales/controllers/patron/role_permissions.tr.yml diff --git a/app/controllers/patron/roles_controller.rb b/app/controllers/patron/roles_controller.rb index 54795a7e6..41276c1cf 100644 --- a/app/controllers/patron/roles_controller.rb +++ b/app/controllers/patron/roles_controller.rb @@ -14,7 +14,9 @@ def index def show @permissions = pagy_by_search( - @role.permissions.order(:name), page_param: 'page_permission', pagy_name: :pagy_permissions + @role.role_permissions.includes(:permission).order('permissions.name'), + page_param: 'page_permission', + pagy_name: :pagy_permissions ) @users = pagy_by_search( @role.users, page_param: 'page_user', pagy_name: :pagy_users @@ -55,7 +57,9 @@ def set_role end def role_params - params.require(:patron_role).permit(:name, :identifier, :locked, permission_ids: []) + params.require(:patron_role).permit(:name, :identifier, :locked, role_permissions_attributes: [ + :id, :permission_id, :_destroy, privileges: [] + ]) end end end diff --git a/app/models/patron/role.rb b/app/models/patron/role.rb index db2d4f40b..b5554a8b5 100644 --- a/app/models/patron/role.rb +++ b/app/models/patron/role.rb @@ -15,6 +15,7 @@ class Role < ApplicationRecord has_many :users, through: :role_assignments has_many :role_permissions, dependent: :destroy has_many :permissions, through: :role_permissions + accepts_nested_attributes_for :role_permissions, reject_if: :all_blank, allow_destroy: true # validations validates :name, uniqueness: true, presence: true, length: { maximum: 255 } diff --git a/app/views/patron/components/_role_permissions.html.erb b/app/views/patron/components/_role_permissions.html.erb new file mode 100644 index 000000000..a4b671040 --- /dev/null +++ b/app/views/patron/components/_role_permissions.html.erb @@ -0,0 +1,34 @@ + + + + + + <% Patron::PermissionBuilder::PRIVILEGES.each do |privilege| %> + + <% end %> + <% if actions_visible %> + + <% end %> + + + + <% permissions.each do |permission| %> + + + + <% Patron::PermissionBuilder::PRIVILEGES.each do |privilege| %> + + <% end %> + <% if actions_visible %> + + <% end %> + + <% end %> + +
<%= t('name', scope: %i[activerecord attributes patron/permission]) %><%= t('identifier', scope: %i[activerecord attributes patron/permission]) %><%= t(privilege, scope: %i[active_flag patron/role_permission privileges]) %><%= t('actions') %>
<%= link_to(permission.name, permission.permission) %><%= permission.identifier %> + <% if RoleManagement.permissions[permission.identifier.to_sym].privileges.include?(privilege) %> + <%= icon_for_check(permission.privileges.public_send("#{privilege}?")) %> + <% else %> + - + <% end %> + <%= link_to_show(permission) %>
diff --git a/app/views/patron/roles/_form.html.erb b/app/views/patron/roles/_form.html.erb index 19aaf13cf..e7259b82f 100644 --- a/app/views/patron/roles/_form.html.erb +++ b/app/views/patron/roles/_form.html.erb @@ -13,23 +13,37 @@ <%= simple_form_for(@role) do |f| %> <%= f.error_notification %> -
- <%= f.input :name, required: true %> -
+
+
+ <%= f.input :name, required: true %> +
-
- <%= f.input :identifier, required: true %> -
+
+ <%= f.input :identifier, required: true %> +
-
- <%= f.association :permissions, required: true %> -
+
+
+

<%= 'İzinler' %>

+
+
-
- <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %> + <%= f.simple_fields_for :role_permissions do |role_permission| %> + <%= render 'role_permission_fields', f: role_permission %> + <% end %> + +
+ <%= link_to_add_association f, :role_permissions, class: 'btn btn-primary btn-sm pull-right' %> +
+ +
+ <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %> +
<% end %>
+ +<%= javascript_include_tag 'shared/cocoon' %> diff --git a/app/views/patron/roles/_role_permission_fields.html.erb b/app/views/patron/roles/_role_permission_fields.html.erb new file mode 100644 index 000000000..942cc65c6 --- /dev/null +++ b/app/views/patron/roles/_role_permission_fields.html.erb @@ -0,0 +1,17 @@ +
+
+
+ <%= link_to_remove_association f do %> + <%= button_tag('x', type: 'button', class: 'close', data: { confirm: t('are_you_sure') }) %> + <% end %> +
+
+ <%= f.association :permission %> +
+
+ <%= f.input :privileges, as: :check_boxes, collection: f.object.class.privileges.pairs %> +
+
+
+
+
diff --git a/app/views/patron/roles/show.html.erb b/app/views/patron/roles/show.html.erb index cabc97f5b..9dfdf7e6e 100644 --- a/app/views/patron/roles/show.html.erb +++ b/app/views/patron/roles/show.html.erb @@ -18,7 +18,7 @@ <%= t('.permissions') %>
- <%= render 'patron/components/permissions', + <%= render 'patron/components/role_permissions', permissions: @permissions, actions_visible: false %>
diff --git a/config/locales/controllers/patron/permissions.en.yml b/config/locales/controllers/patron/permissions.en.yml index 365af9cba..9bc4fe866 100644 --- a/config/locales/controllers/patron/permissions.en.yml +++ b/config/locales/controllers/patron/permissions.en.yml @@ -5,6 +5,10 @@ en: identifier: Permission Identifier name: Permission Name description: Permission Description + patron/role_permission: + permission: İzin + privileges: Ayrıcalıkları + patron: permissions: index: @@ -15,4 +19,10 @@ en: roles: Roles smart_search_placeholder: Search with Model-Specific Keyword users: Users - + active_flag: + patron/role_permission: + privileges: + read: Read + write: Write + destroy: Destroy + report: Report diff --git a/config/locales/controllers/patron/permissions.tr.yml b/config/locales/controllers/patron/permissions.tr.yml index edee8433c..e42c84199 100644 --- a/config/locales/controllers/patron/permissions.tr.yml +++ b/config/locales/controllers/patron/permissions.tr.yml @@ -5,6 +5,10 @@ tr: identifier: İzin Tanımlayıcı name: İzin Adı description: İzin Açıklaması + privileges: Ayrıcalıkları + patron/role_permission: + permission: İzin + privileges: Ayrıcalıkları patron: permissions: index: @@ -15,4 +19,10 @@ tr: roles: Roller smart_search_placeholder: Modele Özel Anahtar Kelime ile Arama users: Kullanıcılar - + active_flag: + patron/role_permission: + privileges: + read: Okuma + write: Yazma + destroy: Silme + report: Raporlama diff --git a/config/locales/controllers/patron/role_permissions.en.yml b/config/locales/controllers/patron/role_permissions.en.yml new file mode 100644 index 000000000..de8569c44 --- /dev/null +++ b/config/locales/controllers/patron/role_permissions.en.yml @@ -0,0 +1,13 @@ +en: + activerecord: + attributes: + patron/role_permission: + permission: Permission + privileges: Privileges + active_flag: + patron/role_permission: + privileges: + read: Read + write: Write + destroy: Destroy + report: Report diff --git a/config/locales/controllers/patron/role_permissions.tr.yml b/config/locales/controllers/patron/role_permissions.tr.yml new file mode 100644 index 000000000..cb038efea --- /dev/null +++ b/config/locales/controllers/patron/role_permissions.tr.yml @@ -0,0 +1,13 @@ +tr: + activerecord: + attributes: + patron/role_permission: + permission: İzin + privileges: Ayrıcalıkları + active_flag: + patron/role_permission: + privileges: + read: Okuma + write: Yazma + destroy: Silme + report: Raporlama From 4c8478d4cc41b09738dc08dfc2ede044ece1a1c4 Mon Sep 17 00:00:00 2001 From: isubas Date: Wed, 13 Nov 2019 16:57:14 +0300 Subject: [PATCH 160/216] =?UTF-8?q?RolePermission=20modeline=20privileges?= =?UTF-8?q?=20alan=C4=B1=20ekle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20191112123931_add_privileges_to_role_permission.rb | 5 +++++ db/structure.sql | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20191112123931_add_privileges_to_role_permission.rb diff --git a/db/migrate/20191112123931_add_privileges_to_role_permission.rb b/db/migrate/20191112123931_add_privileges_to_role_permission.rb new file mode 100644 index 000000000..6b9432a47 --- /dev/null +++ b/db/migrate/20191112123931_add_privileges_to_role_permission.rb @@ -0,0 +1,5 @@ +class AddPrivilegesToRolePermission < ActiveRecord::Migration[6.0] + def change + add_column :role_permissions, :privileges, :integer, null: false, default: 0, limit: 8 + end +end diff --git a/db/structure.sql b/db/structure.sql index fee1ba08b..c3461ba29 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -2752,7 +2752,8 @@ CREATE TABLE public.role_permissions ( role_id bigint NOT NULL, permission_id bigint NOT NULL, created_at timestamp(6) without time zone NOT NULL, - updated_at timestamp(6) without time zone NOT NULL + updated_at timestamp(6) without time zone NOT NULL, + privileges bigint DEFAULT 0 NOT NULL ); @@ -6977,6 +6978,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20191018084942'), ('20191021073002'), ('20191111082956'), +('20191112123931'), ('20191113054514'), ('20191127055945'), ('20191226074849'), From 33c7f858e553c5cb07bff722ca59e7a24d468d2e Mon Sep 17 00:00:00 2001 From: isubas Date: Wed, 13 Nov 2019 16:58:21 +0300 Subject: [PATCH 161/216] =?UTF-8?q?Rol=20y=C3=B6entimi=20ile=20ilgili=20Uf?= =?UTF-8?q?ak=20d=C3=BCzeltmeler=20yap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/initializers/role_management.rb | 21 ++++++++++++++------- lib/tasks/patron.rake | 20 +++++++++++++------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/config/initializers/role_management.rb b/config/initializers/role_management.rb index 9a09a0cad..f6b0522c3 100644 --- a/config/initializers/role_management.rb +++ b/config/initializers/role_management.rb @@ -7,21 +7,28 @@ class RoleManagement # permissions permission :role_management, name: 'Rol Yönetimi', - description: 'Rol Yönetim Yetkisi' + description: 'Rol Yönetim Yetkisi', + privileges: %i[read write destroy] permission :permission_management, name: 'İzin Yönetimi', - description: 'İzin Yönetim Yetkisi' + description: 'İzin Yönetim Yetkisi', + privileges: %i[read write destroy] permission :scope_query_management, name: 'Kapsam Sorgu Yönetimi', - description: 'Kapsam Sorgu Yönetim Yetkisi' + description: 'Kapsam Sorgu Yönetim Yetkisi', + privileges: %i[read write destroy] permission :authorization_management, name: 'Yetkilendirme Yönetimi', - description: 'Yetkilendirme Yönetimi Yetkisi' + description: 'Yetkilendirme Yönetimi Yetkisi', + privileges: %i[read write destroy] # roles role :authorization_manager, name: 'Yetkilendirme Yöneticisi', - permissions: %i[ - role_management permission_management scope_query_management authorization_management - ] + permissions: { + role_management: %i[read write destroy], + permission_management: %i[read write destroy], + scope_query_management: %i[read write destroy], + authorization_management: %i[read write destroy] + } end diff --git a/lib/tasks/patron.rake b/lib/tasks/patron.rake index 063fd3208..221f816c3 100644 --- a/lib/tasks/patron.rake +++ b/lib/tasks/patron.rake @@ -5,7 +5,9 @@ namespace :patron do task upsert_permissions: :environment do Patron::PermissionBuilder.all.each do |identifier, permission| record = Patron::Permission.find_or_initialize_by(identifier: identifier) - record.assign_attributes(permission.to_h) + record.assign_attributes( + permission.to_h.slice(*Patron::Permission.attribute_names.map(&:to_sym)) + ) record.save end @@ -16,12 +18,16 @@ namespace :patron do desc 'Upsert roles' task upsert_roles: :environment do Patron::RoleBuilder.all.each do |identifier, role| - permissions = Patron::Permission.where(identifier: role.permissions.to_a) - record = Patron::Role.find_or_initialize_by(identifier: identifier) - record.locked = true - record.permissions = permissions - record.name = role.name - record.save + record = Patron::Role.find_or_initialize_by(identifier: identifier) + record.locked = true + record.name = role.name + record.role_permissions = role.permissions.map do |key, privileges| + record.role_permissions.build( + permission_id: Patron::Permission.find_by(identifier: key).id, + privileges: privileges + ) + end + record.save! end end From a3e42a0be1dc70e00ebccd1c4bb68ec480b96a3d Mon Sep 17 00:00:00 2001 From: isubas Date: Wed, 13 Nov 2019 16:58:45 +0300 Subject: [PATCH 162/216] =?UTF-8?q?WIP:=20Ayr=C4=B1cal=C4=B1kl=C4=B1=20izi?= =?UTF-8?q?n=20yap=C4=B1s=C4=B1n=C4=B1=20uygula?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/policies/patron/role_policy.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/policies/patron/role_policy.rb b/app/policies/patron/role_policy.rb index 9ee5497a1..2cc1df934 100644 --- a/app/policies/patron/role_policy.rb +++ b/app/policies/patron/role_policy.rb @@ -3,23 +3,23 @@ module Patron class RolePolicy < ApplicationPolicy def index? - permitted? + permitted? :read end def show? - permitted? + permitted? :read end def create? - permitted? + permitted? :write end def new? - create? + permitted? :write end def update? - permitted? && !record.locked? + permitted?(:write) && !record.locked? end def edit? @@ -27,13 +27,13 @@ def edit? end def destroy? - permitted? && !record.locked? + permitted?(:destroy) && !record.locked? end private - def permitted? - user.permission? :role_management + def permitted?(*privileges) + user.privilege? :role_management, privileges end end end From 6c6051974f36c0f755d590dff95ebfc04a083617 Mon Sep 17 00:00:00 2001 From: isubas Date: Thu, 14 Nov 2019 00:48:16 +0300 Subject: [PATCH 163/216] Minor changes --- app/lib/patron/permission_builder.rb | 4 +- app/models/patron/permission.rb | 4 ++ app/models/patron/role_permission.rb | 10 +++- .../components/_role_permissions.html.erb | 58 ++++++++++--------- .../roles/_role_permission_fields.html.erb | 14 ++++- 5 files changed, 58 insertions(+), 32 deletions(-) diff --git a/app/lib/patron/permission_builder.rb b/app/lib/patron/permission_builder.rb index b8255d5d7..cdb086d76 100644 --- a/app/lib/patron/permission_builder.rb +++ b/app/lib/patron/permission_builder.rb @@ -2,7 +2,7 @@ module Patron module PermissionBuilder - mattr_accessor :all, default: ActiveSupport::OrderedOptions.new + mattr_accessor :all, default: ActiveSupport::HashWithIndifferentAccess.new PRIVILEGES = %i[ read @@ -12,7 +12,7 @@ module PermissionBuilder ].freeze def permissions - @permissions ||= ActiveSupport::OrderedOptions.new + @permissions ||= ActiveSupport::HashWithIndifferentAccess.new end # Example diff --git a/app/models/patron/permission.rb b/app/models/patron/permission.rb index ce0557fca..5bee302d8 100644 --- a/app/models/patron/permission.rb +++ b/app/models/patron/permission.rb @@ -19,5 +19,9 @@ class Permission < ApplicationRecord validates :name, uniqueness: true, presence: true, length: { maximum: 255 } validates :identifier, uniqueness: true, presence: true, length: { maximum: 255 } validates :description, length: { maximum: 65_535 } + + def available_privileges + Patron::PermissionBuilder.all[identifier]&.privileges || [] + end end end diff --git a/app/models/patron/role_permission.rb b/app/models/patron/role_permission.rb index a67b786a9..31d409c1f 100644 --- a/app/models/patron/role_permission.rb +++ b/app/models/patron/role_permission.rb @@ -10,8 +10,16 @@ class RolePermission < ApplicationRecord validates :permission_id, uniqueness: { scope: :role_id } validates :privileges, presence: true + before_validation do + privileges.to_a.each do |privilege| + next if available_privileges.include?(privilege) + + errors.add(:base, "Bu izin için #{privilege} geçerli bir ayrıcalık değil") + end + end + # delegates - delegate :name, :identifier, to: :permission + delegate :name, :identifier, :available_privileges, to: :permission # enums flag :privileges, Patron::PermissionBuilder::PRIVILEGES diff --git a/app/views/patron/components/_role_permissions.html.erb b/app/views/patron/components/_role_permissions.html.erb index a4b671040..27614e049 100644 --- a/app/views/patron/components/_role_permissions.html.erb +++ b/app/views/patron/components/_role_permissions.html.erb @@ -1,34 +1,36 @@ - - - - - - <% Patron::PermissionBuilder::PRIVILEGES.each do |privilege| %> - - <% end %> - <% if actions_visible %> - - <% end %> - - - - <% permissions.each do |permission| %> +
+
<%= t('name', scope: %i[activerecord attributes patron/permission]) %><%= t('identifier', scope: %i[activerecord attributes patron/permission]) %><%= t(privilege, scope: %i[active_flag patron/role_permission privileges]) %><%= t('actions') %>
+ - - + + <% Patron::PermissionBuilder::PRIVILEGES.each do |privilege| %> - + <% end %> <% if actions_visible %> - + <% end %> - <% end %> - -
<%= link_to(permission.name, permission.permission) %><%= permission.identifier %><%= t('name', scope: %i[activerecord attributes patron/permission]) %><%= t('identifier', scope: %i[activerecord attributes patron/permission]) %> - <% if RoleManagement.permissions[permission.identifier.to_sym].privileges.include?(privilege) %> - <%= icon_for_check(permission.privileges.public_send("#{privilege}?")) %> - <% else %> - - - <% end %> - <%= t(privilege, scope: %i[active_flag patron/role_permission privileges]) %><%= link_to_show(permission) %><%= t('actions') %>
+ + + <% permissions.each do |permission| %> + + <%= link_to(permission.name, permission.permission) %> + <%= permission.identifier %> + <% Patron::PermissionBuilder::PRIVILEGES.each do |privilege| %> + + <% if RoleManagement.permissions[permission.identifier.to_sym].privileges.include?(privilege) %> + <%= icon_for_check(permission.privileges.public_send("#{privilege}?")) %> + <% else %> + - + <% end %> + + <% end %> + <% if actions_visible %> + <%= link_to_show(permission) %> + <% end %> + + <% end %> + + + diff --git a/app/views/patron/roles/_role_permission_fields.html.erb b/app/views/patron/roles/_role_permission_fields.html.erb index 942cc65c6..c895d9f59 100644 --- a/app/views/patron/roles/_role_permission_fields.html.erb +++ b/app/views/patron/roles/_role_permission_fields.html.erb @@ -5,11 +5,23 @@ <%= button_tag('x', type: 'button', class: 'close', data: { confirm: t('are_you_sure') }) %> <% end %>
+
+ <% if f.object.errors.any? %> +
    + <% f.object.errors.full_messages.each do |msg| %> +
  • <%= msg %>
    • + <% end %> +
+
+ <% end %> +
<%= f.association :permission %>
- <%= f.input :privileges, as: :check_boxes, collection: f.object.class.privileges.pairs %> +
+ <%= f.input :privileges, as: :check_boxes, collection: f.object.class.privileges.pairs %> +
From 52cd95141acfe65377017db89d92cd40af268641 Mon Sep 17 00:00:00 2001 From: isubas Date: Thu, 28 Nov 2019 16:42:07 +0300 Subject: [PATCH 164/216] =?UTF-8?q?Hata=20mesaj=C4=B1n=C4=B1=20yerelle?= =?UTF-8?q?=C5=9Ftir?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/patron/role_permission.rb | 2 +- app/views/patron/roles/_role_permission_fields.html.erb | 2 +- config/locales/patron/en.yml | 2 ++ config/locales/patron/tr.yml | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/patron/role_permission.rb b/app/models/patron/role_permission.rb index 31d409c1f..787ef0688 100644 --- a/app/models/patron/role_permission.rb +++ b/app/models/patron/role_permission.rb @@ -14,7 +14,7 @@ class RolePermission < ApplicationRecord privileges.to_a.each do |privilege| next if available_privileges.include?(privilege) - errors.add(:base, "Bu izin için #{privilege} geçerli bir ayrıcalık değil") + errors.add(:base, I18n.t('patron.errors.invalid_privilege', privilege: privilege)) end end diff --git a/app/views/patron/roles/_role_permission_fields.html.erb b/app/views/patron/roles/_role_permission_fields.html.erb index c895d9f59..e3800b8c2 100644 --- a/app/views/patron/roles/_role_permission_fields.html.erb +++ b/app/views/patron/roles/_role_permission_fields.html.erb @@ -9,7 +9,7 @@ <% if f.object.errors.any? %>
    <% f.object.errors.full_messages.each do |msg| %> -
  • <%= msg %>
    • +
  • <%= raw msg %>
    • <% end %>
diff --git a/config/locales/patron/en.yml b/config/locales/patron/en.yml index 83aa30908..816aa2de5 100644 --- a/config/locales/patron/en.yml +++ b/config/locales/patron/en.yml @@ -1,5 +1,7 @@ en: patron: + errors: + invalid_privilege: '%{privilege} is not a valid privilege for this permission' skip_empties: 'true': 'Yes' 'false': 'No' diff --git a/config/locales/patron/tr.yml b/config/locales/patron/tr.yml index ccfe56c98..583e37440 100644 --- a/config/locales/patron/tr.yml +++ b/config/locales/patron/tr.yml @@ -1,5 +1,7 @@ tr: patron: + errors: + invalid_privilege: Bu izin için %{privilege} geçerli bir ayrıcalık değil skip_empties: 'true': 'Evet' 'false': 'Hayır' From 1ec19095d18309458aa57c79b5a3486792328f8b Mon Sep 17 00:00:00 2001 From: isubas Date: Thu, 9 Jan 2020 15:48:44 +0300 Subject: [PATCH 165/216] =?UTF-8?q?Pundit=20poli=C3=A7elerini=20ayr=C4=B1c?= =?UTF-8?q?al=C4=B1klara=20g=C3=B6re=20d=C3=BCzenle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/policies/patron/assignment_policy.rb | 12 ++++++------ app/policies/patron/permission_policy.rb | 8 ++++---- app/policies/patron/query_store_policy.rb | 22 +++++++++++----------- app/policies/patron/role_policy.rb | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/policies/patron/assignment_policy.rb b/app/policies/patron/assignment_policy.rb index e617e5a4d..e0e3f1848 100644 --- a/app/policies/patron/assignment_policy.rb +++ b/app/policies/patron/assignment_policy.rb @@ -3,15 +3,15 @@ module Patron class AssignmentPolicy < ApplicationPolicy def index? - permitted? + permitted? :read end def show? - permitted? + permitted? :read end def update? - permitted? + permitted? :write end def edit? @@ -19,13 +19,13 @@ def edit? end def preview_scope? - permitted? + permitted? :read end private - def permitted? - user.permission? :authorization_management + def permitted?(*privileges) + user.privilege? :authorization_management, privileges end end end diff --git a/app/policies/patron/permission_policy.rb b/app/policies/patron/permission_policy.rb index 0fbf56cf1..e31f5861c 100644 --- a/app/policies/patron/permission_policy.rb +++ b/app/policies/patron/permission_policy.rb @@ -3,17 +3,17 @@ module Patron class PermissionPolicy < ApplicationPolicy def index? - permitted? + permitted? :read end def show? - permitted? + permitted? :read end private - def permitted? - user.permission? :permission_management + def permitted?(*privileges) + user.privilege? :permission_management, privileges end end end diff --git a/app/policies/patron/query_store_policy.rb b/app/policies/patron/query_store_policy.rb index 71d29e9f5..5433532b4 100644 --- a/app/policies/patron/query_store_policy.rb +++ b/app/policies/patron/query_store_policy.rb @@ -3,23 +3,23 @@ module Patron class QueryStorePolicy < ApplicationPolicy def index? - permitted? + permitted? :read end def show? - permitted? - end - - def create? - permitted? + permitted? :read end def new? create? end + def create? + permitted? :write + end + def update? - permitted? + permitted? :write end def edit? @@ -27,17 +27,17 @@ def edit? end def destroy? - permitted? + permitted? :destroy end def preview? - permitted? + permitted? :read end private - def permitted? - user.permission? :scope_query_management + def permitted?(*privileges) + user.privilege? :scope_query_management, privileges end end end diff --git a/app/policies/patron/role_policy.rb b/app/policies/patron/role_policy.rb index 2cc1df934..b2e92fa82 100644 --- a/app/policies/patron/role_policy.rb +++ b/app/policies/patron/role_policy.rb @@ -11,7 +11,7 @@ def show? end def create? - permitted? :write + new? end def new? From e7a93177082fe18b3df0936b204b32dd3b0f0236 Mon Sep 17 00:00:00 2001 From: isubas Date: Thu, 9 Jan 2020 15:49:21 +0300 Subject: [PATCH 166/216] =?UTF-8?q?Testleri=20d=C3=BCzelt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patron/roles_controller_test.rb | 26 +++++++++++++------ test/fixtures/patron/role_permissions.yml | 6 +++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/test/controllers/patron/roles_controller_test.rb b/test/controllers/patron/roles_controller_test.rb index 438c032cf..005c560e2 100644 --- a/test/controllers/patron/roles_controller_test.rb +++ b/test/controllers/patron/roles_controller_test.rb @@ -31,9 +31,14 @@ class RolesControllerTest < ActionDispatch::IntegrationTest test 'should create role' do parameters = { - name: 'Role Create', - identifier: 'role_create', - permission_ids: Permission.pluck(:id).sort + name: 'Role Create', + identifier: 'role_create', + role_permissions_attributes: [ + { + permission_id: patron_permissions(:scope_query_management).id, + privileges: %w[read write destroy] + } + ] } assert_difference('Patron::Role.count') do @@ -44,7 +49,7 @@ class RolesControllerTest < ActionDispatch::IntegrationTest assert_equal parameters[:name], role.name assert_equal parameters[:identifier], role.identifier - assert_equal parameters[:permission_ids].sort, role.permission_ids.sort + assert_equal [patron_permissions(:scope_query_management).id], role.permission_ids action_check('create') assert_redirected_to patron_role_path(role) @@ -62,9 +67,14 @@ class RolesControllerTest < ActionDispatch::IntegrationTest role = patron_roles(:role_to_update) parameters = { - name: 'Role Update', - identifier: 'role_update', - permission_ids: Patron::Permission.pluck(:id).sort + name: 'Role Update', + identifier: 'role_update', + role_permissions_attributes: [ + { + permission_id: patron_permissions(:role_management).id, + privileges: %w[read write] + } + ] } patch patron_role_path(role), params: { patron_role: parameters } @@ -72,7 +82,7 @@ class RolesControllerTest < ActionDispatch::IntegrationTest assert_equal parameters[:name], role.name assert_equal parameters[:identifier], role.identifier - assert_equal parameters[:permission_ids].sort, role.permission_ids.sort + assert_equal [patron_permissions(:role_management).id], role.permission_ids action_check('update') assert_redirected_to patron_role_path(role) diff --git a/test/fixtures/patron/role_permissions.yml b/test/fixtures/patron/role_permissions.yml index f10c90570..1f1e8969d 100644 --- a/test/fixtures/patron/role_permissions.yml +++ b/test/fixtures/patron/role_permissions.yml @@ -1,18 +1,24 @@ one: role: admin permission: unit_management + privileges: <%= Patron::RolePermission.privileges.to_i([:read, :write, :destroy]) %> two: role: admin permission: course_management + privileges: <%= Patron::RolePermission.privileges.to_i([:read, :write, :destroy]) %> three: role: authorization_manager permission: role_management + privileges: <%= Patron::RolePermission.privileges.to_i([:read, :write, :destroy]) %> four: role: authorization_manager permission: permission_management + privileges: <%= Patron::RolePermission.privileges.to_i([:read, :write, :destroy]) %> five: role: authorization_manager permission: scope_query_management + privileges: <%= Patron::RolePermission.privileges.to_i([:read, :write, :destroy]) %> six: role: authorization_manager permission: authorization_management + privileges: <%= Patron::RolePermission.privileges.to_i([:read, :write, :destroy]) %> From f34c808b5e32b06d89ae8e73aac77dadf0ecd70c Mon Sep 17 00:00:00 2001 From: isubas Date: Thu, 9 Jan 2020 15:50:10 +0300 Subject: [PATCH 167/216] =?UTF-8?q?Ufak=20d=C3=BCzeltmeler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/lib/patron/permission_builder.rb | 6 ++++++ app/views/patron/components/_role_permissions.html.erb | 2 +- app/views/patron/roles/show.html.erb | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/lib/patron/permission_builder.rb b/app/lib/patron/permission_builder.rb index cdb086d76..fb9f00345 100644 --- a/app/lib/patron/permission_builder.rb +++ b/app/lib/patron/permission_builder.rb @@ -15,6 +15,12 @@ def permissions @permissions ||= ActiveSupport::HashWithIndifferentAccess.new end + def privilege?(identifier, privilege) + return false unless permissions.include?(identifier.to_sym) + + permissions[identifier.to_sym].privileges.include?(privilege) + end + # Example # permission :foo, name: 'Foo', description: 'Desc' def permission(identifier, name:, description:, privileges:) diff --git a/app/views/patron/components/_role_permissions.html.erb b/app/views/patron/components/_role_permissions.html.erb index 27614e049..b2abad2c5 100644 --- a/app/views/patron/components/_role_permissions.html.erb +++ b/app/views/patron/components/_role_permissions.html.erb @@ -19,7 +19,7 @@ <%= permission.identifier %> <% Patron::PermissionBuilder::PRIVILEGES.each do |privilege| %> - <% if RoleManagement.permissions[permission.identifier.to_sym].privileges.include?(privilege) %> + <% if RoleManagement.privilege?(permission.identifier.to_sym, privilege) %> <%= icon_for_check(permission.privileges.public_send("#{privilege}?")) %> <% else %> - diff --git a/app/views/patron/roles/show.html.erb b/app/views/patron/roles/show.html.erb index 9dfdf7e6e..bb4d7b836 100644 --- a/app/views/patron/roles/show.html.erb +++ b/app/views/patron/roles/show.html.erb @@ -1,5 +1,5 @@ <%= action_bar do %> - <%= link_to_back :back %> + <%= link_to_back %i[patron roles] %> <%= link_to_edit [:edit, @role] %> <% end %> From 3f178f853059ba099bc3263294c40c236fe6ca82 Mon Sep 17 00:00:00 2001 From: isubas Date: Fri, 10 Jan 2020 11:46:46 +0300 Subject: [PATCH 168/216] =?UTF-8?q?Eksik=20=C3=A7evirileri=20ekle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/patron/roles/_form.html.erb | 2 +- config/locales/controllers/patron/roles.en.yml | 2 ++ config/locales/controllers/patron/roles.tr.yml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/patron/roles/_form.html.erb b/app/views/patron/roles/_form.html.erb index e7259b82f..5cedc88b8 100644 --- a/app/views/patron/roles/_form.html.erb +++ b/app/views/patron/roles/_form.html.erb @@ -24,7 +24,7 @@
-

<%= 'İzinler' %>

+

<%= t('.permissions') %>

diff --git a/config/locales/controllers/patron/roles.en.yml b/config/locales/controllers/patron/roles.en.yml index 44d357681..8fc3519eb 100644 --- a/config/locales/controllers/patron/roles.en.yml +++ b/config/locales/controllers/patron/roles.en.yml @@ -20,6 +20,8 @@ en: success: Role successfully deleted! edit: form_title: Update the Role + form: + permissions: Permissions index: card_header: Roles new_role_link: Add a New Role diff --git a/config/locales/controllers/patron/roles.tr.yml b/config/locales/controllers/patron/roles.tr.yml index c509af3be..d83e1c717 100644 --- a/config/locales/controllers/patron/roles.tr.yml +++ b/config/locales/controllers/patron/roles.tr.yml @@ -20,6 +20,8 @@ tr: success: Rol başarıyla silindi. edit: form_title: Rolü Güncelle + form: + permissions: İzinler index: card_header: Roller new_role_link: Yeni Rol Ekle From d2976e63e8f13e91e8de04423ccc2704c2070755 Mon Sep 17 00:00:00 2001 From: isubas Date: Fri, 10 Jan 2020 11:57:54 +0300 Subject: [PATCH 169/216] =?UTF-8?q?S=C4=B1ralamadan=20kaynakl=C4=B1=20hata?= =?UTF-8?q?lar=C4=B1n=20=C3=B6n=C3=BCne=20ge=C3=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/lib/patron/permission_builder.rb | 18 +++++++++++------- app/models/patron/role_permission.rb | 2 +- .../components/_role_permissions.html.erb | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/lib/patron/permission_builder.rb b/app/lib/patron/permission_builder.rb index fb9f00345..2506c2ca9 100644 --- a/app/lib/patron/permission_builder.rb +++ b/app/lib/patron/permission_builder.rb @@ -4,12 +4,16 @@ module Patron module PermissionBuilder mattr_accessor :all, default: ActiveSupport::HashWithIndifferentAccess.new - PRIVILEGES = %i[ - read - write - destroy - report - ].freeze + SUPPORTED_PRIVILEGES = { + read: 0, + write: 1, + destroy: 2, + report: 3 + }.freeze + + def self.supported_privileges + SUPPORTED_PRIVILEGES.sort_by { |_, v| v }.map(&:first) + end def permissions @permissions ||= ActiveSupport::HashWithIndifferentAccess.new @@ -43,7 +47,7 @@ def permission(identifier, name:, description:, privileges:) def available_privileges_check!(privileges) privileges.each do |privilege| - raise "Unavailable privilege: #{privilege}" unless PRIVILEGES.include?(privilege) + raise "Unavailable privilege: #{privilege}" unless SUPPORTED_PRIVILEGES.key?(privilege) end privileges.inquiry diff --git a/app/models/patron/role_permission.rb b/app/models/patron/role_permission.rb index 787ef0688..cb6551c33 100644 --- a/app/models/patron/role_permission.rb +++ b/app/models/patron/role_permission.rb @@ -22,6 +22,6 @@ class RolePermission < ApplicationRecord delegate :name, :identifier, :available_privileges, to: :permission # enums - flag :privileges, Patron::PermissionBuilder::PRIVILEGES + flag :privileges, Patron::PermissionBuilder.supported_privileges end end diff --git a/app/views/patron/components/_role_permissions.html.erb b/app/views/patron/components/_role_permissions.html.erb index b2abad2c5..295323409 100644 --- a/app/views/patron/components/_role_permissions.html.erb +++ b/app/views/patron/components/_role_permissions.html.erb @@ -4,7 +4,7 @@ <%= t('name', scope: %i[activerecord attributes patron/permission]) %> <%= t('identifier', scope: %i[activerecord attributes patron/permission]) %> - <% Patron::PermissionBuilder::PRIVILEGES.each do |privilege| %> + <% Patron::PermissionBuilder.supported_privileges.each do |privilege| %> <%= t(privilege, scope: %i[active_flag patron/role_permission privileges]) %> <% end %> <% if actions_visible %> @@ -17,7 +17,7 @@ <%= link_to(permission.name, permission.permission) %> <%= permission.identifier %> - <% Patron::PermissionBuilder::PRIVILEGES.each do |privilege| %> + <% Patron::PermissionBuilder.supported_privileges.each do |privilege| %> <% if RoleManagement.privilege?(permission.identifier.to_sym, privilege) %> <%= icon_for_check(permission.privileges.public_send("#{privilege}?")) %> From 9f90417ad952dafb416d5a71b647406d02e391a0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:18:37 +0000 Subject: [PATCH 170/216] chore(deps): bump node-releases from 1.1.44 to 1.1.45 Bumps [node-releases](https://github.com/chicoxyzzy/node-releases) from 1.1.44 to 1.1.45. - [Release notes](https://github.com/chicoxyzzy/node-releases/releases) - [Commits](https://github.com/chicoxyzzy/node-releases/compare/v1.1.44...v1.1.45) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3c3be8962..00704de12 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5277,9 +5277,9 @@ node-pre-gyp@*: tar "^4.4.2" node-releases@^1.1.42: - version "1.1.44" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.44.tgz#cd66438a6eb875e3eb012b6a12e48d9f4326ffd7" - integrity sha512-NwbdvJyR7nrcGrXvKAvzc5raj/NkoJudkarh2yIpJ4t0NH4aqjUDz/486P+ynIW5eokKOfzGNRdYoLfBlomruw== + version "1.1.45" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.45.tgz#4cf7e9175d71b1317f15ffd68ce63bce1d53e9f2" + integrity sha512-cXvGSfhITKI8qsV116u2FTzH5EWZJfgG7d4cpqwF8I8+1tWpD6AsvvGRKq2onR0DNj1jfqsjkXZsm14JMS7Cyg== dependencies: semver "^6.3.0" From cfd72489247aa56ed440265f66a4018858413031 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:20:27 +0000 Subject: [PATCH 171/216] chore(deps): bump inquirer from 7.0.2 to 7.0.3 Bumps [inquirer](https://github.com/SBoudrias/Inquirer.js) from 7.0.2 to 7.0.3. - [Release notes](https://github.com/SBoudrias/Inquirer.js/releases) - [Commits](https://github.com/SBoudrias/Inquirer.js/compare/inquirer@7.0.2...inquirer@7.0.3) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3c3be8962..e549be907 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4044,9 +4044,9 @@ ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== inquirer@^7.0.0: - version "7.0.2" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.2.tgz#b39b205b95c9424839a1fd991d60426cf9bbc0e9" - integrity sha512-cZGvHaHwcR9E3xK9EGO5pHKELU+yaeJO7l2qGKIbqk4bCuDuAn15LCoUTS2nSkfv9JybFlnAGrOcVpCDZZOLhw== + version "7.0.3" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.3.tgz#f9b4cd2dff58b9f73e8d43759436ace15bed4567" + integrity sha512-+OiOVeVydu4hnCGLCSX+wedovR/Yzskv9BFqUNNKq9uU2qg7LCcCo3R86S2E7WLo0y/x2pnEZfZe1CoYnORUAw== dependencies: ansi-escapes "^4.2.1" chalk "^2.4.2" From 9a4543f8883744cb4d7835df794e3160e3144d56 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:21:17 +0000 Subject: [PATCH 172/216] chore(deps): bump eslint-import-resolver-node from 0.3.2 to 0.3.3 Bumps [eslint-import-resolver-node](https://github.com/benmosher/eslint-plugin-import) from 0.3.2 to 0.3.3. - [Release notes](https://github.com/benmosher/eslint-plugin-import/releases) - [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md) - [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v0.3.2...resolvers/node/v0.3.3) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3c3be8962..22b444d3d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2829,12 +2829,12 @@ eslint-config-standard@^14.1.0: integrity sha512-EF6XkrrGVbvv8hL/kYa/m6vnvmUT+K82pJJc4JJVMM6+Qgqh0pnwprSxdduDLB9p/7bIxD+YV5O0wfb8lmcPbA== eslint-import-resolver-node@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" - integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q== + version "0.3.3" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404" + integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg== dependencies: debug "^2.6.9" - resolve "^1.5.0" + resolve "^1.13.1" eslint-module-utils@^2.4.1: version "2.5.0" @@ -7037,10 +7037,10 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.1.tgz#9e018c540fcf0c427d678b9931cbf45e984bcaff" - integrity sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg== +resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.8.1: + version "1.14.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2" + integrity sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ== dependencies: path-parse "^1.0.6" From 5924437b6a63cab7fb4876d2d4a6f3320f46fc53 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:28:30 +0000 Subject: [PATCH 173/216] chore(deps): bump compression-webpack-plugin from 3.0.1 to 3.1.0 Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin) from 3.0.1 to 3.1.0. - [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v3.0.1...v3.1.0) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3c3be8962..00b8268b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1998,9 +1998,9 @@ compressible@~2.0.16: mime-db ">= 1.40.0 < 2" compression-webpack-plugin@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.0.1.tgz#be7a343e6dfbccbd64a77c5fbe29627d140fc321" - integrity sha512-FOwoBVzDiwSdJDnZTKXDpAjJU90k8SbChgxnoiYwTo15xjIDJkSC8wFKuc13DymXjgasPEqzS5+2RUgSKXdKKA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.1.0.tgz#9f510172a7b5fae5aad3b670652e8bd7997aeeca" + integrity sha512-iqTHj3rADN4yHwXMBrQa/xrncex/uEQy8QHlaTKxGchT/hC0SdlJlmL/5eRqffmWq2ep0/Romw6Ld39JjTR/ug== dependencies: cacache "^13.0.1" find-cache-dir "^3.0.0" @@ -5624,13 +5624,20 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" -p-limit@^2.0.0, p-limit@^2.2.0: +p-limit@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== dependencies: p-try "^2.0.0" +p-limit@^2.2.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" + integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== + dependencies: + p-try "^2.0.0" + p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -6816,10 +6823,10 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== +"readable-stream@1 || 2": + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -6839,6 +6846,19 @@ readable-stream@1.1: isarray "0.0.1" string_decoder "~0.10.x" +readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: + version "2.3.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" + integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + readable-stream@^3.0.6: version "3.4.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc" From b71c44b9b38c7915c3e553e364bb51b14b88caa6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:29:16 +0000 Subject: [PATCH 174/216] chore(deps): bump events from 3.0.0 to 3.1.0 Bumps [events](https://github.com/Gozala/events) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/Gozala/events/releases) - [Changelog](https://github.com/Gozala/events/blob/master/History.md) - [Commits](https://github.com/Gozala/events/compare/v3.0.0...v3.1.0) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3c3be8962..5ae408050 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3012,9 +3012,9 @@ eventemitter3@^4.0.0: integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg== events@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88" - integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" + integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== eventsource@^1.0.7: version "1.0.7" From e85b8dd4e525010c571329c2b80716d10a7abeb9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:47:25 +0000 Subject: [PATCH 175/216] chore(deps-dev): bump rubocop from 0.78.0 to 0.79.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.78.0 to 0.79.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.78.0...v0.79.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c4ab527f0..357e56ae5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -260,7 +260,7 @@ GEM orm_adapter (0.5.0) pagy (3.7.1) parallel (1.19.1) - parser (2.7.0.1) + parser (2.7.0.2) ast (~> 2.4.0) pg (1.2.1) pg_search (2.3.1) @@ -338,10 +338,10 @@ GEM actionpack (>= 5.0) railties (>= 5.0) rollbar (2.23.1) - rubocop (0.78.0) + rubocop (0.79.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) From 6cc764ee6508bd7d4f01d9dde61d3b04bc99719c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:48:00 +0000 Subject: [PATCH 176/216] chore(deps): bump rb-inotify from 0.10.0 to 0.10.1 Bumps [rb-inotify](https://github.com/guard/rb-inotify) from 0.10.0 to 0.10.1. - [Release notes](https://github.com/guard/rb-inotify/releases) - [Commits](https://github.com/guard/rb-inotify/compare/v0.10.0...v0.10.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c4ab527f0..7bffa5064 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -325,7 +325,7 @@ GEM rainbow (3.0.0) rake (13.0.1) rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-inotify (0.10.1) ffi (~> 1.0) redis (4.1.3) regexp_parser (1.6.0) From 147fe98853aa8f0c4290f85694b614e7929e92f1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:48:43 +0000 Subject: [PATCH 177/216] chore(deps): bump aws-sdk-core from 3.86.0 to 3.88.0 Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.86.0 to 3.88.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c4ab527f0..e888022b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,8 +92,8 @@ GEM authy (2.7.5) httpclient (>= 2.5.3.3) aws-eventstream (1.0.3) - aws-partitions (1.261.0) - aws-sdk-core (3.86.0) + aws-partitions (1.263.0) + aws-sdk-core (3.88.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) From 885c1605f9f5a31d1a159f19f8de27a2f915951e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:49:10 +0000 Subject: [PATCH 178/216] chore(deps): bump aws-partitions from 1.261.0 to 1.263.0 Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.261.0 to 1.263.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c4ab527f0..e829a66df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,7 +92,7 @@ GEM authy (2.7.5) httpclient (>= 2.5.3.3) aws-eventstream (1.0.3) - aws-partitions (1.261.0) + aws-partitions (1.263.0) aws-sdk-core (3.86.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) From d2f59a8a435c92350dae6b94abec1977ead54145 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:49:44 +0000 Subject: [PATCH 179/216] chore(deps): bump i18n from 1.7.0 to 1.8.1 Bumps [i18n](https://github.com/svenfuchs/i18n) from 1.7.0 to 1.8.1. - [Release notes](https://github.com/svenfuchs/i18n/releases) - [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenfuchs/i18n/compare/v1.7.0...v1.8.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c4ab527f0..90870868b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -185,7 +185,7 @@ GEM hashie (3.6.0) html_tokenizer (0.0.7) httpclient (2.8.3) - i18n (1.7.0) + i18n (1.8.1) concurrent-ruby (~> 1.0) image_processing (1.10.0) mini_magick (>= 4.9.5, < 5) From 01e7efedebb343728bd16844b2e8d21ed6244b39 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:50:11 +0000 Subject: [PATCH 180/216] chore(deps): bump ruby-vips from 2.0.16 to 2.0.17 Bumps [ruby-vips](https://github.com/libvips/ruby-vips) from 2.0.16 to 2.0.17. - [Release notes](https://github.com/libvips/ruby-vips/releases) - [Changelog](https://github.com/libvips/ruby-vips/blob/master/CHANGELOG.md) - [Commits](https://github.com/libvips/ruby-vips/compare/v2.0.16...v2.0.17) Signed-off-by: dependabot-preview[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 67fb9f347..2e503cb4b 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ gem 'ancestry' # active-storage gem 'aws-sdk-s3', require: false gem 'image_processing', '~> 1.10' -gem 'ruby-vips', '~> 2.0.16' +gem 'ruby-vips', '~> 2.0.17' # authentication gem 'authy' diff --git a/Gemfile.lock b/Gemfile.lock index c4ab527f0..7273a75c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -353,7 +353,7 @@ GEM rack (>= 1.1) rubocop (>= 0.72.0) ruby-progressbar (1.10.1) - ruby-vips (2.0.16) + ruby-vips (2.0.17) ffi (~> 1.9) rubyzip (2.0.0) safe_yaml (1.0.5) @@ -511,7 +511,7 @@ DEPENDENCIES rubocop-performance rubocop-rails ruby-progressbar - ruby-vips (~> 2.0.16) + ruby-vips (~> 2.0.17) sassc (~> 2.2.1) sassc-rails sidekiq From 899f330beabdbb258ee925bca81bcaebc7199934 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:50:41 +0000 Subject: [PATCH 181/216] chore(deps): bump nexmo from 6.1.0 to 6.2.0 Bumps [nexmo](https://github.com/Nexmo/nexmo-ruby) from 6.1.0 to 6.2.0. - [Release notes](https://github.com/Nexmo/nexmo-ruby/releases) - [Changelog](https://github.com/Nexmo/nexmo-ruby/blob/master/CHANGES.md) - [Commits](https://github.com/Nexmo/nexmo-ruby/compare/v6.1.0...v6.2.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c4ab527f0..986823f43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -234,9 +234,9 @@ GEM msgpack (1.3.1) multipart-post (2.1.1) net-ldap (0.16.2) - nexmo (6.1.0) + nexmo (6.2.0) jwt (~> 2) - zeitwerk (~> 2) + zeitwerk (~> 2, >= 2.2) nio4r (2.5.2) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) From 0db771523363b1446422cb7e69f5c2f7d8418ec0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:51:15 +0000 Subject: [PATCH 182/216] chore(deps): bump mini_magick from 4.9.5 to 4.10.1 Bumps [mini_magick](https://github.com/minimagick/minimagick) from 4.9.5 to 4.10.1. - [Release notes](https://github.com/minimagick/minimagick/releases) - [Commits](https://github.com/minimagick/minimagick/compare/v4.9.5...v4.10.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c4ab527f0..95b59234e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -225,7 +225,7 @@ GEM mimemagic (~> 0.3.2) method_source (0.9.2) mimemagic (0.3.3) - mini_magick (4.9.5) + mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.13.0) From 735aed7c3b93eb4bb6c7ff31d896b251f668c04b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:51:49 +0000 Subject: [PATCH 183/216] chore(deps): bump rein from 5.0.0 to 5.1.0 Bumps [rein](https://github.com/nullobject/rein) from 5.0.0 to 5.1.0. - [Release notes](https://github.com/nullobject/rein/releases) - [Changelog](https://github.com/nullobject/rein/blob/master/CHANGELOG.md) - [Commits](https://github.com/nullobject/rein/compare/v5.0.0...v5.1.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c4ab527f0..d2424c1e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -185,7 +185,7 @@ GEM hashie (3.6.0) html_tokenizer (0.0.7) httpclient (2.8.3) - i18n (1.7.0) + i18n (1.8.1) concurrent-ruby (~> 1.0) image_processing (1.10.0) mini_magick (>= 4.9.5, < 5) @@ -228,7 +228,7 @@ GEM mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.13.0) + minitest (5.14.0) minitest-focus (1.1.2) minitest (>= 4, < 6) msgpack (1.3.1) @@ -329,7 +329,7 @@ GEM ffi (~> 1.0) redis (4.1.3) regexp_parser (1.6.0) - rein (5.0.0) + rein (5.1.0) activerecord (>= 4.0.0) activesupport (>= 4.0.0) request_store (1.5.0) From 754414702a51c9e4d502f7f78b07ac15dea7c10c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 00:52:18 +0000 Subject: [PATCH 184/216] chore(deps): bump crass from 1.0.5 to 1.0.6 Bumps [crass](https://github.com/rgrove/crass) from 1.0.5 to 1.0.6. - [Release notes](https://github.com/rgrove/crass/releases) - [Changelog](https://github.com/rgrove/crass/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/crass/compare/v1.0.5...v1.0.6) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c4ab527f0..46e003f41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,7 +147,7 @@ GEM connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.5) + crass (1.0.6) devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) From fab2aff121401df906d31fea237f2260f27d71a7 Mon Sep 17 00:00:00 2001 From: isubas Date: Mon, 13 Jan 2020 15:14:45 +0300 Subject: [PATCH 185/216] =?UTF-8?q?Method=20isimlerini=20ve=20hata=20mesaj?= =?UTF-8?q?lar=C4=B1n=C4=B1=20d=C3=BCzenle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/lib/patron/permission_builder.rb | 6 +++--- app/models/patron/permission.rb | 2 +- app/models/patron/role_permission.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/lib/patron/permission_builder.rb b/app/lib/patron/permission_builder.rb index 2506c2ca9..ea32304ab 100644 --- a/app/lib/patron/permission_builder.rb +++ b/app/lib/patron/permission_builder.rb @@ -32,7 +32,7 @@ def permission(identifier, name:, description:, privileges:) name: name, identifier: identifier, description: description, - privileges: available_privileges_check!(privileges) + privileges: supported_privileges_check!(privileges) ) permissions[identifier] = generated_permission @@ -45,9 +45,9 @@ def permission(identifier, name:, description:, privileges:) private - def available_privileges_check!(privileges) + def supported_privileges_check!(privileges) privileges.each do |privilege| - raise "Unavailable privilege: #{privilege}" unless SUPPORTED_PRIVILEGES.key?(privilege) + raise "Unsupported privilege: #{privilege}" unless SUPPORTED_PRIVILEGES.key?(privilege) end privileges.inquiry diff --git a/app/models/patron/permission.rb b/app/models/patron/permission.rb index 5bee302d8..04f5c100c 100644 --- a/app/models/patron/permission.rb +++ b/app/models/patron/permission.rb @@ -20,7 +20,7 @@ class Permission < ApplicationRecord validates :identifier, uniqueness: true, presence: true, length: { maximum: 255 } validates :description, length: { maximum: 65_535 } - def available_privileges + def privileges_for_identifier Patron::PermissionBuilder.all[identifier]&.privileges || [] end end diff --git a/app/models/patron/role_permission.rb b/app/models/patron/role_permission.rb index cb6551c33..af58e5ebd 100644 --- a/app/models/patron/role_permission.rb +++ b/app/models/patron/role_permission.rb @@ -12,14 +12,14 @@ class RolePermission < ApplicationRecord before_validation do privileges.to_a.each do |privilege| - next if available_privileges.include?(privilege) + next if privileges_for_identifier.include?(privilege) errors.add(:base, I18n.t('patron.errors.invalid_privilege', privilege: privilege)) end end # delegates - delegate :name, :identifier, :available_privileges, to: :permission + delegate :name, :identifier, :privileges_for_identifier, to: :permission # enums flag :privileges, Patron::PermissionBuilder.supported_privileges From 6107e6ba8c820120bf7d860444b7ebe0a6cd80e5 Mon Sep 17 00:00:00 2001 From: isubas Date: Mon, 13 Jan 2020 15:15:38 +0300 Subject: [PATCH 186/216] =?UTF-8?q?Test=20ortam=C4=B1nda=20attribute=20var?= =?UTF-8?q?l=C4=B1k=20kontrol=C3=BC=20yapma?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/lib/patron/scope/dsl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/patron/scope/dsl.rb b/app/lib/patron/scope/dsl.rb index 2964a381e..f6fff35b4 100644 --- a/app/lib/patron/scope/dsl.rb +++ b/app/lib/patron/scope/dsl.rb @@ -50,7 +50,7 @@ def filter?(name) private def exist!(attribute) - return if model.attribute_names.include?(attribute.to_s) + return if Rails.env.test? || model.attribute_names.include?(attribute.to_s) raise ArgumentError, "Unrecognized attribute: #{attribute} for #{model}" end From 3a5dd210d4241f24aea3a970a98903f8581b2b52 Mon Sep 17 00:00:00 2001 From: isubas Date: Mon, 13 Jan 2020 15:50:07 +0300 Subject: [PATCH 187/216] =?UTF-8?q?Patron=20d=C3=B6k=C3=BCman=C4=B1n=C4=B1?= =?UTF-8?q?=20g=C3=BCncelle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/app/patron.md | 174 +++++++++++++++++++++++++++------------------- 1 file changed, 103 insertions(+), 71 deletions(-) diff --git a/doc/app/patron.md b/doc/app/patron.md index 1b6708672..e14832010 100644 --- a/doc/app/patron.md +++ b/doc/app/patron.md @@ -11,38 +11,30 @@ Yetkilendirme Temel Bilgiler -------------- -Sistem üzerinde kullanıcıların erişebileceği işlevleri belirlemek ve -sınırlandırmak için üç temel bileşen kullanılarak yetkilendirme yapısı -oluşturulmuştur. Bu bileşenler; +Sistem üzerinde kullanıcıların erişebileceği işlevleri belirlemek ve sınırlandırmak için üç temel bileşen kullanılarak +yetkilendirme yapısı oluşturulmuştur. Bu bileşenler; ### İzinler (Permissions) -Belirli bir kapsamda yapabilecek işler için oluşturulan genel bir -tanımlayıcıdır. İzinler built-in olarak oluşturulur ve sistem tarafından sunulan -interface sayesinde kullanıcıların ilgili izne sahiplikleri sorgulanabilir. -(Bknz: User Modeli Üzerinden Yetki ve Rol Sorgulama) Örneğin, sistem üzerinde -dersler ile ilgili işlevleri yapabilmek için `course_managemant` adında bir izin -tanımlanabilir. İzin tanımlamaları, ihtiyaçlara özgü olarak -`ders_olusturma_izni` şeklinde daha spesifik tanımlanabilir. Bu tanımlamalar +Belirli bir kapsamda yapabilecek işler için oluşturulan genel bir tanımlayıcıdır. İzinler built-in olarak oluşturulur ve +sistem tarafından sunulan interface sayesinde kullanıcıların ilgili izne sahiplikleri sorgulanabilir. Örneğin, sistem +üzerinde dersler ile ilgili işlevleri yapabilmek için `course_managemant` adında bir izin tanımlanabilir. İzin +tanımlamaları, ihtiyaçlara özgü olarak `ders_olusturma_izni` şeklinde daha spesifik tanımlanabilir. Bu tanımlamalar yetkilendirme ihtiyaçlarına göre geliştiriciler tarafından belirlenebilir. ### Rol (Role) -İzinlerin gruplandırılarak kullanıcılara atanabilmesini sağlayan bileşendir. -Kullanıcı ile izinler arasındaki bağlantı kullanıcı-rol ilişkisi ile sağlanır. -Yukarıda belirtilen görevi dışında diğer bir görevi ise kullanıcılar arasındaki -üst seviyeli yetki ayrımını sağlamaktır. Üst seviyeli yetki ayrımından kasıt -`Super Admin`, `Admin`, `Authorization Manager`, `Student` ve `Lecturer` gibi -roller ile üst seviye erişim sınırlamalarını belirlemektir. +İzinlerin gruplandırılarak kullanıcılara atanabilmesini sağlayan bileşendir. Kullanıcı ile izinler arasındaki bağlantı +kullanıcı-rol ilişkisi ile sağlanır. Yukarıda belirtilen görevi dışında diğer bir görevi ise kullanıcılar arasındaki üst +seviyeli yetki ayrımını sağlamaktır. Üst seviyeli yetki ayrımından kasıt `Super Admin`, `Admin`, `Authorization +Manager`, `Student` ve `Lecturer` gibi roller ile üst seviye erişim sınırlamalarını belirlemektir. ### Kapsamlar (Scopes) -Kapsam, sistem üzerinde dinamik olarak veri erişim kısıtlanması sağlayan -bileşendir. Web arayüzünde oluşturulan formlar kullanılarak kapsamlar için -sorgulama parametreleri oluşturulur. Bu parametreler `QueryStore` adından bir -modelde tutulmaktadır. Oluşturulan kapsam sorgu parametreleri kullanıcılar ile -ilişkilendirilerek, kullanıcıların veri erişimleri kısıtlanır. (Bknz: Kapsam -Oluşturması ve Kullanımı) +Kapsam, sistem üzerinde dinamik olarak veri erişim kısıtlanması sağlayan bileşendir. Web arayüzünde oluşturulan formlar +kullanılarak kapsamlar için sorgulama parametreleri oluşturulur. Bu parametreler `QueryStore` adından bir modelde +tutulmaktadır. Oluşturulan kapsam sorgu parametreleri kullanıcılar ile ilişkilendirilerek, kullanıcıların veri +erişimleri kısıtlanır. (Bknz: Kapsam Oluşturması ve Kullanımı) Yetkilendirme Alt Yapısı ------------------------ @@ -51,6 +43,63 @@ Yetkilendirme Alt Yapısı Rol ve izin bazlı yetkilendirme yönetimi için `Pundit` gemi kullanılmıştır. +### Dahili (built-in) Rol ve İzin Tanımlama + +Sistem genelinde temel rollendirme için kullanılacak rol ve izinlerin built-in olarak oluşturulması gerekir. Dahili rol +ve izinleri `config/initializers/role_management.rb` dosyası üzerinden tanımlanır. Aşağıda rol ve izin tanımlama +örneğine görmektesiniz. + +```ruby +class RoleManagement + extend Patron::PermissionBuilder + extend Patron::RoleBuilder + + # permissions + permission :foo, + name: 'Foo', + description: 'Foo için Temel İzin Açıklaması', + privileges: %i[read write destroy] + + permission :foo, + name: 'Bar', + description: 'Bar için Temel İzin Açıklaması', + privileges: %i[read write] + + # roles + role :authorization_manager, + name: 'Rol Adı', + permissions: { + foo: %i[read write destroy], + bar: %i[read] + } +end +``` + +#### İzin Tanımlama + +`permission(identifier, name:, description:, privileges:)` + +Parametreler: + +- `identifier (String):` İznin tekil tanımlayıcısı +- `name (String):` İznin yaptığı işi belirtebilecek açıklayıcı kısa ad +- `description (String):` İzin için detaylı açıklama +- `privileges (Array[Symbol]):` Desteklediği ayrıcalıklar + +#### Rol Tanımlama + +`role(identifier, name:, permissions:)` + +Parametreler: + +- `identifier (String):` Rolün tekil tanımlayıcısı +- `name (String):` Rolün yaptığı işi belirtebilecek açıklayıcı kısa ad +- `permissions (Hash):` Rolün sahip olduğu izinler ve bu rol için izinlere verilen ayrıcalıklar **({ izin_tanımlayıcısı: + [Ayrıcalık Listesi] })** + +### Dahili (built-in) Rol ve İzin Tanımlama + + ### Kapsam Oluşturması ve Kullanımı `Unit` modeli için kapsam oluşturma örneği üzerinden anlatılacaktır. @@ -88,17 +137,14 @@ end 1. `app\scopes` dizini altına `unit_scope.rb` adından bir dosya oluşturulur. -2. `unit_scope.rb` dosyasına `UnitScope` adından ve `Patron::Scope::Base` - sınıfından miras alan bir sınıf oluşturulur. Oluşturulan kapsam sınıfı için - isimlendirmeler `%sScope` kuralı göre yapılır. +2. `unit_scope.rb` dosyasına `UnitScope` adından ve `Patron::Scope::Base` sınıfından miras alan bir sınıf oluşturulur. + Oluşturulan kapsam sınıfı için isimlendirmeler `%sScope` kuralı göre yapılır. -3. Oluşturulan `UnitScope` sınıfına `Patron::Scope::Base` sınıfından gelen - `filter`, `preview_attributes` ve `bypass?` metodları kullanılarak gerekli - tanımlamalar yapılır. +3. Oluşturulan `UnitScope` sınıfına `Patron::Scope::Base` sınıfından gelen `filter`, `preview_attributes` ve `bypass?` + metodları kullanılarak gerekli tanımlamalar yapılır. -4. `Unit` modeline `Patron::Scope::Model` modülü `include` edilir. Bu modülün - iclude edilemesi ile modele `scope_for` adından bir class metod eklenmiş - olur. Model için veri sınırlaması bu metod aracılığıyla yapılmaktadır. +4. `Unit` modeline `Patron::Scope::Model` modülü `include` edilir. Bu modülün iclude edilemesi ile modele `scope_for` + adından bir class metod eklenmiş olur. Model için veri sınırlaması bu metod aracılığıyla yapılmaktadır. ```ruby # bypass'ın varsayılan değeri kapsam sınıfına tanımlan bypass? metodundan dönen @@ -114,9 +160,8 @@ end #### filter -Unit modelinde bulunan niteliklerden hangisinin kapsam sorgu üretiminde -kullanılacağını belirlemek için kullanılan metoddur. Bu metodun kullanım şekli -ve alabileceği parametreler aşağıdaki gibidir. +Unit modelinde bulunan niteliklerden hangisinin kapsam sorgu üretiminde kullanılacağını belirlemek için kullanılan +metoddur. Bu metodun kullanım şekli ve alabileceği parametreler aşağıdaki gibidir. ```ruby filter :attribute_name, collection: [], # opsiyonel @@ -127,39 +172,29 @@ ve alabileceği parametreler aşağıdaki gibidir. - **attribute_name:** Kapsam oluşturulan modelde filtrelenecek niteliğin adı, bu nitelik sorgulanabilir olmalıdır. -- **collection:** UI üzerinde filtre değeri için oluşturulan input'un - `selectbox` türünde olmasını ve selectbox listesindeki değerlerin - collection'a tanımlanan değerlerden oluşmasını sağlayan parametredir. Bu - parametreye verilen değer `Proc` sınıfına ait olmalıdır. Eğer `collection` - tanımlanmaz ise filtre değeri için oluşturulan input `string` türünde - olacaktır. - -- **multiple:** UI üzerinde filtre değeri için oluşturulan input'un `selectbox` - olması durumunda liste üzerinden birden fazla değer seçimi yapılabilmesini - sağlayan parametredir. `true` veya `false` olmak üzere iki değerden birini - alır. `true` olması durumundan çoklu seçim aktifleştirilmiş olur. - -- **i18n_key:** UI üzerinde filtre ile ilgili çevirilerde kullanılacak anahtar - kelimenin belirlenmesi sağlayan parametredir. Boş geçilmesi halinde - `i18n_key` filtre tanımlanan nitelik adıyla aynı olur. Örnek üzerinden de - belirtecek olursak filtre niteliği `unit_type_id` iken çevirilerde - kullanılacak anahtar kelime `unit_type` olarak belirlenmiştir. Ek olarak - filtreler için çeviriler `activerecord.attributes.model` kapsamı altında - aranır. +- **collection:** UI üzerinde filtre değeri için oluşturulan input'un `selectbox` türünde olmasını ve selectbox + listesindeki değerlerin collection'a tanımlanan değerlerden oluşmasını sağlayan parametredir. Bu parametreye verilen + değer `Proc` sınıfına ait olmalıdır. Eğer `collection` tanımlanmaz ise filtre değeri için oluşturulan input `string` + türünde olacaktır. + +- **multiple:** UI üzerinde filtre değeri için oluşturulan input'un `selectbox` olması durumunda liste üzerinden birden + fazla değer seçimi yapılabilmesini sağlayan parametredir. `true` veya `false` olmak üzere iki değerden birini alır. + `true` olması durumundan çoklu seçim aktifleştirilmiş olur. + +- **i18n_key:** UI üzerinde filtre ile ilgili çevirilerde kullanılacak anahtar kelimenin belirlenmesi sağlayan + parametredir. Boş geçilmesi halinde `i18n_key` filtre tanımlanan nitelik adıyla aynı olur. Örnek üzerinden de + belirtecek olursak filtre niteliği `unit_type_id` iken çevirilerde kullanılacak anahtar kelime `unit_type` olarak + belirlenmiştir. Ek olarak filtreler için çeviriler `activerecord.attributes.model` kapsamı altında aranır. #### dynamic_value - Filterelere statik ve dinamik türde iki değer atanabilir. Statik değer, - kullanıcıdan kullanıcıya değişmeyen ve herhangi bir hesaplanma yapılmadan - sabit olarak belirlenen değerlerdir. Dimanik değer ise, kullanıcıdan - kullanıcıya değişiklik gösterebilecek, kapsam sınıfında tanımlanan ve her - defasında belirlenen lojiğe göre hesaplanan değerdir. + Filterelere statik ve dinamik türde iki değer atanabilir. Statik değer, kullanıcıdan kullanıcıya değişmeyen ve + herhangi bir hesaplanma yapılmadan sabit olarak belirlenen değerlerdir. Dimanik değer ise, kullanıcıdan kullanıcıya + değişiklik gösterebilecek, kapsam sınıfında tanımlanan ve her defasında belirlenen lojiğe göre hesaplanan değerdir. - Kapsam oluşturulurken filtrelere dinamik değer atayabilmek için kapsam sınıfı - içerisine `dynamic_value` tanımlamanız ve `dynamic_value`'nın `scope` - niteliğine dinamik değeri kullanabilecek filtreleri tanımlamanız - gerekmektedir. Bir dinamic_value sadece scope niteliği ile belirlenen - filtrelere tanımlanabilir. + Kapsam oluşturulurken filtrelere dinamik değer atayabilmek için kapsam sınıfı içerisine `dynamic_value` tanımlamanız + ve `dynamic_value`'nın `scope` niteliğine dinamik değeri kullanabilecek filtreleri tanımlamanız gerekmektedir. Bir + dinamic_value sadece scope niteliği ile belirlenen filtrelere tanımlanabilir. **Not:** Metod içisinde kapsamın uygulandığı kullanıcıya `user` niteliğiyle erişilir. @@ -176,14 +211,11 @@ ve alabileceği parametreler aşağıdaki gibidir. #### preview_attributes - Ön izleme sırasında hangi niteliklerin görüntüleneceğinin belirlenmesini - sağlayan metoddur. Eğer `preview_attributes` tanımlanmamışsa, - `preview_attributes` olarak filtreler kullanılır. + Ön izleme sırasında hangi niteliklerin görüntüleneceğinin belirlenmesini sağlayan metoddur. Eğer `preview_attributes` + tanımlanmamışsa, `preview_attributes` olarak filtreler kullanılır. #### bypass - Hangi durumlarda kapsamın bypass edileceğinin belirlendiği metoddur. Bu metod - yardımıyla belirli rollere veya koşullara sahip kullanıcılar için veri - sınırlaması bypass edilebilir. Metod içisinde kapsamın uygulandığı kullanıcıya - `user` niteliğiyle erişilir. Bu metodun `true` veya `false` bir değer - döndürmesi gerekmektedir. + Hangi durumlarda kapsamın bypass edileceğinin belirlendiği metoddur. Bu metod yardımıyla belirli rollere veya + koşullara sahip kullanıcılar için veri sınırlaması bypass edilebilir. Metod içisinde kapsamın uygulandığı kullanıcıya + `user` niteliğiyle erişilir. Bu metodun `true` veya `false` bir değer döndürmesi gerekmektedir. From 37dc8437c946aeecf95f5178098af9718f58d503 Mon Sep 17 00:00:00 2001 From: isubas Date: Mon, 13 Jan 2020 16:31:48 +0300 Subject: [PATCH 188/216] Fix offences for markdown doc --- doc/app/patron.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/app/patron.md b/doc/app/patron.md index e14832010..624f6a65f 100644 --- a/doc/app/patron.md +++ b/doc/app/patron.md @@ -97,8 +97,9 @@ Parametreler: - `permissions (Hash):` Rolün sahip olduğu izinler ve bu rol için izinlere verilen ayrıcalıklar **({ izin_tanımlayıcısı: [Ayrıcalık Listesi] })** -### Dahili (built-in) Rol ve İzin Tanımlama +### Dahili Rol ve İzinleri Veritabanına Aktarma +`rails patron:all` rake görevini kullanarak veritabanı aktarım işlemini gerçekleştirebilirsiniz. ### Kapsam Oluşturması ve Kullanımı From 0c5e3fd6fe34a198961c4f42bd9c2b435a06e3df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0rfan=20Suba=C5=9F?= Date: Tue, 14 Jan 2020 00:26:54 +0300 Subject: [PATCH 189/216] Update doc/app/patron.md --- doc/app/patron.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/app/patron.md b/doc/app/patron.md index 624f6a65f..cab83b57a 100644 --- a/doc/app/patron.md +++ b/doc/app/patron.md @@ -46,7 +46,7 @@ Rol ve izin bazlı yetkilendirme yönetimi için `Pundit` gemi kullanılmıştı ### Dahili (built-in) Rol ve İzin Tanımlama Sistem genelinde temel rollendirme için kullanılacak rol ve izinlerin built-in olarak oluşturulması gerekir. Dahili rol -ve izinleri `config/initializers/role_management.rb` dosyası üzerinden tanımlanır. Aşağıda rol ve izin tanımlama +ve izinler `config/initializers/role_management.rb` dosyası üzerinden tanımlanır. Aşağıda rol ve izin tanımlama örneğine görmektesiniz. ```ruby From 9d2ba7ef3cfadd5c437e38b6197dbee4d229f988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20Can=20Y=C4=B1lmaz?= Date: Tue, 14 Jan 2020 10:46:00 +0300 Subject: [PATCH 190/216] =?UTF-8?q?image=5Fprocessing=20gem'i=20s=C3=BCr?= =?UTF-8?q?=C3=BCm=C3=BCn=C3=BC=20y=C3=BCkselt:=201.10.0=20>=201.10.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 2e503cb4b..742653351 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem 'ancestry' # active-storage gem 'aws-sdk-s3', require: false -gem 'image_processing', '~> 1.10' +gem 'image_processing', '~> 1.10.3' gem 'ruby-vips', '~> 2.0.17' # authentication diff --git a/Gemfile.lock b/Gemfile.lock index 7273a75c5..9d31afbf9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -187,9 +187,9 @@ GEM httpclient (2.8.3) i18n (1.7.0) concurrent-ruby (~> 1.0) - image_processing (1.10.0) + image_processing (1.10.3) mini_magick (>= 4.9.5, < 5) - ruby-vips (>= 2.0.13, < 3) + ruby-vips (>= 2.0.17, < 3) jaro_winkler (1.5.4) jbuilder (2.9.1) activesupport (>= 4.2.0) @@ -225,7 +225,7 @@ GEM mimemagic (~> 0.3.2) method_source (0.9.2) mimemagic (0.3.3) - mini_magick (4.9.5) + mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.13.0) @@ -478,7 +478,7 @@ DEPENDENCIES font-awesome-rails friendly_id (~> 5.3.0) groupdate - image_processing (~> 1.10) + image_processing (~> 1.10.3) jbuilder (~> 2.9) letter_opener listen (>= 3.0.5, < 3.3) From 1062968c9b9908b424d3b75b524e12b34e113e17 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:42:40 +0000 Subject: [PATCH 191/216] chore(deps): bump pwned from 2.0.0 to 2.0.1 Bumps [pwned](https://github.com/philnash/pwned) from 2.0.0 to 2.0.1. - [Release notes](https://github.com/philnash/pwned/releases) - [Changelog](https://github.com/philnash/pwned/blob/master/CHANGELOG.md) - [Commits](https://github.com/philnash/pwned/compare/v2.0.0...v2.0.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1279f1044..55a56a453 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,7 +280,7 @@ GEM nio4r (~> 2.0) pundit (2.1.0) activesupport (>= 3.0.0) - pwned (2.0.0) + pwned (2.0.1) rack (2.0.8) rack-attack (6.2.2) rack (>= 1.0, < 3) From a732ffb30b0ae6f64875d502445e53b27627fc04 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:43:28 +0000 Subject: [PATCH 192/216] chore(deps): bump i18n from 1.8.1 to 1.8.2 Bumps [i18n](https://github.com/svenfuchs/i18n) from 1.8.1 to 1.8.2. - [Release notes](https://github.com/svenfuchs/i18n/releases) - [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenfuchs/i18n/compare/v1.8.1...v1.8.2) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1279f1044..2b7241ee1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -187,7 +187,7 @@ GEM hashie (3.6.0) html_tokenizer (0.0.7) httpclient (2.8.3) - i18n (1.8.1) + i18n (1.8.2) concurrent-ruby (~> 1.0) image_processing (1.10.3) mini_magick (>= 4.9.5, < 5) From 58afd4fd56c5ba9037cba860949175633e68dbde Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:43:57 +0000 Subject: [PATCH 193/216] chore(deps): bump twilio-ruby from 5.31.1 to 5.31.2 Bumps [twilio-ruby](https://github.com/twilio/twilio-ruby) from 5.31.1 to 5.31.2. - [Release notes](https://github.com/twilio/twilio-ruby/releases) - [Changelog](https://github.com/twilio/twilio-ruby/blob/master/CHANGES.md) - [Commits](https://github.com/twilio/twilio-ruby/compare/5.31.1...5.31.2) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1279f1044..e8cd557e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -170,7 +170,7 @@ GEM smart_properties erubi (1.9.0) execjs (2.7.0) - faraday (0.17.3) + faraday (1.0.0) multipart-post (>= 1.2, < 3) ffi (1.11.3) fit-commit (3.8.1) @@ -406,8 +406,8 @@ GEM thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) - twilio-ruby (5.31.1) - faraday (~> 0.9) + twilio-ruby (5.31.2) + faraday (~> 1.0.0) jwt (>= 1.5, <= 2.5) nokogiri (>= 1.6, < 2.0) tzinfo (1.2.6) From b8edb2f75b04023db612fa1611358a859c56021e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:44:33 +0000 Subject: [PATCH 194/216] chore(deps-dev): bump byebug from 11.0.1 to 11.1.0 Bumps [byebug](https://github.com/deivid-rodriguez/byebug) from 11.0.1 to 11.1.0. - [Release notes](https://github.com/deivid-rodriguez/byebug/releases) - [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md) - [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.0.1...v11.1.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1279f1044..8cd3484d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,7 +130,7 @@ GEM bundler-audit (0.6.1) bundler (>= 1.2.0, < 3) thor (~> 0.18) - byebug (11.0.1) + byebug (11.1.0) capybara (3.30.0) addressable mini_mime (>= 0.1.3) From 13c8c05504829e05dcf441c234e5df4e0de5b546 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:44:34 +0000 Subject: [PATCH 195/216] chore(deps): bump node-sass from 4.13.0 to 4.13.1 Bumps [node-sass](https://github.com/sass/node-sass) from 4.13.0 to 4.13.1. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/node-sass/compare/v4.13.0...v4.13.1) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 54 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8dee7f094..faea19712 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1047,7 +1047,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2: version "6.10.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52" integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw== @@ -1057,6 +1057,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.5.5: + version "6.11.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9" + integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -1313,9 +1323,9 @@ aws-sign2@~0.7.0: integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= aws4@^1.8.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c" - integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A== + version "1.9.1" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" + integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== babel-loader@^8.0.6: version "8.0.6" @@ -3163,6 +3173,11 @@ fast-deep-equal@^2.0.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= +fast-deep-equal@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" + integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== + fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" @@ -4974,7 +4989,19 @@ mime-db@1.42.0, "mime-db@>= 1.40.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac" integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ== -mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: +mime-db@1.43.0: + version "1.43.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" + integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== + +mime-types@^2.1.12, mime-types@~2.1.19: + version "2.1.26" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" + integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== + dependencies: + mime-db "1.43.0" + +mime-types@~2.1.17, mime-types@~2.1.24: version "2.1.25" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437" integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg== @@ -5284,9 +5311,9 @@ node-releases@^1.1.42: semver "^6.3.0" node-sass@^4.13.0: - version "4.13.0" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066" - integrity sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA== + version "4.13.1" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3" + integrity sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw== dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -6823,7 +6850,7 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -"readable-stream@1 || 2": +"readable-stream@1 || 2", readable-stream@^2.0.1, readable-stream@^2.0.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -6846,7 +6873,7 @@ readable-stream@1.1: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== @@ -8236,11 +8263,16 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@^3.0.1, uuid@^3.3.2: +uuid@^3.0.1: version "3.3.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866" integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ== +uuid@^3.3.2: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + v8-compile-cache@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe" From 315c6a5c0a6d30df994ced9002dd9250b7774510 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:45:05 +0000 Subject: [PATCH 196/216] chore(deps): bump pagy from 3.7.1 to 3.7.2 Bumps [pagy](https://github.com/ddnexus/pagy) from 3.7.1 to 3.7.2. - [Release notes](https://github.com/ddnexus/pagy/releases) - [Changelog](https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md) - [Commits](https://github.com/ddnexus/pagy/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1279f1044..d078dfd79 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -260,7 +260,7 @@ GEM validate_url webfinger (>= 1.0.1) orm_adapter (0.5.0) - pagy (3.7.1) + pagy (3.7.2) parallel (1.19.1) parser (2.7.0.2) ast (~> 2.4.0) From 871f60a225fe8115c040f4b6179aa5ac88204971 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:45:33 +0000 Subject: [PATCH 197/216] chore(deps): bump unicode-display_width from 1.6.0 to 1.6.1 Bumps [unicode-display_width](https://github.com/janlelis/unicode-display_width) from 1.6.0 to 1.6.1. - [Release notes](https://github.com/janlelis/unicode-display_width/releases) - [Changelog](https://github.com/janlelis/unicode-display_width/blob/master/CHANGELOG.md) - [Commits](https://github.com/janlelis/unicode-display_width/compare/v1.6.0...v1.6.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1279f1044..17e821fbc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -414,7 +414,7 @@ GEM thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.6.0) + unicode-display_width (1.6.1) uniform_notifier (1.13.0) valid_email2 (3.1.3) activemodel (>= 3.2) From bb3885401a9ad4df7dfa2cca21db5eb63305b125 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:45:56 +0000 Subject: [PATCH 198/216] chore(deps): bump mime-types from 2.1.25 to 2.1.26 Bumps [mime-types](https://github.com/jshttp/mime-types) from 2.1.25 to 2.1.26. - [Release notes](https://github.com/jshttp/mime-types/releases) - [Changelog](https://github.com/jshttp/mime-types/blob/master/HISTORY.md) - [Commits](https://github.com/jshttp/mime-types/compare/2.1.25...2.1.26) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8dee7f094..066881bf7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4969,17 +4969,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.42.0, "mime-db@>= 1.40.0 < 2": - version "1.42.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac" - integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ== +mime-db@1.43.0, "mime-db@>= 1.40.0 < 2": + version "1.43.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" + integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.25" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437" - integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg== + version "2.1.26" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" + integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== dependencies: - mime-db "1.42.0" + mime-db "1.43.0" mime@1.6.0: version "1.6.0" From 7f9ae297c049d9fa9030da21e8a110651dec6d5a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:46:02 +0000 Subject: [PATCH 199/216] chore(deps): bump aws-partitions from 1.263.0 to 1.266.0 Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.263.0 to 1.266.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1279f1044..f029afcc0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,7 +94,7 @@ GEM authy (2.7.5) httpclient (>= 2.5.3.3) aws-eventstream (1.0.3) - aws-partitions (1.263.0) + aws-partitions (1.266.0) aws-sdk-core (3.88.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) From dd267aeda9b7d464dee2fc8bd561ce028eaa8831 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:46:37 +0000 Subject: [PATCH 200/216] chore(deps): bump pg_search from 2.3.1 to 2.3.2 Bumps [pg_search](https://github.com/Casecommons/pg_search) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/Casecommons/pg_search/releases) - [Changelog](https://github.com/Casecommons/pg_search/blob/master/CHANGELOG.md) - [Commits](https://github.com/Casecommons/pg_search/compare/v2.3.1...v2.3.2) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1279f1044..fce7017a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -187,7 +187,7 @@ GEM hashie (3.6.0) html_tokenizer (0.0.7) httpclient (2.8.3) - i18n (1.8.1) + i18n (1.8.2) concurrent-ruby (~> 1.0) image_processing (1.10.3) mini_magick (>= 4.9.5, < 5) @@ -265,7 +265,7 @@ GEM parser (2.7.0.2) ast (~> 2.4.0) pg (1.2.1) - pg_search (2.3.1) + pg_search (2.3.2) activerecord (>= 5.2) activesupport (>= 5.2) pghero (2.4.1) From 19f3ef792a7bb73528e7660e578d582582e9951b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:47:04 +0000 Subject: [PATCH 201/216] chore(deps): bump ffi from 1.11.3 to 1.12.1 Bumps [ffi](https://github.com/ffi/ffi) from 1.11.3 to 1.12.1. - [Release notes](https://github.com/ffi/ffi/releases) - [Changelog](https://github.com/ffi/ffi/blob/master/CHANGELOG.md) - [Commits](https://github.com/ffi/ffi/compare/1.11.3...1.12.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1279f1044..73ce6feab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -172,7 +172,7 @@ GEM execjs (2.7.0) faraday (0.17.3) multipart-post (>= 1.2, < 3) - ffi (1.11.3) + ffi (1.12.1) fit-commit (3.8.1) swearjar (~> 1.3) font-awesome-rails (4.7.0.5) From 6b1cb4c9819cec09872d0750c3daf643ee6ab0ff Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:47:34 +0000 Subject: [PATCH 202/216] chore(deps-dev): bump webmock from 3.7.6 to 3.8.0 Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.6 to 3.8.0. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.7.6...v3.8.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1279f1044..02800a11a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -439,7 +439,7 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.7.6) + webmock (3.8.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) From 08c967f663a320be76cf0dc81f9a0042549e7ca0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:48:01 +0000 Subject: [PATCH 203/216] chore(deps): bump terser from 4.4.3 to 4.6.3 Bumps [terser](https://github.com/terser/terser) from 4.4.3 to 4.6.3. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/compare/v4.4.3...v4.6.3) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8dee7f094..1add3cfdc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7907,9 +7907,9 @@ terser-webpack-plugin@^2.2.1: webpack-sources "^1.4.3" terser@^4.1.2, terser@^4.4.3: - version "4.4.3" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.3.tgz#401abc52b88869cf904412503b1eb7da093ae2f0" - integrity sha512-0ikKraVtRDKGzHrzkCv5rUNDzqlhmhowOBqC0XqUHFpW+vJ45+20/IFBcebwKfiS2Z9fJin6Eo+F1zLZsxi8RA== + version "4.6.3" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz#e33aa42461ced5238d352d2df2a67f21921f8d87" + integrity sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ== dependencies: commander "^2.20.0" source-map "~0.6.1" From ffc887afe5b0fb9f8f02dc8bde7948c28c78bc2c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:50:31 +0000 Subject: [PATCH 204/216] chore(deps): bump jshint from 2.10.3 to 2.11.0 Bumps [jshint](https://github.com/jshint/jshint) from 2.10.3 to 2.11.0. - [Release notes](https://github.com/jshint/jshint/releases) - [Changelog](https://github.com/jshint/jshint/blob/master/CHANGELOG.md) - [Commits](https://github.com/jshint/jshint/compare/2.10.3...2.11.0) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8dee7f094..d4d8ffa9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4492,9 +4492,9 @@ jsesc@~0.5.0: integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= jshint@^2.9.6: - version "2.10.3" - resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.10.3.tgz#98dc765bf6920b41bc2719f76b8739d6f6e93a9c" - integrity sha512-d8AoXcNNYzmm7cdmulQ3dQApbrPYArtVBO6n4xOICe4QsXGNHCAKDcFORzqP52LhK61KX0VhY39yYzCsNq+bxQ== + version "2.11.0" + resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.11.0.tgz#7f3d99820b8b653eaaec7015a563b2d8101cbbc8" + integrity sha512-ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q== dependencies: cli "~1.0.0" console-browserify "1.1.x" From c26073b06120297ef57eb469f72309ed2af463c3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 00:52:11 +0000 Subject: [PATCH 205/216] chore(deps): bump core-js from 3.6.0 to 3.6.4 Bumps [core-js](https://github.com/zloirock/core-js) from 3.6.0 to 3.6.4. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/compare/v3.6.0...v3.6.4) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8dee7f094..2324a4a4e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2124,9 +2124,9 @@ core-js-compat@^3.6.0: semver "7.0.0" core-js@^3.1.4, core-js@^3.3.4, core-js@^3.4.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.0.tgz#2b854e451de1967d1e29896025cdc13a2518d9ea" - integrity sha512-AHPTNKzyB+YwgDWoSOCaid9PUSEF6781vsfiK8qUz62zRR448/XgK2NtCbpiUGizbep8Lrpt0Du19PpGGZvw3Q== + version "3.6.4" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647" + integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" From 42ff1592cbeefd541171445f705166953004a49c Mon Sep 17 00:00:00 2001 From: isubas Date: Mon, 20 Jan 2020 16:02:21 +0300 Subject: [PATCH 206/216] =?UTF-8?q?SSO=20yap=C4=B1land=C4=B1rmalar=C4=B1?= =?UTF-8?q?=20i=C3=A7in=20mod=C3=BCl=20ekle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/lib/nokul/sso.rb | 17 +++++++++++++++++ config/initializers/zeitwerk.rb | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 app/lib/nokul/sso.rb diff --git a/app/lib/nokul/sso.rb b/app/lib/nokul/sso.rb new file mode 100644 index 000000000..4f539e5d6 --- /dev/null +++ b/app/lib/nokul/sso.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +module Nokul + module SSO + module_function + + def disable? + !enable? + end + + def enable? + ActiveRecord::Type::Boolean.new.cast( + ENV.fetch('NOKUL_SSO_ENABLE', false) + ) + end + end +end diff --git a/config/initializers/zeitwerk.rb b/config/initializers/zeitwerk.rb index 955ff84a2..b1878ade6 100644 --- a/config/initializers/zeitwerk.rb +++ b/config/initializers/zeitwerk.rb @@ -2,6 +2,7 @@ Rails.autoloaders.each do |autoloader| autoloader.inflector.inflect( - 'ldap' => 'LDAP' + 'ldap' => 'LDAP', + 'sso' => 'SSO' ) end From 03367030839b178edd0c6320a7b27b90777ad872 Mon Sep 17 00:00:00 2001 From: isubas Date: Mon, 20 Jan 2020 16:02:46 +0300 Subject: [PATCH 207/216] =?UTF-8?q?SSO=20aktiflik=20durumunu=20yap=C4=B1la?= =?UTF-8?q?nd=C4=B1rmadan=20oku?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account/sessions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/account/sessions_controller.rb b/app/controllers/account/sessions_controller.rb index c0c712e92..747a00cce 100644 --- a/app/controllers/account/sessions_controller.rb +++ b/app/controllers/account/sessions_controller.rb @@ -7,7 +7,7 @@ class SessionsController < Devise::SessionsController # GET /resource/sign_in def new - return super unless ENV.fetch('NOKUL_SSO_ENABLE', false) + return super if Nokul::SSO.disable? redirect_to(user_openid_connect_omniauth_authorize_path) end From b329077f35b7ccfe7a812bb65319eac0419dcbbd Mon Sep 17 00:00:00 2001 From: isubas Date: Mon, 20 Jan 2020 16:03:10 +0300 Subject: [PATCH 208/216] =?UTF-8?q?User=20modelinden=20timeout=20de=C4=9Fe?= =?UTF-8?q?rini=20kald=C4=B1r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/user.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 3c2cc4559..dabca7a29 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -30,7 +30,6 @@ class User < ApplicationRecord devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :lockable, :timeoutable devise :omniauthable, omniauth_providers: %i[openid_connect] - devise :timeoutable, timeout_in: 5.minutes # relations has_one_attached :avatar From 36f3d547f1a42c7f1d4d2ff07287d55bafc14f8b Mon Sep 17 00:00:00 2001 From: isubas Date: Mon, 20 Jan 2020 16:03:42 +0300 Subject: [PATCH 209/216] =?UTF-8?q?Devise=20timeout=20de=C4=9Ferini=20d?= =?UTF-8?q?=C3=BCzenle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/initializers/devise.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index de08fd2e8..7f2b4436f 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -170,7 +170,14 @@ # ==> Configuration for :timeoutable # The time you want to timeout the user session without activity. After this # time the user will be asked for credentials again. Default is 30 minutes. - config.timeout_in = 45.minutes + config.timeout_in = + if Rails.env.development? + 120.minutes + elsif Nokul::SSO.enable? + 5.minutes + else + 45.minutes + end # ==> Configuration for :lockable # Defines which strategy will be used to lock an account. From 03829c4daf518815203afa3c16c5e0285d8144c1 Mon Sep 17 00:00:00 2001 From: isubas Date: Mon, 20 Jan 2020 16:06:31 +0300 Subject: [PATCH 210/216] =?UTF-8?q?Ko=C5=9Ful=20s=C4=B1ras=C4=B1n=C4=B1=20?= =?UTF-8?q?de=C4=9Fi=C5=9Ftir?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/initializers/devise.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 7f2b4436f..e4bf9a4a3 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -171,10 +171,10 @@ # The time you want to timeout the user session without activity. After this # time the user will be asked for credentials again. Default is 30 minutes. config.timeout_in = - if Rails.env.development? - 120.minutes - elsif Nokul::SSO.enable? + if Nokul::SSO.enable? 5.minutes + elsif Rails.env.development? + 120.minutes else 45.minutes end From d02699e58be69decdbfb563ef4bae90bbda8fa1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0rfan=20Suba=C5=9F?= Date: Mon, 20 Jan 2020 18:51:28 +0300 Subject: [PATCH 211/216] Update config/initializers/devise.rb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Recai Oktaş --- config/initializers/devise.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index e4bf9a4a3..53afb1cfc 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -171,7 +171,7 @@ # The time you want to timeout the user session without activity. After this # time the user will be asked for credentials again. Default is 30 minutes. config.timeout_in = - if Nokul::SSO.enable? + if Nokul::SSO.enabled? 5.minutes elsif Rails.env.development? 120.minutes From 9474373237ec4d9bf537b4da35d28a81f14779e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0rfan=20Suba=C5=9F?= Date: Mon, 20 Jan 2020 18:51:38 +0300 Subject: [PATCH 212/216] Update app/lib/nokul/sso.rb Co-Authored-By: M. Serhat Dundar --- app/lib/nokul/sso.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/nokul/sso.rb b/app/lib/nokul/sso.rb index 4f539e5d6..d78f8b88c 100644 --- a/app/lib/nokul/sso.rb +++ b/app/lib/nokul/sso.rb @@ -4,7 +4,7 @@ module Nokul module SSO module_function - def disable? + def disabled? !enable? end From dde76c57fbe43945a3f9e65d020c30fdef60c431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0rfan=20Suba=C5=9F?= Date: Mon, 20 Jan 2020 18:51:51 +0300 Subject: [PATCH 213/216] Update app/lib/nokul/sso.rb Co-Authored-By: M. Serhat Dundar --- app/lib/nokul/sso.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/nokul/sso.rb b/app/lib/nokul/sso.rb index d78f8b88c..68469f8cb 100644 --- a/app/lib/nokul/sso.rb +++ b/app/lib/nokul/sso.rb @@ -8,7 +8,7 @@ def disabled? !enable? end - def enable? + def enabled? ActiveRecord::Type::Boolean.new.cast( ENV.fetch('NOKUL_SSO_ENABLE', false) ) From 1bc768c5a7043f52e8630bdcf832a6b319170f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0rfan=20Suba=C5=9F?= Date: Mon, 20 Jan 2020 18:51:59 +0300 Subject: [PATCH 214/216] Update app/lib/nokul/sso.rb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Recai Oktaş --- app/lib/nokul/sso.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/nokul/sso.rb b/app/lib/nokul/sso.rb index 68469f8cb..326c36295 100644 --- a/app/lib/nokul/sso.rb +++ b/app/lib/nokul/sso.rb @@ -5,7 +5,7 @@ module SSO module_function def disabled? - !enable? + !enabled? end def enabled? From 2f0d2bd96b06d88010a74aafebfcaaec4f5b022f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0rfan=20Suba=C5=9F?= Date: Mon, 20 Jan 2020 18:52:09 +0300 Subject: [PATCH 215/216] Update app/controllers/account/sessions_controller.rb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Recai Oktaş --- app/controllers/account/sessions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/account/sessions_controller.rb b/app/controllers/account/sessions_controller.rb index 747a00cce..0d6751201 100644 --- a/app/controllers/account/sessions_controller.rb +++ b/app/controllers/account/sessions_controller.rb @@ -7,7 +7,7 @@ class SessionsController < Devise::SessionsController # GET /resource/sign_in def new - return super if Nokul::SSO.disable? + return super if Nokul::SSO.disabled? redirect_to(user_openid_connect_omniauth_authorize_path) end From 8eceb2bc99ab056c402d492b3eb787f6b3ae1fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Tekinaslan?= Date: Tue, 21 Jan 2020 14:36:46 +0300 Subject: [PATCH 216/216] Bump app version --- app.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.json b/app.json index ce37deeea..fa5d81237 100644 --- a/app.json +++ b/app.json @@ -1,13 +1,13 @@ { "name": "nokul", "slug": "nokul", - "description": "Nokul, nitelikli okul universiteler icin ogrenci ve personel otomasyonudur.", + "description": "Nitelikli okul (Nokul, /nəʊkuːl/), üniversiteler için öğrenci ve personel otomasyonudur.", "keywords": [ "dokku", "rails" ], "repository": "https://github.com/omu/nokul", - "version": "0.7.3", + "version": "0.7.4", "scripts": { "dokku": { "predeploy": "bin/plugdo bundle install -j4 --path /app/vendor/bundle --without development:test && bundle exec rails assets:precompile && bundle exec rails db:migrate"