Kody
b0acead946
Upgrade .nvmrc to Node.js 12 ( #12906 )
2020-01-21 12:42:13 +01:00
ThibG
a8c109baca
Merge pull request #1264 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-20 19:20:40 +01:00
Thibaut Girka
dc2ab6e646
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.js`:
Upstream removed an unused function in code that has
been refactored a bit. Removed that function in the corresponding
places.
2020-01-20 18:31:11 +01:00
Eugen Rochko
02063c245c
Fix not all of account's active IPs showing up in admin UI ( #12909 )
2020-01-20 18:00:54 +01:00
ThibG
91e4955e08
Fix admin interface crashing when listing boosts with non-video media attachments ( #12907 )
...
Fix regression introduced by #12879
2020-01-20 17:39:14 +01:00
Eugen Rochko
ba16d4b413
Fix search by IP not using alternative browser sessions in admin UI ( #12904 )
2020-01-20 17:00:41 +01:00
Thibaut Girka
eeb8753adc
Add glitch-soc front-end support for many upstream translations
2020-01-20 16:43:18 +01:00
ThibG
2d5addde03
Fix “X new items” not showing up for slow mode on empty timelines ( #12875 )
2020-01-20 16:34:42 +01:00
dependabot-preview[bot]
39f2bce231
Bump @babel/core from 7.7.7 to 7.8.3 ( #12893 )
...
Bumps [@babel/core](https://github.com/babel/babel ) from 7.7.7 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.7...v7.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-21 00:14:06 +09:00
Eugen Rochko
6feafb8802
Various fixes and improvements ( #12878 )
...
* Fix unused role routes being generated
* Remove unused JavaScript code
* Refactor filters code to be DRYer
* Fix `.count == 0` comparisons to `.empty?` in views
* Fix filters in views
2020-01-20 15:55:03 +01:00
dependabot-preview[bot]
06f6995860
Bump httplog from 1.3.3 to 1.4.0 ( #12902 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.3.3 to 1.4.0.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.3.3...v1.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 23:45:10 +09:00
Eugen Rochko
008063d562
[Glitch] Change reported media attachments to always be hidden in admin UI
...
Port 1ded3bb752
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-20 15:30:45 +01:00
dependabot-preview[bot]
204dd7fd22
Bump @babel/plugin-proposal-decorators from 7.8.0 to 7.8.3 ( #12895 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel ) from 7.8.0 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.8.0...v7.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 23:15:59 +09:00
Thibaut Girka
45709d6987
Merge branch 'master' into glitch-soc/master
...
Conflicts:
- `README.md`:
We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
Conflict due to glitch-soc theming system.
Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
Conflict due to glitch-soc theming system.
Adapted upstream changes.
- `yarn.lock`:
No real conflict, glitch-specific dependency too close to
an updated one. Adapted upstream change.
2020-01-20 15:00:22 +01:00
dependabot-preview[bot]
51182843d4
Bump parallel_tests from 2.30.0 to 2.30.1 ( #12901 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.30.0 to 2.30.1.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.0...v2.30.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 22:08:14 +09:00
dependabot-preview[bot]
850a217784
Bump faker from 2.10.0 to 2.10.1 ( #12899 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 21:37:26 +09:00
dependabot-preview[bot]
7f22cb6d2b
Bump react-swipeable-views from 0.13.3 to 0.13.4 ( #12894 )
...
Bumps [react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views ) from 0.13.3 to 0.13.4.
- [Release notes](https://github.com/oliviertassinari/react-swipeable-views/releases )
- [Changelog](https://github.com/oliviertassinari/react-swipeable-views/blob/master/CHANGELOG.md )
- [Commits](https://github.com/oliviertassinari/react-swipeable-views/compare/v0.13.3...v0.13.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 21:06:40 +09:00
dependabot-preview[bot]
af70e54d71
Bump @babel/runtime from 7.8.0 to 7.8.3 ( #12892 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.8.0 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.8.3/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 21:05:52 +09:00
dependabot-preview[bot]
d39e289a76
Bump @babel/plugin-proposal-class-properties from 7.7.4 to 7.8.3 ( #12891 )
...
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel ) from 7.7.4 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 21:05:36 +09:00
dependabot-preview[bot]
6bd2186733
Bump autoprefixer from 9.7.3 to 9.7.4 ( #12890 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.7.3 to 9.7.4.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.3...9.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 21:02:45 +09:00
dependabot-preview[bot]
7cb2de8a39
Bump wavesurfer.js from 3.3.0 to 3.3.1 ( #12889 )
...
Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js ) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/katspaugh/wavesurfer.js/releases )
- [Changelog](https://github.com/katspaugh/wavesurfer.js/blob/master/CHANGES.md )
- [Commits](https://github.com/katspaugh/wavesurfer.js/compare/3.3.0...3.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 21:00:43 +09:00
dependabot-preview[bot]
acefc19975
Bump eslint-plugin-import from 2.19.1 to 2.20.0 ( #12888 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.19.1 to 2.20.0.
- [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/v2.19.1...v2.20.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 21:00:22 +09:00
dependabot-preview[bot]
7bf808d126
Bump compression-webpack-plugin from 3.0.1 to 3.1.0 ( #12896 )
...
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] <support@dependabot.com>
2020-01-20 20:59:28 +09:00
dependabot-preview[bot]
9f6785592b
Bump capistrano-rbenv from 2.1.4 to 2.1.6 ( #12898 )
...
Bumps [capistrano-rbenv](https://github.com/capistrano/rbenv ) from 2.1.4 to 2.1.6.
- [Release notes](https://github.com/capistrano/rbenv/releases )
- [Changelog](https://github.com/capistrano/rbenv/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/rbenv/compare/v2.1.4...v2.1.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 20:58:56 +09:00
dependabot-preview[bot]
4bdbaf809b
Bump webmock from 3.7.6 to 3.8.0 ( #12900 )
...
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] <support@dependabot.com>
2020-01-20 12:46:03 +01:00
dependabot-preview[bot]
4078eda312
Bump i18n-tasks from 0.9.29 to 0.9.30 ( #12903 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.29 to 0.9.30.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.29...v0.9.30 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 12:45:23 +01:00
dependabot-preview[bot]
69d510a980
Bump oj from 3.10.0 to 3.10.1 ( #12897 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.0...v3.10.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 12:43:52 +01:00
Eugen Rochko
a7d34d49ad
Add is to available locales ( #12882 )
...
Fix #12869
2020-01-18 23:22:35 +01:00
Eugen Rochko
1ded3bb752
Change reported media attachments to always be hidden in admin UI ( #12879 )
...
Also:
- Fix Mastodon logo not showing up in status embeds
- Fix blurhash not being used in status embeds
- Fix blurhash not being used in admin UI
- Fix autoplay param not working correctly on status embeds
2020-01-18 19:50:43 +01:00
mayaeh
709ca0496d
Undo translations restored to its previous state ( #12876 )
2020-01-17 10:53:53 +01:00
ThibG
345bba4812
Exempt staff members from spam check ( #12874 )
...
Consider admins and moderators as trusted, for the purpose of the
spam checker.
Fixes #12872
2020-01-17 07:50:30 +01:00
Shlee
827e590d8e
Drop support for Ruby 2.4 from CircleCI ( #12834 )
...
* Update config.yml
* Update Gemfile
* Update README.md
* Update Gemfile
* Update Gemfile
* Update Gemfile
* Update README.md
* Update README.md
2020-01-15 07:45:00 +01:00
dependabot-preview[bot]
a31139c9f1
Bump browser from 2.7.1 to 3.0.3 ( #12850 )
...
Bumps [browser](https://github.com/fnando/browser ) from 2.7.1 to 3.0.3.
- [Release notes](https://github.com/fnando/browser/releases )
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/browser/compare/v2.7.1...v3.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-15 10:24:35 +09:00
dependabot-preview[bot]
2c15f9aaa2
Bump @babel/preset-react from 7.7.4 to 7.8.3 ( #12865 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel ) from 7.7.4 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 21:17:21 +09:00
Stéphane Guillou
dcf7d86378
2019 -> 2020 ( #12867 )
...
happy new year 🎉
2020-01-14 11:20:13 +01:00
Eugen Rochko
02d272cf49
Fix access to OEmbed endpoint in secure mode ( #12864 )
2020-01-14 08:52:32 +01:00
dependabot-preview[bot]
37b5139822
Bump @babel/preset-env from 7.7.7 to 7.8.3 ( #12866 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.7.7 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.7...v7.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 12:05:32 +09:00
dependabot-preview[bot]
1fd74ba09e
Bump @babel/plugin-transform-react-inline-elements from 7.7.4 to 7.8.0 ( #12848 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel ) from 7.7.4 to 7.8.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 11:34:09 +09:00
Yamagishi Kazutoshi
114ee287dc
Remove derailed_benchmarks dependency ( #12861 )
2020-01-14 00:43:12 +01:00
dependabot-preview[bot]
08e540f01d
Bump pg from 1.2.1 to 1.2.2 ( #12854 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.2.1 to 1.2.2.
- [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.1...v1.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 03:09:31 +09:00
dependabot-preview[bot]
f82e028bfd
Bump axios from 0.19.0 to 0.19.1 ( #12846 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.19.0 to 0.19.1.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.19.0...0.19.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 03:05:14 +09:00
dependabot-preview[bot]
031a432559
Bump ox from 2.11.0 to 2.12.1 ( #12853 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.11.0 to 2.12.1.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.11.0...v2.12.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 03:02:20 +09:00
dependabot-preview[bot]
2950b09706
Bump json-ld from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0 ( #12852 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0. This release includes the previously tagged commit.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](e742697a09
...3.1.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 03:01:43 +09:00
dependabot-preview[bot]
a0ad1f5cda
Bump rubocop from 0.78.0 to 0.79.0 ( #12851 )
...
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] <support@dependabot.com>
2020-01-14 02:58:56 +09:00
dependabot-preview[bot]
392e84abe6
Bump @babel/runtime from 7.7.7 to 7.8.0 ( #12847 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.7.7 to 7.8.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.8.0/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 02:56:47 +09:00
dependabot-preview[bot]
e6c2254701
Bump css-loader from 3.4.1 to 3.4.2 ( #12842 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.4.1 to 3.4.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.4.1...v3.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 02:56:21 +09:00
dependabot-preview[bot]
940b58eb9e
Bump @babel/plugin-proposal-decorators from 7.7.4 to 7.8.0 ( #12844 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel ) from 7.7.4 to 7.8.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 02:55:30 +09:00
dependabot-preview[bot]
923ae7067b
Bump terser-webpack-plugin from 2.3.1 to 2.3.2 ( #12839 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v2.3.1...v2.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 02:54:45 +09:00
dependabot-preview[bot]
512f5f9b2b
Bump sass-loader from 8.0.0 to 8.0.2 ( #12860 )
...
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader ) from 8.0.0 to 8.0.2.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases )
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v8.0.0...v8.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 02:53:42 +09:00
ThibG
ddcf78d8d3
Merge pull request #1263 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-13 16:07:40 +01:00