about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-01-21Upgrade .nvmrc to Node.js 12 (#12906)Kody
2020-01-20Merge pull request #1264 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-01-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-20Fix not all of account's active IPs showing up in admin UI (#12909)Eugen Rochko
2020-01-20Fix admin interface crashing when listing boosts with non-video media ↵ThibG
attachments (#12907) Fix regression introduced by #12879
2020-01-20Fix search by IP not using alternative browser sessions in admin UI (#12904)Eugen Rochko
2020-01-20Add glitch-soc front-end support for many upstream translationsThibaut Girka
2020-01-20Fix “X new items” not showing up for slow mode on empty timelines (#12875)ThibG
2020-01-21Bump @babel/core from 7.7.7 to 7.8.3 (#12893)dependabot-preview[bot]
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-20Various fixes and improvements (#12878)Eugen Rochko
* 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-20Bump httplog from 1.3.3 to 1.4.0 (#12902)dependabot-preview[bot]
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[Glitch] Change reported media attachments to always be hidden in admin UIEugen Rochko
Port 1ded3bb752916fe87755d80a832af39431a42438 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-20Bump @babel/plugin-proposal-decorators from 7.8.0 to 7.8.3 (#12895)dependabot-preview[bot]
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-20Merge branch 'master' into glitch-soc/masterThibaut Girka
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-20Bump parallel_tests from 2.30.0 to 2.30.1 (#12901)dependabot-preview[bot]
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-20Bump faker from 2.10.0 to 2.10.1 (#12899)dependabot-preview[bot]
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-20Bump react-swipeable-views from 0.13.3 to 0.13.4 (#12894)dependabot-preview[bot]
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-20Bump @babel/runtime from 7.8.0 to 7.8.3 (#12892)dependabot-preview[bot]
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-20Bump @babel/plugin-proposal-class-properties from 7.7.4 to 7.8.3 (#12891)dependabot-preview[bot]
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-20Bump autoprefixer from 9.7.3 to 9.7.4 (#12890)dependabot-preview[bot]
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-20Bump wavesurfer.js from 3.3.0 to 3.3.1 (#12889)dependabot-preview[bot]
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-20Bump eslint-plugin-import from 2.19.1 to 2.20.0 (#12888)dependabot-preview[bot]
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-20Bump compression-webpack-plugin from 3.0.1 to 3.1.0 (#12896)dependabot-preview[bot]
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-20Bump capistrano-rbenv from 2.1.4 to 2.1.6 (#12898)dependabot-preview[bot]
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-20Bump webmock from 3.7.6 to 3.8.0 (#12900)dependabot-preview[bot]
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-20Bump i18n-tasks from 0.9.29 to 0.9.30 (#12903)dependabot-preview[bot]
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-20Bump oj from 3.10.0 to 3.10.1 (#12897)dependabot-preview[bot]
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-18Add is to available locales (#12882)Eugen Rochko
Fix #12869
2020-01-18Change reported media attachments to always be hidden in admin UI (#12879)Eugen Rochko
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-17Undo translations restored to its previous state (#12876)mayaeh
2020-01-17Exempt staff members from spam check (#12874)ThibG
Consider admins and moderators as trusted, for the purpose of the spam checker. Fixes #12872
2020-01-15Drop support for Ruby 2.4 from CircleCI (#12834)Shlee
* Update config.yml * Update Gemfile * Update README.md * Update Gemfile * Update Gemfile * Update Gemfile * Update README.md * Update README.md
2020-01-15Bump browser from 2.7.1 to 3.0.3 (#12850)dependabot-preview[bot]
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-14Bump @babel/preset-react from 7.7.4 to 7.8.3 (#12865)dependabot-preview[bot]
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-142019 -> 2020 (#12867)Stéphane Guillou
happy new year :tada:
2020-01-14Fix access to OEmbed endpoint in secure mode (#12864)Eugen Rochko
2020-01-14Bump @babel/preset-env from 7.7.7 to 7.8.3 (#12866)dependabot-preview[bot]
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-14Bump @babel/plugin-transform-react-inline-elements from 7.7.4 to 7.8.0 (#12848)dependabot-preview[bot]
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-14Remove derailed_benchmarks dependency (#12861)Yamagishi Kazutoshi
2020-01-14Bump pg from 1.2.1 to 1.2.2 (#12854)dependabot-preview[bot]
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-14Bump axios from 0.19.0 to 0.19.1 (#12846)dependabot-preview[bot]
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-14Bump ox from 2.11.0 to 2.12.1 (#12853)dependabot-preview[bot]
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-14Bump json-ld from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0 (#12852)dependabot-preview[bot]
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](https://github.com/ruby-rdf/json-ld/compare/e742697a0906e74e8bb777ef98137bc3955d981d...3.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14Bump rubocop from 0.78.0 to 0.79.0 (#12851)dependabot-preview[bot]
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-14Bump @babel/runtime from 7.7.7 to 7.8.0 (#12847)dependabot-preview[bot]
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-14Bump css-loader from 3.4.1 to 3.4.2 (#12842)dependabot-preview[bot]
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-14Bump @babel/plugin-proposal-decorators from 7.7.4 to 7.8.0 (#12844)dependabot-preview[bot]
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-14Bump terser-webpack-plugin from 2.3.1 to 2.3.2 (#12839)dependabot-preview[bot]
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-14Bump sass-loader from 8.0.0 to 8.0.2 (#12860)dependabot-preview[bot]
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-13Merge pull request #1263 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes