glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	fbf97961fc	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	4e90375279	Fix Gemfile.lock (#12995 ) * Use bundle install in deployment mode for Continuous Integration to catch Gemfile.lock issues * Fix deprecation warnings * Fix Gemfile.lock * More changes to catch Gemfile.lock issues	5 years ago
Shlee	4533a6c264	Bump Rack from 2.0.8 to 2.1.2 (#12991 ) * Update Gemfile * Update Gemfile.lock	5 years ago
Thibaut Girka	9604766a18	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.	5 years ago
Daigo 3 Dango	da7c7cba19	Explicitly install rack gem (#12972 ) Pin rack version to 2.0.8. Rack-2.1.0 and 2.1.1 are known to record error below upon requests to `/sidekiq`: ``` NoMethodError - undefined method `transform_keys' for #<ActionDispatch::Request::Session:0x...> ```	5 years ago
Thibaut Girka	6719b9daa5	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.	5 years ago
dependabot-preview[bot]	a2eba1aee3	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>	5 years ago
Thibaut Girka	1f7e7594db	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.	5 years ago
dependabot-preview[bot]	805af753a1	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>	5 years ago
dependabot-preview[bot]	00cbabf803	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>	5 years ago
dependabot-preview[bot]	a1a8d02beb	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>	5 years ago
dependabot-preview[bot]	25b073ae85	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>	5 years ago
dependabot-preview[bot]	5e9dd2dcbf	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>	5 years ago
dependabot-preview[bot]	9c01f010ca	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>	5 years ago
dependabot-preview[bot]	23fbcfcd85	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>	5 years ago
Yamagishi Kazutoshi	fcf65e86bb	Remove derailed_benchmarks dependency (#12861 )	5 years ago
dependabot-preview[bot]	9a88e4204d	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>	5 years ago
dependabot-preview[bot]	287bd7d4f9	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>	5 years ago
dependabot-preview[bot]	fec5a41721	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>	5 years ago
dependabot-preview[bot]	89fc4613cb	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>	5 years ago
Thibaut Girka	62e596b423	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
dependabot-preview[bot]	99795c20e7	Bump rubocop-rails from 2.4.0 to 2.4.1 (#12780 ) 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] <support@dependabot.com>	5 years ago
Thibaut Girka	82e197787f	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one	5 years ago
ThibG	c297a1e7a7	Fix Ruby 2.7 support (#12831 ) - update http gem to avoid errors - update blurhash gem to avoid shared object loading error - update goldfinger gem so the http gem could be updated - update json gem to avoid warnings	5 years ago
mayaeh	f791cb2994	Remove ostatus2 gem from lockfile (#12826 )	5 years ago
mayaeh	1b5314cd74	Update lockfile for #12800 (#12825 )	5 years ago
ThibG	96b43ad187	Remove dependency on OStatus2 gem (#12822 )	5 years ago
dependabot-preview[bot]	7c29cd78b4	Bump rqrcode from 0.10.1 to 1.1.2 (#12357 ) Bumps [rqrcode](https://github.com/whomwah/rqrcode) from 0.10.1 to 1.1.2. - [Release notes](https://github.com/whomwah/rqrcode/releases) - [Commits](https://github.com/whomwah/rqrcode/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	a709be3868	Bump rdf-normalize from 0.3.3 to 0.4.0 (#12785 ) Bumps [rdf-normalize](https://github.com/gkellogg/rdf-normalize) from 0.3.3 to 0.4.0. - [Release notes](https://github.com/gkellogg/rdf-normalize/releases) - [Commits](https://github.com/gkellogg/rdf-normalize/compare/0.3.3...0.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	ffe8104398	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
dependabot-preview[bot]	9a860a142b	Bump pg from 1.2.0 to 1.2.1 (#12783 ) 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] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	1f5eb27d50	Bump aws-sdk-s3 from 1.59.0 to 1.60.1 (#12784 ) 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] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	a7a89bf997	Bump bullet from 6.0.2 to 6.1.0 (#12782 ) 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] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	332d252d00	Bump capybara from 3.29.0 to 3.30.0 (#12781 ) 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] <support@dependabot.com>	5 years ago
mayaeh	9852c25c95	Update lockfile for #12758 (#12762 )	5 years ago
Thibaut Girka	2591cedcad	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.	5 years ago
Shlee	1e1db2c508	Gemfile Updates - Others (#12761 ) * Update Gemfile.lock * Update Gemfile * Update Gemfile.lock * Update Gemfile.lock * Update Gemfile * Update Gemfile.lock	5 years ago
Shlee	aea32f596c	Gemfile Updates - fixes warnings (#12759 ) * Update Gemfile.lock * Update Gemfile.lock * Update Gemfile	5 years ago
dependabot-preview[bot]	e0e067d569	Bump stackprof from 0.2.14 to 0.2.15 (#12726 ) Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.14 to 0.2.15. - [Release notes](https://github.com/tmm1/stackprof/releases) - [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md) - [Commits](https://github.com/tmm1/stackprof/compare/v0.2.14...v0.2.15) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	25134319e8	Bump pg from 1.1.4 to 1.2.0 (#12725 ) 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] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	29c12522f0	Bump redis-namespace from 1.6.0 to 1.7.0 (#12727 ) Bumps [redis-namespace](https://github.com/resque/redis-namespace) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/resque/redis-namespace/releases) - [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md) - [Commits](https://github.com/resque/redis-namespace/compare/v1.6.0...v1.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	8ba7008cbd	Bump faker from 2.9.0 to 2.10.0 (#12728 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.9.0 to 2.10.0. - [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/compare/v2.9.0...v2.10.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	a85b29d2e2	Bump derailed_benchmarks from 1.4.2 to 1.4.3 (#12729 ) Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/schneems/derailed_benchmarks/releases) - [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md) - [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.4.2...v1.4.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	1356f0a8a3	Bump rack-cors from 1.1.0 to 1.1.1 (#12730 ) Bumps [rack-cors](https://github.com/cyu/rack-cors) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/cyu/rack-cors/releases) - [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md) - [Commits](https://github.com/cyu/rack-cors/compare/v1.1.0...v1.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Shlee	c3e286a526	Circleci - Upgrade to Buster Images (#12705 ) * Update config.yml * Update Gemfile.lock	5 years ago
Thibaut Girka	96d17e8437	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `README.md` - `package.json`	5 years ago
dependabot-preview[bot]	8079a99f69	Bump rubocop from 0.77.0 to 0.78.0 (#12677 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.77.0 to 0.78.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.77.0...v0.78.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	de2082c658	Bump faker from 2.8.1 to 2.9.0 (#12680 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.8.1 to 2.9.0. - [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/compare/v2.8.1...v2.9.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	1963edc90c	Bump strong_migrations from 0.5.0 to 0.5.1 (#12679 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.5.0 to 0.5.1. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.5.0...v0.5.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	36e2459806	Bump rails from 5.2.4 to 5.2.4.1 (#12682 ) Bumps [rails](https://github.com/rails/rails) from 5.2.4 to 5.2.4.1. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.4...v5.2.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago

1 2 3 4 5 ...

865 Commits (d9418d08e3f599e9e5b88396cc225d76367eeedd)