From owner-svn-ports-head@freebsd.org Sun Jan 7 02:55:55 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 11017E5FAF1; Sun, 7 Jan 2018 02:55:55 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A93E2703FF; Sun, 7 Jan 2018 02:55:54 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DCEFE1B5AC; Sun, 7 Jan 2018 02:55:53 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w072trok001800; Sun, 7 Jan 2018 02:55:53 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w072trWW001791; Sun, 7 Jan 2018 02:55:53 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201801070255.w072trWW001791@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Sun, 7 Jan 2018 02:55:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458304 - in head/net-im/mastodon: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: in head/net-im/mastodon: . files X-SVN-Commit-Revision: 458304 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Jan 2018 02:55:55 -0000 Author: jrm Date: Sun Jan 7 02:55:52 2018 New Revision: 458304 URL: https://svnweb.freebsd.org/changeset/ports/458304 Log: net-im/mastodon: Upgrade to version 2.1.2 Upstream changes: https://github.com/tootsuite/mastodon/releases/tag/v2.1.2 Modified: head/net-im/mastodon/Makefile (contents, props changed) head/net-im/mastodon/distinfo (contents, props changed) head/net-im/mastodon/files/patch-.env.production.sample (contents, props changed) head/net-im/mastodon/files/patch-Gemfile (contents, props changed) head/net-im/mastodon/files/patch-config_puma.rb (contents, props changed) head/net-im/mastodon/files/patch-config_sidekiq.yml (contents, props changed) head/net-im/mastodon/files/yarn.lock.in head/net-im/mastodon/pkg-plist (contents, props changed) Modified: head/net-im/mastodon/Makefile ============================================================================== --- head/net-im/mastodon/Makefile Sun Jan 7 01:37:32 2018 (r458303) +++ head/net-im/mastodon/Makefile Sun Jan 7 02:55:52 2018 (r458304) @@ -2,8 +2,7 @@ PORTNAME= mastodon DISTVERSIONPREFIX= v -DISTVERSION= 2.1.0 -PORTREVISION= 4 +DISTVERSION= 2.1.2 CATEGORIES= net-im www MAINTAINER= jrm@FreeBSD.org @@ -39,7 +38,7 @@ BR_DEPENDS= ffmpeg>0:multimedia/ffmpeg \ rubygem-charlock_holmes>=0.7.5:textproc/rubygem-charlock_holmes \ rubygem-iso-639>=0.2.8:textproc/rubygem-iso-639 \ rubygem-cld3>=3.2.0:textproc/rubygem-cld3 \ - rubygem-devise-rails5>=4.2:devel/rubygem-devise-rails5 \ + rubygem-devise-rails5>=4.3:devel/rubygem-devise-rails5 \ rubygem-devise-two-factor-rails5>=3.0:security/rubygem-devise-two-factor-rails5 \ rubygem-doorkeeper-rails5>=4.2:security/rubygem-doorkeeper-rails5 \ rubygem-fast_blank>=1.0:devel/rubygem-fast_blank \ @@ -69,6 +68,7 @@ BR_DEPENDS= ffmpeg>0:multimedia/ffmpeg \ rubygem-mario-redis-lock>=1.2:databases/rubygem-mario-redis-lock \ rubygem-rqrcode>=0.10:www/rubygem-rqrcode \ rubygem-ruby-oembed>=0.12:www/rubygem-ruby-oembed \ + rubygem-progressbar>=1.4:devel/rubygem-progressbar \ rubygem-sanitize>=4.4:textproc/rubygem-sanitize \ rubygem-sidekiq>=5.0:devel/rubygem-sidekiq \ rubygem-sidekiq-scheduler>=2.1:devel/rubygem-sidekiq-scheduler \ @@ -91,7 +91,7 @@ USES= gmake gnome pgsql python:build,2 shebangfix USE_GITHUB= yes GH_ACCOUNT= tootsuite jehops:mn GH_PROJECT= mastodon_node:mn -GH_TAGNAME= 2.1.0:mn +GH_TAGNAME= 2.1.2:mn USE_GNOME= libxml2 libxslt USE_RC_SUBR= mastodon_stream mastodon_web mastodon_workers USE_RUBY= yes @@ -137,8 +137,8 @@ do-install: ${WRKSRC}/node_modules/.bin/node-sass \ ${WRKSRC}/node_modules/uws/build_log.txt ${STRIP_CMD} ${WRKSRC}/node_modules/uws/uws_freebsd_${NODE_ABI}.node - ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${WWWDIR}/tmp \ - ${STAGEDIR}/var/log/mastodon + ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}/var/run/${PORTNAME} \ + ${STAGEDIR}/var/log/${PORTNAME} ${INSTALL_DATA} ${WRKDIR}/nginx.conf \ ${STAGEDIR}${WWWDIR}/nginx.conf.sample ${INSTALL_DATA} ${WRKDIR}/nginx-include.conf \ Modified: head/net-im/mastodon/distinfo ============================================================================== --- head/net-im/mastodon/distinfo Sun Jan 7 01:37:32 2018 (r458303) +++ head/net-im/mastodon/distinfo Sun Jan 7 02:55:52 2018 (r458304) @@ -1,5 +1,5 @@ -TIMESTAMP = 1513484543 -SHA256 (tootsuite-mastodon-v2.1.0_GH0.tar.gz) = 2d4f63545873de469e636c8e1d4b10a65e621f5cfc59fe377d83f32289530dc4 -SIZE (tootsuite-mastodon-v2.1.0_GH0.tar.gz) = 12357025 -SHA256 (jehops-mastodon_node-2.1.0_GH0.tar.gz) = 8997bd7adc3499f66bf49bbd848a622d0411eaaf373cd0c2b92120532a2bfd6f -SIZE (jehops-mastodon_node-2.1.0_GH0.tar.gz) = 28361650 +TIMESTAMP = 1515286436 +SHA256 (tootsuite-mastodon-v2.1.2_GH0.tar.gz) = 38b00da5aada8f39888c62c665a9cd75b7ae7033b4c244f89a2380d8dfb9a0f8 +SIZE (tootsuite-mastodon-v2.1.2_GH0.tar.gz) = 12426068 +SHA256 (jehops-mastodon_node-2.1.2_GH0.tar.gz) = c6c2c09dd2be4db1d313c6230844ed7ea4cbea8963a03e6bac87a69e11019c8a +SIZE (jehops-mastodon_node-2.1.2_GH0.tar.gz) = 27194814 Modified: head/net-im/mastodon/files/patch-.env.production.sample ============================================================================== --- head/net-im/mastodon/files/patch-.env.production.sample Sun Jan 7 01:37:32 2018 (r458303) +++ head/net-im/mastodon/files/patch-.env.production.sample Sun Jan 7 02:55:52 2018 (r458304) @@ -1,8 +1,8 @@ ---- .env.production.sample.orig 2017-10-18 18:36:47 UTC +--- .env.production.sample.orig 2018-01-06 19:32:29 UTC +++ .env.production.sample @@ -1,19 +1,33 @@ +# The following entries can be set in /etc/rc.conf. The entries in /etc/rc.conf will take priority over values set here. -+# ++# +# mastodon_db_name=mastodon_production +# mastodon_db_host=localhost +# mastodon_db_user=mastodon @@ -35,14 +35,14 @@ +# DB_PORT=5432 # Federation - # Note: Changing LOCAL_DOMAIN or LOCAL_HTTPS at a later time will cause unwanted side effects. + # Note: Changing LOCAL_DOMAIN at a later time will cause unwanted side effects, including breaking all existing federation. # LOCAL_DOMAIN should *NOT* contain the protocol part of the domain e.g https://example.com. -LOCAL_DOMAIN=example.com -+# LOCAL_DOMAIN=mastodon.example.com - LOCAL_HTTPS=true ++LOCAL_DOMAIN=mastodon.example.com - # Use this only if you need to run mastodon on a different domain than the one used for federation. -@@ -26,8 +40,7 @@ LOCAL_HTTPS=true + # Changing LOCAL_HTTPS in production is no longer supported. (Mastodon will always serve https:// links) + +@@ -27,8 +41,7 @@ LOCAL_DOMAIN=example.com # be added. Comma separated values # ALTERNATE_DOMAINS=example1.com,example2.com @@ -52,7 +52,7 @@ PAPERCLIP_SECRET= SECRET_KEY_BASE= OTP_SECRET= -@@ -37,7 +50,7 @@ OTP_SECRET= +@@ -38,7 +51,7 @@ OTP_SECRET= # You should only generate this once per instance. If you later decide to change it, all push subscription will # be invalidated, requiring the users to access the website again to resubscribe. # @@ -61,7 +61,7 @@ # # For more information visit https://rossta.net/blog/using-the-web-push-api-with-vapid.html VAPID_PRIVATE_KEY= -@@ -59,18 +72,18 @@ VAPID_PUBLIC_KEY= +@@ -60,18 +73,18 @@ VAPID_PUBLIC_KEY= # If you want to use an SMTP server without authentication (e.g local Postfix relay) # then set SMTP_AUTH_METHOD and SMTP_OPENSSL_VERIFY_MODE to 'none' and # *comment* SMTP_LOGIN and SMTP_PASSWORD (leaving them blank is not enough). @@ -81,12 +81,12 @@ +# SMTP_PORT=587 +# SMTP_LOGIN= +# SMTP_PASSWORD= -+# SMTP_FROM_ADDRESS=mastodon@example.com ++# SMTP_FROM_ADDRESS=notifications@example.com +# SMTP_DOMAIN= # defaults to LOCAL_DOMAIN +# SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail -+SMTP_AUTH_METHOD=none ++# SMTP_AUTH_METHOD=plain +# SMTP_CA_FILE=/etc/ssl/certs/ca-certificates.crt -+SMTP_OPENSSL_VERIFY_MODE=none ++# SMTP_OPENSSL_VERIFY_MODE=peer +# SMTP_ENABLE_STARTTLS_AUTO=true +# SMTP_TLS=true Modified: head/net-im/mastodon/files/patch-Gemfile ============================================================================== --- head/net-im/mastodon/files/patch-Gemfile Sun Jan 7 01:37:32 2018 (r458303) +++ head/net-im/mastodon/files/patch-Gemfile Sun Jan 7 02:55:52 2018 (r458304) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2017-12-15 18:14:57 UTC +--- Gemfile.orig 2018-01-05 22:04:35 UTC +++ Gemfile @@ -11,11 +11,11 @@ gem 'uglifier', '~> 3.2' @@ -31,7 +31,7 @@ gem 'idn-ruby', require: 'idn' gem 'kaminari', '~> 1.1' gem 'link_header', '~> 0.0' -@@ -54,7 +53,7 @@ gem 'rack-cors', '~> 0.4', require: 'rac +@@ -54,11 +53,11 @@ gem 'rack-cors', '~> 0.4', require: 'rac gem 'rack-timeout', '~> 0.4' gem 'rails-i18n', '~> 5.0' gem 'rails-settings-cached', '~> 0.6' @@ -40,7 +40,12 @@ gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock' gem 'rqrcode', '~> 0.10' gem 'ruby-oembed', '~> 0.12', require: 'oembed' -@@ -75,45 +74,6 @@ gem 'webpush' +-gem 'ruby-progressbar', '~> 1.4' ++gem 'progressbar', '~> 1.4' + gem 'sanitize', '~> 4.4' + gem 'sidekiq', '~> 5.0' + gem 'sidekiq-scheduler', '~> 2.1' +@@ -76,45 +75,6 @@ gem 'webpush' gem 'json-ld-preloaded', '~> 2.2.1' gem 'rdf-normalize', '~> 0.3.1' Modified: head/net-im/mastodon/files/patch-config_puma.rb ============================================================================== --- head/net-im/mastodon/files/patch-config_puma.rb Sun Jan 7 01:37:32 2018 (r458303) +++ head/net-im/mastodon/files/patch-config_puma.rb Sun Jan 7 02:55:52 2018 (r458304) @@ -4,7 +4,7 @@ threads_count = ENV.fetch('MAX_THREADS') { 5 }.to_i threads threads_count, threads_count -+pidfile 'tmp/mastodon_web.pid' ++pidfile '/var/run/mastodon/mastodon_web.pid' + if ENV['SOCKET'] then bind 'unix://' + ENV['SOCKET'] Modified: head/net-im/mastodon/files/patch-config_sidekiq.yml ============================================================================== --- head/net-im/mastodon/files/patch-config_sidekiq.yml Sun Jan 7 01:37:32 2018 (r458303) +++ head/net-im/mastodon/files/patch-config_sidekiq.yml Sun Jan 7 02:55:52 2018 (r458304) @@ -4,4 +4,4 @@ ip_cleanup_scheduler: cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *' class: Scheduler::IpCleanupScheduler -+:pidfile: tmp/mastodon_workers.pid ++:pidfile: /var/run/mastodon/mastodon_workers.pid Modified: head/net-im/mastodon/files/yarn.lock.in ============================================================================== --- head/net-im/mastodon/files/yarn.lock.in Sun Jan 7 01:37:32 2018 (r458303) +++ head/net-im/mastodon/files/yarn.lock.in Sun Jan 7 02:55:52 2018 (r458304) @@ -77,8 +77,8 @@ acorn@^4.0.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" acorn@^5.0.0, acorn@^5.1.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7" + version "5.3.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822" adjust-sourcemap-loader@^1.1.0: version "1.1.0" @@ -255,12 +255,6 @@ async-limiter@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" -async@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7" - dependencies: - lodash "^4.14.0" - async@^2.1.2, async@^2.1.5, async@^2.4.1: version "2.6.0" resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" @@ -287,14 +281,14 @@ autoprefixer@^6.3.1: postcss-value-parser "^3.2.3" autoprefixer@^7.1.6: - version "7.2.3" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.3.tgz#c2841e38b7940c2d0a9bbffd72c75f33637854f8" + version "7.2.4" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.4.tgz#29b367c03876a29bfd3721260d945e3545666c8d" dependencies: - browserslist "^2.10.0" - caniuse-lite "^1.0.30000783" + browserslist "^2.10.2" + caniuse-lite "^1.0.30000784" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^6.0.14" + postcss "^6.0.15" postcss-value-parser "^3.2.3" aws-sign2@~0.6.0: @@ -316,7 +310,7 @@ axios@~0.16.2: follow-redirects "^1.2.3" is-buffer "^1.1.5" -babel-code-frame@^6.11.0, babel-code-frame@^6.26.0: +babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" dependencies: @@ -349,13 +343,15 @@ babel-core@^6.25.0, babel-core@^6.26.0: source-map "^0.5.6" babel-eslint@^8.0.1: - version "8.0.3" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.3.tgz#f29ecf02336be438195325cd47c468da81ee4e98" + version "8.1.2" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.1.2.tgz#a39230b0c20ecbaa19a35d5633bf9b9ca2c8116f" dependencies: "@babel/code-frame" "7.0.0-beta.31" "@babel/traverse" "7.0.0-beta.31" "@babel/types" "7.0.0-beta.31" babylon "7.0.0-beta.31" + eslint-scope "~3.7.1" + eslint-visitor-keys "^1.0.0" babel-generator@^6.26.0: version "6.26.0" @@ -494,12 +490,6 @@ babel-loader@^7.1.1: loader-utils "^1.0.2" mkdirp "^0.5.1" -babel-macros@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/babel-macros/-/babel-macros-1.2.0.tgz#39e47ed6d286d4a98f1948d8bab45dac17e4e2d4" - dependencies: - cosmiconfig "3.1.0" - babel-messages@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" @@ -522,11 +512,17 @@ babel-plugin-lodash@^3.3.2: lodash "^4.17.4" require-package-name "^2.0.1" +babel-plugin-macros@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.0.0.tgz#fd3aee135f7dec0b82898b7c8f1aed6fa75f9af9" + dependencies: + cosmiconfig "3.1.0" + babel-plugin-preval@^1.6.1: - version "1.6.2" - resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-1.6.2.tgz#8f580a1d4579d5fc79f1cfaee6f9fe0996fdeb1f" + version "1.6.3" + resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-1.6.3.tgz#df784357410a9762f01bf0c5705e2c070eac3ccb" dependencies: - babel-macros "^1.1.1" + babel-plugin-macros "^2.0.0" babel-register "^6.26.0" babylon "^6.18.0" require-from-string "^2.0.1" @@ -825,8 +821,8 @@ babel-plugin-transform-react-jsx@^6.24.1: babel-runtime "^6.22.0" babel-plugin-transform-react-remove-prop-types@^0.4.10: - version "0.4.10" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.10.tgz#3c7f3a03ad8aa6bb8c00e93fd13a433910444545" + version "0.4.12" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.12.tgz#a382c27c42d6580748c80caf8c3d5091edbb60b8" babel-plugin-transform-regenerator@^6.22.0: version "6.26.0" @@ -989,12 +985,6 @@ base64-js@^1.0.2: version "1.2.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886" -bcrypt-pbkdf@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" - dependencies: - tweetnacl "^0.14.3" - big.js@^3.1.3: version "3.2.0" resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" @@ -1128,12 +1118,12 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" -browserslist@^2.1.2, browserslist@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.10.0.tgz#bac5ee1cc69ca9d96403ffb8a3abdc5b6aed6346" +browserslist@^2.1.2, browserslist@^2.10.2: + version "2.11.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.0.tgz#50350d6873a82ebe0f3ae5483658c571ae5f9d7d" dependencies: - caniuse-lite "^1.0.30000780" - electron-to-chromium "^1.3.28" + caniuse-lite "^1.0.30000784" + electron-to-chromium "^1.3.30" buffer-writer@1.0.1: version "1.0.1" @@ -1218,12 +1208,12 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000783" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000783.tgz#16b30d47266a4f515cc69ae0316b670c9603cdbe" + version "1.0.30000787" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000787.tgz#ca07a281be536a88bd7fac96ba895f3cf53f811b" -caniuse-lite@^1.0.30000780, caniuse-lite@^1.0.30000783: - version "1.0.30000783" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000783.tgz#9b5499fb1b503d2345d12aa6b8612852f4276ffd" +caniuse-lite@^1.0.30000784: + version "1.0.30000787" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000787.tgz#a76c4fa1d6ac00640447ec83c1e7c6b33dd615c5" caseless@~0.11.0: version "0.11.0" @@ -1390,10 +1380,10 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" compression-webpack-plugin@^1.0.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-1.1.2.tgz#ae80491e3138db7ec168af91a800312594a18943" + version "1.1.3" + resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-1.1.3.tgz#4b936c627eda09304e3153499ece7830289ab95a" dependencies: - async "2.4.1" + async "^2.4.1" cacache "^10.0.1" find-cache-dir "^1.0.0" serialize-javascript "^1.4.0" @@ -1529,8 +1519,8 @@ create-react-class@^15.5.2: object-assign "^4.1.1" cross-env@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.1.tgz#b6d8ab97f304c0f71dae7277b75fe424c08dfa74" + version "5.1.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.3.tgz#f8ae18faac87692b0a8b4d2f7000d4ec3a85dfd7" dependencies: cross-spawn "^5.1.0" is-windows "^1.0.0" @@ -1618,21 +1608,21 @@ css-list-helpers@^1.0.1: tcomb "^2.5.0" css-loader@^0.28.4: - version "0.28.7" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b" + version "0.28.8" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.8.tgz#ff36381464dea18fe60f2601a060ba6445886bd5" dependencies: - babel-code-frame "^6.11.0" + babel-code-frame "^6.26.0" css-selector-tokenizer "^0.7.0" - cssnano ">=2.6.1 <4" + cssnano "^3.10.0" icss-utils "^2.1.0" loader-utils "^1.0.2" lodash.camelcase "^4.3.0" - object-assign "^4.0.1" + object-assign "^4.1.1" postcss "^5.0.6" - postcss-modules-extract-imports "^1.0.0" - postcss-modules-local-by-default "^1.0.1" - postcss-modules-scope "^1.0.0" - postcss-modules-values "^1.1.0" + postcss-modules-extract-imports "^1.1.0" + postcss-modules-local-by-default "^1.2.0" + postcss-modules-scope "^1.1.0" + postcss-modules-values "^1.3.0" postcss-value-parser "^3.3.0" source-list-map "^2.0.0" @@ -1661,7 +1651,7 @@ cssesc@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" -"cssnano@>=2.6.1 <4": +cssnano@^3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38" dependencies: @@ -1808,8 +1798,8 @@ diffie-hellman@^5.0.0: randombytes "^2.0.0" dom-helpers@^3.2.0, dom-helpers@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a" + version "3.3.1" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6" domain-browser@^1.1.1: version "1.1.7" @@ -1836,12 +1826,6 @@ duplexify@^3.1.2, duplexify@^3.4.2: readable-stream "^2.0.0" stream-shift "^1.0.0" -ecc-jsbn@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" - dependencies: - jsbn "~0.1.0" - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -1850,10 +1834,16 @@ ejs@^2.3.4, ejs@^2.5.6: version "2.5.7" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a" -electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.28: - version "1.3.28" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.28.tgz#8dd4e6458086644e9f9f0a1cf32e2a1f9dffd9ee" +electron-releases@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e" +electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30: + version "1.3.30" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80" + dependencies: + electron-releases "^2.1.0" + elliptic@^6.0.0: version "6.4.0" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" @@ -1998,6 +1988,17 @@ escope@^3.6.0: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-scope@~3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" + dependencies: + esrecurse "^4.1.0" + estraverse "^4.1.1" + +eslint-visitor-keys@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" + esprima@^2.6.0: version "2.7.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" @@ -2222,8 +2223,8 @@ flush-write-stream@^1.0.0: readable-stream "^2.0.4" follow-redirects@^1.2.3: - version "1.2.6" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.6.tgz#4dcdc7e4ab3dd6765a97ff89c3b4c258117c79bf" + version "1.3.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.3.0.tgz#f684871fc116d2e329fda55ef67687f4fabc905c" dependencies: debug "^3.1.0" @@ -2822,8 +2823,8 @@ is-glob@^2.0.0, is-glob@^2.0.1: is-extglob "^1.0.0" is-my-json-valid@^2.12.4: - version "2.16.1" - resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11" + version "2.17.1" + resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471" dependencies: generate-function "^2.0.0" generate-object-property "^1.1.0" @@ -2961,10 +2962,6 @@ js-yaml@~3.7.0: argparse "^1.0.7" esprima "^2.6.0" -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - jsesc@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" @@ -3623,8 +3620,8 @@ object.omit@^2.0.0: is-extendable "^0.1.1" offline-plugin@^4.8.3: - version "4.8.5" - resolved "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-4.8.5.tgz#151c8cd67b263c1fd76e940b71e962fb02f26cb5" + version "4.9.0" + resolved "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-4.9.0.tgz#0874960c0cb0c249f96b7cfc674217934660ed5c" dependencies: deep-extend "^0.4.0" ejs "^2.3.4" @@ -3686,8 +3683,10 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" p-limit@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc" + version "1.2.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c" + dependencies: + p-try "^1.0.0" p-locate@^2.0.0: version "2.0.0" @@ -3695,6 +3694,10 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" +p-try@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + packet-reader@0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27" @@ -4049,8 +4052,8 @@ postcss-load-plugins@^2.3.0: object-assign "^4.1.0" postcss-loader@^2.0.9: - version "2.0.9" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.9.tgz#001fdf7bfeeb159405ee61d1bb8e59b528dbd309" + version "2.0.10" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.10.tgz#090db0540140bd56a7a7f717c41bc29aeef4c674" dependencies: loader-utils "^1.1.0" postcss "^6.0.0" @@ -4134,27 +4137,27 @@ postcss-mixins@^6.0.1: postcss-simple-vars "^4.1.0" sugarss "^1.0.0" -postcss-modules-extract-imports@^1.0.0: +postcss-modules-extract-imports@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb" dependencies: postcss "^6.0.1" -postcss-modules-local-by-default@^1.0.1: +postcss-modules-local-by-default@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" dependencies: css-selector-tokenizer "^0.7.0" postcss "^6.0.1" -postcss-modules-scope@^1.0.0: +postcss-modules-scope@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" dependencies: css-selector-tokenizer "^0.7.0" postcss "^6.0.1" -postcss-modules-values@^1.1.0: +postcss-modules-values@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" dependencies: @@ -4248,10 +4251,10 @@ postcss-sass@^0.2.0: postcss "^6.0.6" postcss-scss@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-1.0.2.tgz#ff45cf3354b879ee89a4eb68680f46ac9bb14f94" + version "1.0.3" + resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-1.0.3.tgz#4c00ab440fc1c994134e3d4e600c23341af6cd27" dependencies: - postcss "^6.0.3" + postcss "^6.0.15" postcss-selector-matches@^3.0.0, postcss-selector-matches@^3.0.1: version "3.0.1" @@ -4335,13 +4338,13 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, pos source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.9: - version "6.0.14" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.14.tgz#5534c72114739e75d0afcf017db853099f562885" +postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.15, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.9: + version "6.0.16" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146" dependencies: chalk "^2.3.0" source-map "^0.6.1" - supports-color "^4.4.0" + supports-color "^5.1.0" postgres-array@~1.0.0: version "1.0.2" @@ -4585,8 +4588,8 @@ react-dom@^16.2.0: prop-types "^15.6.0" react-event-listener@^0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.5.2.tgz#8fe116f8930a4c7fe363c631f56963d7e4ed3d66" + version "0.5.3" + resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.5.3.tgz#a8b492596ad601865314fcc2c18cb87b6ce3876e" dependencies: babel-runtime "^6.26.0" fbjs "^0.8.16" @@ -5491,12 +5494,18 @@ supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -supports-color@^4.0.0, supports-color@^4.2.1, supports-color@^4.4.0: +supports-color@^4.0.0, supports-color@^4.2.1: version "4.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" dependencies: has-flag "^2.0.0" +supports-color@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5" + dependencies: + has-flag "^2.0.0" + svgo@^0.7.0: version "0.7.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" @@ -5615,10 +5624,6 @@ tunnel-agent@~0.4.1: version "0.4.3" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - type-is@~1.6.15: version "1.6.15" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410" @@ -5641,10 +5646,6 @@ uglify-js@^2.8.29: source-map "~0.5.1" yargs "~3.10.0" -uglify-to-browserify@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" - uglifyjs-webpack-plugin@^0.4.6: version "0.4.6" resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309" @@ -5692,8 +5693,8 @@ unpipe@1.0.0, unpipe@~1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" unquote@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.0.tgz#98e1fc608b6b854c75afb1b95afc099ba69d942f" + version "1.1.1" + resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" urix@^0.1.0, urix@~0.1.0: version "0.1.0" @@ -5894,8 +5895,8 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" ws@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.2.tgz#96c1d08b3fefda1d5c1e33700d3bfaa9be2d5608" + version "3.3.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" dependencies: async-limiter "~1.0.0" safe-buffer "~5.1.0" Modified: head/net-im/mastodon/pkg-plist ============================================================================== --- head/net-im/mastodon/pkg-plist Sun Jan 7 01:37:32 2018 (r458303) +++ head/net-im/mastodon/pkg-plist Sun Jan 7 02:55:52 2018 (r458304) @@ -9,6 +9,7 @@ @dir %%WWWDIR%%/app/controllers/api/v1 @dir %%WWWDIR%%/app/controllers/api/v1/accounts @dir %%WWWDIR%%/app/controllers/api/v1/apps +@dir %%WWWDIR%%/app/controllers/api/v1/instances @dir %%WWWDIR%%/app/controllers/api/v1/lists @dir %%WWWDIR%%/app/controllers/api/v1/statuses @dir %%WWWDIR%%/app/controllers/api/v1/timelines @@ -30,6 +31,7 @@ @dir %%WWWDIR%%/app/javascript/images @dir %%WWWDIR%%/app/javascript/mastodon @dir %%WWWDIR%%/app/javascript/mastodon/actions +@dir %%WWWDIR%%/app/javascript/mastodon/actions/push_notifications @dir %%WWWDIR%%/app/javascript/mastodon/components @dir %%WWWDIR%%/app/javascript/mastodon/components/__tests__ @dir %%WWWDIR%%/app/javascript/mastodon/components/__tests__/__snapshots__ @@ -356,7 +358,8 @@ @dir %%WWWDIR%%/node_modules/babel-core/lib/transformation/file/options @dir %%WWWDIR%%/node_modules/babel-core/lib/transformation/internal-plugins @dir %%WWWDIR%%/node_modules/babel-eslint -@dir %%WWWDIR%%/node_modules/babel-eslint/babylon-to-espree +@dir %%WWWDIR%%/node_modules/babel-eslint/lib +@dir %%WWWDIR%%/node_modules/babel-eslint/lib/babylon-to-espree @dir %%WWWDIR%%/node_modules/babel-generator @dir %%WWWDIR%%/node_modules/babel-generator/lib @dir %%WWWDIR%%/node_modules/babel-generator/lib/generators @@ -392,14 +395,14 @@ @dir %%WWWDIR%%/node_modules/babel-loader @dir %%WWWDIR%%/node_modules/babel-loader/lib @dir %%WWWDIR%%/node_modules/babel-loader/lib/utils -@dir %%WWWDIR%%/node_modules/babel-macros -@dir %%WWWDIR%%/node_modules/babel-macros/dist @dir %%WWWDIR%%/node_modules/babel-messages @dir %%WWWDIR%%/node_modules/babel-messages/lib @dir %%WWWDIR%%/node_modules/babel-plugin-check-es2015-constants @dir %%WWWDIR%%/node_modules/babel-plugin-check-es2015-constants/lib @dir %%WWWDIR%%/node_modules/babel-plugin-lodash @dir %%WWWDIR%%/node_modules/babel-plugin-lodash/lib +@dir %%WWWDIR%%/node_modules/babel-plugin-macros +@dir %%WWWDIR%%/node_modules/babel-plugin-macros/dist @dir %%WWWDIR%%/node_modules/babel-plugin-preval @dir %%WWWDIR%%/node_modules/babel-plugin-preval/dist @dir %%WWWDIR%%/node_modules/babel-plugin-react-intl @@ -750,6 +753,7 @@ @dir %%WWWDIR%%/node_modules/css-list-helpers @dir %%WWWDIR%%/node_modules/css-loader @dir %%WWWDIR%%/node_modules/css-loader/lib +@dir %%WWWDIR%%/node_modules/css-loader/lib/url @dir %%WWWDIR%%/node_modules/css-selector-tokenizer @dir %%WWWDIR%%/node_modules/css-selector-tokenizer/lib @dir %%WWWDIR%%/node_modules/css-system-font-keywords @@ -822,6 +826,8 @@ @dir %%WWWDIR%%/node_modules/ee-first @dir %%WWWDIR%%/node_modules/ejs @dir %%WWWDIR%%/node_modules/ejs/lib +@dir %%WWWDIR%%/node_modules/electron-releases +@dir %%WWWDIR%%/node_modules/electron-releases/script @dir %%WWWDIR%%/node_modules/electron-to-chromium @dir %%WWWDIR%%/node_modules/elliptic @dir %%WWWDIR%%/node_modules/elliptic/lib @@ -937,6 +943,10 @@ @dir %%WWWDIR%%/node_modules/escope/lib @dir %%WWWDIR%%/node_modules/escope/src @dir %%WWWDIR%%/node_modules/escope/third_party +@dir %%WWWDIR%%/node_modules/eslint-scope +@dir %%WWWDIR%%/node_modules/eslint-scope/lib +@dir %%WWWDIR%%/node_modules/eslint-visitor-keys +@dir %%WWWDIR%%/node_modules/eslint-visitor-keys/lib @dir %%WWWDIR%%/node_modules/esprima @dir %%WWWDIR%%/node_modules/esprima/bin @dir %%WWWDIR%%/node_modules/esprima/dist @@ -1343,6 +1353,7 @@ @dir %%WWWDIR%%/node_modules/p-finally @dir %%WWWDIR%%/node_modules/p-limit @dir %%WWWDIR%%/node_modules/p-locate +@dir %%WWWDIR%%/node_modules/p-try @dir %%WWWDIR%%/node_modules/packet-reader @dir %%WWWDIR%%/node_modules/pako @dir %%WWWDIR%%/node_modules/pako/dist @@ -1908,6 +1919,7 @@ @dir %%WWWDIR%%/node_modules/yargs/lib @dir %%WWWDIR%%/node_modules/yargs/locales @dir %%WWWDIR%%/public +@dir %%WWWDIR%%/public/assets @dir %%WWWDIR%%/public/avatars @dir %%WWWDIR%%/public/avatars/original @dir %%WWWDIR%%/public/emoji @@ -1984,12 +1996,12 @@ @dir %%WWWDIR%%/spec/workers/pubsubhubbub @dir %%WWWDIR%%/spec/workers/scheduler @dir %%WWWDIR%%/streaming -@dir %%WWWDIR%%/tmp @dir %%WWWDIR%%/vendor @dir %%WWWDIR%%/vendor/assets @dir %%WWWDIR%%/vendor/assets/javascripts @dir %%WWWDIR%%/vendor/assets/stylesheets @dir /var/log/mastodon +@dir /var/run/mastodon @sample %%WWWDIR%%/.env.production.sample @sample %%WWWDIR%%/nginx-include.conf.sample @sample %%WWWDIR%%/nginx.conf.sample @@ -2001,6 +2013,7 @@ %%WWWDIR%%/app/controllers/account_follow_controller.rb %%WWWDIR%%/app/controllers/account_unfollow_controller.rb %%WWWDIR%%/app/controllers/accounts_controller.rb +%%WWWDIR%%/app/controllers/activitypub/follows_controller.rb %%WWWDIR%%/app/controllers/activitypub/inboxes_controller.rb %%WWWDIR%%/app/controllers/activitypub/outboxes_controller.rb %%WWWDIR%%/app/controllers/admin/account_moderation_notes_controller.rb @@ -2044,6 +2057,8 @@ %%WWWDIR%%/app/controllers/api/v1/favourites_controller.rb %%WWWDIR%%/app/controllers/api/v1/follow_requests_controller.rb %%WWWDIR%%/app/controllers/api/v1/follows_controller.rb +%%WWWDIR%%/app/controllers/api/v1/instances/activity_controller.rb +%%WWWDIR%%/app/controllers/api/v1/instances/peers_controller.rb %%WWWDIR%%/app/controllers/api/v1/instances_controller.rb %%WWWDIR%%/app/controllers/api/v1/lists/accounts_controller.rb %%WWWDIR%%/app/controllers/api/v1/lists_controller.rb @@ -2157,10 +2172,13 @@ %%WWWDIR%%/app/javascript/images/logo.svg %%WWWDIR%%/app/javascript/images/logo_alt.svg %%WWWDIR%%/app/javascript/images/logo_full.svg -%%WWWDIR%%/app/javascript/images/mastodon-getting-started.png %%WWWDIR%%/app/javascript/images/mastodon-not-found.png +%%WWWDIR%%/app/javascript/images/mastodon-ui.png %%WWWDIR%%/app/javascript/images/preview.jpg %%WWWDIR%%/app/javascript/images/void.png +%%WWWDIR%%/app/javascript/images/wave-compose-standalone.png +%%WWWDIR%%/app/javascript/images/wave-drawer.png +%%WWWDIR%%/app/javascript/images/wave-modal.png %%WWWDIR%%/app/javascript/mastodon/.gitkeep %%WWWDIR%%/app/javascript/mastodon/actions/accounts.js %%WWWDIR%%/app/javascript/mastodon/actions/alerts.js @@ -2180,7 +2198,9 @@ %%WWWDIR%%/app/javascript/mastodon/actions/notifications.js %%WWWDIR%%/app/javascript/mastodon/actions/onboarding.js %%WWWDIR%%/app/javascript/mastodon/actions/pin_statuses.js -%%WWWDIR%%/app/javascript/mastodon/actions/push_notifications.js +%%WWWDIR%%/app/javascript/mastodon/actions/push_notifications/index.js +%%WWWDIR%%/app/javascript/mastodon/actions/push_notifications/registerer.js +%%WWWDIR%%/app/javascript/mastodon/actions/push_notifications/setter.js %%WWWDIR%%/app/javascript/mastodon/actions/reports.js %%WWWDIR%%/app/javascript/mastodon/actions/search.js %%WWWDIR%%/app/javascript/mastodon/actions/settings.js @@ -2412,6 +2432,9 @@ %%WWWDIR%%/app/javascript/mastodon/locales/pt-BR.json %%WWWDIR%%/app/javascript/mastodon/locales/pt.json %%WWWDIR%%/app/javascript/mastodon/locales/ru.json +%%WWWDIR%%/app/javascript/mastodon/locales/sk.json +%%WWWDIR%%/app/javascript/mastodon/locales/sr-Latn.json +%%WWWDIR%%/app/javascript/mastodon/locales/sr.json %%WWWDIR%%/app/javascript/mastodon/locales/sv.json %%WWWDIR%%/app/javascript/mastodon/locales/th.json %%WWWDIR%%/app/javascript/mastodon/locales/tr.json @@ -2442,6 +2465,9 @@ %%WWWDIR%%/app/javascript/mastodon/locales/whitelist_pt-BR.json %%WWWDIR%%/app/javascript/mastodon/locales/whitelist_pt.json %%WWWDIR%%/app/javascript/mastodon/locales/whitelist_ru.json +%%WWWDIR%%/app/javascript/mastodon/locales/whitelist_sk.json +%%WWWDIR%%/app/javascript/mastodon/locales/whitelist_sr-Latn.json +%%WWWDIR%%/app/javascript/mastodon/locales/whitelist_sr.json %%WWWDIR%%/app/javascript/mastodon/locales/whitelist_sv.json %%WWWDIR%%/app/javascript/mastodon/locales/whitelist_th.json %%WWWDIR%%/app/javascript/mastodon/locales/whitelist_tr.json @@ -2493,7 +2519,6 @@ %%WWWDIR%%/app/javascript/mastodon/stream.js %%WWWDIR%%/app/javascript/mastodon/test_setup.js %%WWWDIR%%/app/javascript/mastodon/uuid.js -%%WWWDIR%%/app/javascript/mastodon/web_push_subscription.js %%WWWDIR%%/app/javascript/packs/about.js %%WWWDIR%%/app/javascript/packs/admin.js %%WWWDIR%%/app/javascript/packs/application.js @@ -2518,11 +2543,13 @@ %%WWWDIR%%/app/javascript/styles/mastodon/forms.scss %%WWWDIR%%/app/javascript/styles/mastodon/landing_strip.scss %%WWWDIR%%/app/javascript/styles/mastodon/lists.scss +%%WWWDIR%%/app/javascript/styles/mastodon/modal.scss %%WWWDIR%%/app/javascript/styles/mastodon/reset.scss %%WWWDIR%%/app/javascript/styles/mastodon/rtl.scss %%WWWDIR%%/app/javascript/styles/mastodon/stream_entries.scss %%WWWDIR%%/app/javascript/styles/mastodon/tables.scss %%WWWDIR%%/app/javascript/styles/mastodon/variables.scss +%%WWWDIR%%/app/lib/activity_tracker.rb %%WWWDIR%%/app/lib/activitypub/activity.rb %%WWWDIR%%/app/lib/activitypub/activity/accept.rb %%WWWDIR%%/app/lib/activitypub/activity/announce.rb @@ -2660,6 +2687,7 @@ %%WWWDIR%%/app/serializers/activitypub/actor_serializer.rb %%WWWDIR%%/app/serializers/activitypub/block_serializer.rb %%WWWDIR%%/app/serializers/activitypub/collection_serializer.rb +%%WWWDIR%%/app/serializers/activitypub/delete_actor_serializer.rb %%WWWDIR%%/app/serializers/activitypub/delete_serializer.rb %%WWWDIR%%/app/serializers/activitypub/emoji_serializer.rb %%WWWDIR%%/app/serializers/activitypub/follow_serializer.rb @@ -2905,12 +2933,24 @@ %%WWWDIR%%/app/views/user_mailer/confirmation_instructions.pt-BR.text.erb %%WWWDIR%%/app/views/user_mailer/confirmation_instructions.ru.html.erb %%WWWDIR%%/app/views/user_mailer/confirmation_instructions.ru.text.erb +%%WWWDIR%%/app/views/user_mailer/confirmation_instructions.sr-Latn.html.erb +%%WWWDIR%%/app/views/user_mailer/confirmation_instructions.sr-Latn.text.erb +%%WWWDIR%%/app/views/user_mailer/confirmation_instructions.sr.html.erb +%%WWWDIR%%/app/views/user_mailer/confirmation_instructions.sr.text.erb %%WWWDIR%%/app/views/user_mailer/confirmation_instructions.sv.html.erb %%WWWDIR%%/app/views/user_mailer/confirmation_instructions.sv.text.erb %%WWWDIR%%/app/views/user_mailer/confirmation_instructions.tr.html.erb %%WWWDIR%%/app/views/user_mailer/confirmation_instructions.tr.text.erb %%WWWDIR%%/app/views/user_mailer/confirmation_instructions.zh-cn.html.erb %%WWWDIR%%/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb +%%WWWDIR%%/app/views/user_mailer/email_changed.en.html.erb +%%WWWDIR%%/app/views/user_mailer/email_changed.en.text.erb +%%WWWDIR%%/app/views/user_mailer/email_changed.ja.html.erb +%%WWWDIR%%/app/views/user_mailer/email_changed.ja.text.erb +%%WWWDIR%%/app/views/user_mailer/email_changed.oc.html.erb +%%WWWDIR%%/app/views/user_mailer/email_changed.oc.text.erb +%%WWWDIR%%/app/views/user_mailer/email_changed.pl.html.erb +%%WWWDIR%%/app/views/user_mailer/email_changed.pl.text.erb %%WWWDIR%%/app/views/user_mailer/password_change.ar.html.erb %%WWWDIR%%/app/views/user_mailer/password_change.ar.text.erb %%WWWDIR%%/app/views/user_mailer/password_change.ca.html.erb @@ -2945,6 +2985,10 @@ %%WWWDIR%%/app/views/user_mailer/password_change.pt-BR.text.erb %%WWWDIR%%/app/views/user_mailer/password_change.ru.html.erb %%WWWDIR%%/app/views/user_mailer/password_change.ru.text.erb +%%WWWDIR%%/app/views/user_mailer/password_change.sr-Latn.html.erb +%%WWWDIR%%/app/views/user_mailer/password_change.sr-Latn.text.erb +%%WWWDIR%%/app/views/user_mailer/password_change.sr.html.erb +%%WWWDIR%%/app/views/user_mailer/password_change.sr.text.erb %%WWWDIR%%/app/views/user_mailer/password_change.sv.html.erb %%WWWDIR%%/app/views/user_mailer/password_change.sv.text.erb %%WWWDIR%%/app/views/user_mailer/password_change.th.html.erb @@ -2953,6 +2997,14 @@ %%WWWDIR%%/app/views/user_mailer/password_change.tr.text.erb %%WWWDIR%%/app/views/user_mailer/password_change.zh-cn.html.erb %%WWWDIR%%/app/views/user_mailer/password_change.zh-cn.text.erb +%%WWWDIR%%/app/views/user_mailer/reconfirmation_instructions.en.html.erb +%%WWWDIR%%/app/views/user_mailer/reconfirmation_instructions.en.text.erb +%%WWWDIR%%/app/views/user_mailer/reconfirmation_instructions.ja.html.erb +%%WWWDIR%%/app/views/user_mailer/reconfirmation_instructions.ja.text.erb +%%WWWDIR%%/app/views/user_mailer/reconfirmation_instructions.oc.html.erb +%%WWWDIR%%/app/views/user_mailer/reconfirmation_instructions.oc.text.erb +%%WWWDIR%%/app/views/user_mailer/reconfirmation_instructions.pl.html.erb +%%WWWDIR%%/app/views/user_mailer/reconfirmation_instructions.pl.text.erb %%WWWDIR%%/app/views/user_mailer/reset_password_instructions.ar.html.erb %%WWWDIR%%/app/views/user_mailer/reset_password_instructions.ar.text.erb %%WWWDIR%%/app/views/user_mailer/reset_password_instructions.ca.html.erb @@ -2987,6 +3039,10 @@ %%WWWDIR%%/app/views/user_mailer/reset_password_instructions.pt-BR.text.erb %%WWWDIR%%/app/views/user_mailer/reset_password_instructions.ru.html.erb %%WWWDIR%%/app/views/user_mailer/reset_password_instructions.ru.text.erb +%%WWWDIR%%/app/views/user_mailer/reset_password_instructions.sr-Latn.html.erb +%%WWWDIR%%/app/views/user_mailer/reset_password_instructions.sr-Latn.text.erb +%%WWWDIR%%/app/views/user_mailer/reset_password_instructions.sr.html.erb +%%WWWDIR%%/app/views/user_mailer/reset_password_instructions.sr.text.erb %%WWWDIR%%/app/views/user_mailer/reset_password_instructions.sv.html.erb %%WWWDIR%%/app/views/user_mailer/reset_password_instructions.sv.text.erb %%WWWDIR%%/app/views/user_mailer/reset_password_instructions.th.html.erb @@ -3117,6 +3173,9 @@ %%WWWDIR%%/config/locales/activerecord.pl.yml %%WWWDIR%%/config/locales/activerecord.pt-BR.yml %%WWWDIR%%/config/locales/activerecord.ru.yml +%%WWWDIR%%/config/locales/activerecord.sk.yml +%%WWWDIR%%/config/locales/activerecord.sr-Latn.yml +%%WWWDIR%%/config/locales/activerecord.sr.yml %%WWWDIR%%/config/locales/activerecord.th.yml %%WWWDIR%%/config/locales/activerecord.uk.yml %%WWWDIR%%/config/locales/activerecord.zh-CN.yml @@ -3148,6 +3207,9 @@ %%WWWDIR%%/config/locales/devise.pt-BR.yml %%WWWDIR%%/config/locales/devise.pt.yml %%WWWDIR%%/config/locales/devise.ru.yml +%%WWWDIR%%/config/locales/devise.sk.yml +%%WWWDIR%%/config/locales/devise.sr-Latn.yml +%%WWWDIR%%/config/locales/devise.sr.yml %%WWWDIR%%/config/locales/devise.sv.yml %%WWWDIR%%/config/locales/devise.th.yml %%WWWDIR%%/config/locales/devise.tr.yml @@ -3180,6 +3242,9 @@ %%WWWDIR%%/config/locales/doorkeeper.pt-BR.yml %%WWWDIR%%/config/locales/doorkeeper.pt.yml %%WWWDIR%%/config/locales/doorkeeper.ru.yml +%%WWWDIR%%/config/locales/doorkeeper.sk.yml +%%WWWDIR%%/config/locales/doorkeeper.sr-Latn.yml +%%WWWDIR%%/config/locales/doorkeeper.sr.yml %%WWWDIR%%/config/locales/doorkeeper.sv.yml %%WWWDIR%%/config/locales/doorkeeper.th.yml %%WWWDIR%%/config/locales/doorkeeper.uk.yml @@ -3233,6 +3298,9 @@ %%WWWDIR%%/config/locales/simple_form.pt-BR.yml %%WWWDIR%%/config/locales/simple_form.pt.yml %%WWWDIR%%/config/locales/simple_form.ru.yml +%%WWWDIR%%/config/locales/simple_form.sk.yml +%%WWWDIR%%/config/locales/simple_form.sr-Latn.yml +%%WWWDIR%%/config/locales/simple_form.sr.yml %%WWWDIR%%/config/locales/simple_form.sv.yml %%WWWDIR%%/config/locales/simple_form.th.yml %%WWWDIR%%/config/locales/simple_form.tr.yml @@ -3240,6 +3308,9 @@ %%WWWDIR%%/config/locales/simple_form.zh-CN.yml %%WWWDIR%%/config/locales/simple_form.zh-HK.yml %%WWWDIR%%/config/locales/simple_form.zh-TW.yml +%%WWWDIR%%/config/locales/sk.yml +%%WWWDIR%%/config/locales/sr-Latn.yml +%%WWWDIR%%/config/locales/sr.yml %%WWWDIR%%/config/locales/sv.yml %%WWWDIR%%/config/locales/th.yml %%WWWDIR%%/config/locales/tr.yml @@ -3398,8 +3469,8 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***