glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	c2347f6cf6	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one.	4 years ago
dependabot[bot]	4e6bad8acc	Bump diff-lcs from 1.4.3 to 1.4.4 (#14220 ) Bumps [diff-lcs](https://github.com/halostatue/diff-lcs) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/halostatue/diff-lcs/releases) - [Changelog](https://github.com/halostatue/diff-lcs/blob/master/History.md) - [Commits](https://github.com/halostatue/diff-lcs/compare/v1.4.3...v1.4.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	0c4930e65b	Bump rdf from 3.1.3 to 3.1.4 (#14225 ) Bumps [rdf](https://github.com/ruby-rdf/rdf) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/ruby-rdf/rdf/releases) - [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md) - [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.3...3.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	c2cc7bec57	Bump omniauth-saml from 1.10.1 to 1.10.2 (#14226 ) Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml) from 1.10.1 to 1.10.2. - [Release notes](https://github.com/omniauth/omniauth-saml/releases) - [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md) - [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.1...v1.10.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	f993c744d8	Bump json from 2.3.0 to 2.3.1 (#14227 ) Bumps [json](https://github.com/flori/json) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/flori/json/releases) - [Changelog](https://github.com/flori/json/blob/master/CHANGES.md) - [Commits](https://github.com/flori/json/compare/v2.3.0...v2.3.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	9decf0a2c7	Bump aws-sdk-s3 from 1.72.0 to 1.73.0 (#14219 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.72.0 to 1.73.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
Thibaut Girka	f5afdaa2e0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.	4 years ago
Eugen Rochko	8517a5fdb4	Add color extraction for audio thumbnails (#14209 )	4 years ago
Thibaut Girka	928a3a9fd5	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.	4 years ago
Eugen Rochko	ca238c879d	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191 )	4 years ago
Thibaut Girka	2a2af880b8	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.	4 years ago
dependabot[bot]	8a1a6b8fb0	Bump diff-lcs from 1.3 to 1.4.3 (#14186 ) Bumps [diff-lcs](https://github.com/halostatue/diff-lcs) from 1.3 to 1.4.3. - [Release notes](https://github.com/halostatue/diff-lcs/releases) - [Changelog](https://github.com/halostatue/diff-lcs/blob/master/History.md) - [Commits](https://github.com/halostatue/diff-lcs/compare/v1.3...v1.4.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	c3070c905d	Bump faker from 2.12.0 to 2.13.0 (#14174 ) Bumps [faker](https://github.com/faker-ruby/faker) from 2.12.0 to 2.13.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.12.0...v2.13.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	97e77c986f	Bump redis-store from 1.8.2 to 1.9.0 (#14160 ) Bumps [redis-store](https://github.com/jodosha/redis-store) from 1.8.2 to 1.9.0. - [Release notes](https://github.com/jodosha/redis-store/releases) - [Changelog](https://github.com/redis-store/redis-store/blob/master/CHANGELOG.md) - [Commits](https://github.com/jodosha/redis-store/compare/v1.8.2...v1.9.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	fe868c554b	Bump pghero from 2.5.0 to 2.5.1 (#14163 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.5.0 to 2.5.1. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.5.0...v2.5.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	d993d41cf4	Bump rails-controller-testing from 1.0.4 to 1.0.5 (#14161 ) Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/rails/rails-controller-testing/releases) - [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.4...v1.0.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	09b5865109	Bump rubocop from 0.85.1 to 0.86.0 (#14171 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.85.1 to 0.86.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.85.1...v0.86.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	24a512e418	Bump aws-sdk-s3 from 1.69.0 to 1.72.0 (#14158 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.69.0 to 1.72.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
Thibaut Girka	0e33582bff	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
dependabot[bot]	d239de61d8	Bump aws-sdk-s3 from 1.68.1 to 1.69.0 (#14109 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.68.1 to 1.69.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	ca982fd76f	Bump aws-sigv4 from 1.1.4 to 1.2.0 (#14107 ) Bumps [aws-sigv4](https://github.com/aws/aws-sdk-ruby) from 1.1.4 to 1.2.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sigv4/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.1.4...1.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	fc815a8e08	Bump capybara from 3.32.2 to 3.33.0 (#14105 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.32.2 to 3.33.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.32.2...3.33.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	f427fb70d5	Bump rspec-sidekiq from 3.0.3 to 3.1.0 (#14104 ) Bumps [rspec-sidekiq](https://github.com/philostler/rspec-sidekiq) from 3.0.3 to 3.1.0. - [Release notes](https://github.com/philostler/rspec-sidekiq/releases) - [Changelog](https://github.com/philostler/rspec-sidekiq/blob/develop/CHANGES.md) - [Commits](https://github.com/philostler/rspec-sidekiq/compare/v3.0.3...v3.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	6757a98c7b	Bump excon from 0.74.0 to 0.75.0 (#14103 ) Bumps [excon](https://github.com/excon/excon) from 0.74.0 to 0.75.0. - [Release notes](https://github.com/excon/excon/releases) - [Changelog](https://github.com/excon/excon/blob/master/changelog.txt) - [Commits](https://github.com/excon/excon/compare/v0.74.0...v0.75.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	d50041eab4	Bump elasticsearch from 7.7.0 to 7.8.0 (#14108 ) Bumps [elasticsearch](https://github.com/elastic/elasticsearch-ruby) from 7.7.0 to 7.8.0. - [Release notes](https://github.com/elastic/elasticsearch-ruby/releases) - [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch-ruby/compare/7.7.0...v7.8.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	b75859cdf4	Bump loofah from 2.5.0 to 2.6.0 (#14071 ) Bumps [loofah](https://github.com/flavorjones/loofah) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.5.0...v2.6.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	f89918bb93	Bump rdf from 3.1.2 to 3.1.3 (#14070 ) Bumps [rdf](https://github.com/ruby-rdf/rdf) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/ruby-rdf/rdf/releases) - [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md) - [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.2...3.1.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	413842d0af	Bump parser from 2.7.1.3 to 2.7.1.4 (#14101 ) Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.3 to 2.7.1.4. - [Release notes](https://github.com/whitequark/parser/releases) - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/parser/compare/v2.7.1.3...v2.7.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	ac526afe60	Bump aws-partitions from 1.329.0 to 1.332.0 (#14110 ) Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.329.0 to 1.332.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
Thibaut Girka	c1eb60642b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.	4 years ago
dependabot[bot]	0072b00e3c	Bump aws-sdk-core from 3.99.2 to 3.100.0 (#14072 ) Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.99.2 to 3.100.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
Thibaut Girka	4d5ff62de5	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency	4 years ago
dependabot[bot]	fcf3fcc3c5	Bump parallel from 1.19.1 to 1.19.2 (#14069 ) Bumps [parallel](https://github.com/grosser/parallel) from 1.19.1 to 1.19.2. - [Release notes](https://github.com/grosser/parallel/releases) - [Commits](https://github.com/grosser/parallel/compare/v1.19.1...v1.19.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	4aca523d14	Bump capistrano from 3.14.0 to 3.14.1 (#14037 ) * Bump capistrano from 3.14.0 to 3.14.1 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.14.0...v3.14.1) Signed-off-by: dependabot[bot] <support@github.com> * Bump capistrano from 3.14.0 to 3.14.1 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	4 years ago
mayaeh	759ad1511b	[Security] Bump rack from 2.2.2 to 2.2.3 (#14064 )	4 years ago
dependabot[bot]	42df10e681	Bump sanitize from 5.2.0 to 5.2.1 (#14063 ) Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.2.0 to 5.2.1. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.2.0...v5.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	01a4c7844c	Bump parallel_tests from 2.32.0 to 3.0.0 (#14044 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.32.0 to 3.0.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.32.0...v3.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	2395cbb497	Bump bundler-audit from 0.6.1 to 0.7.0.1 (#14034 ) Bumps [bundler-audit](https://github.com/postmodern/bundler-audit) from 0.6.1 to 0.7.0.1. - [Release notes](https://github.com/postmodern/bundler-audit/releases) - [Changelog](https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md) - [Commits](https://github.com/postmodern/bundler-audit/compare/v0.6.1...v0.7.0.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	7e4cd8a782	Bump excon from 0.73.0 to 0.74.0 (#14046 ) Bumps [excon](https://github.com/excon/excon) from 0.73.0 to 0.74.0. - [Release notes](https://github.com/excon/excon/releases) - [Changelog](https://github.com/excon/excon/blob/master/changelog.txt) - [Commits](https://github.com/excon/excon/compare/v0.73.0...v0.74.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	d884a39c3d	Bump devise from 4.7.1 to 4.7.2 (#14045 ) Bumps [devise](https://github.com/plataformatec/devise) from 4.7.1 to 4.7.2. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.7.1...v4.7.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	01a9f74b8a	Bump net-ssh from 6.0.2 to 6.1.0 (#14050 ) Bumps [net-ssh](https://github.com/net-ssh/net-ssh) from 6.0.2 to 6.1.0. - [Release notes](https://github.com/net-ssh/net-ssh/releases) - [Changelog](https://github.com/net-ssh/net-ssh/blob/master/CHANGES.txt) - [Commits](https://github.com/net-ssh/net-ssh/compare/v6.0.2...v6.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	9f71b98b19	Bump rubocop-rails from 2.5.2 to 2.6.0 (#14047 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.5.2 to 2.6.0. - [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.5.2...v2.6.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	01bafc81ea	Bump httplog from 1.4.2 to 1.4.3 (#14043 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.4.2 to 1.4.3. - [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.4.2...v1.4.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	b7e2bac9f7	Bump redis from 4.1.4 to 4.2.1 (#14038 ) Bumps [redis](https://github.com/redis/redis-rb) from 4.1.4 to 4.2.1. - [Release notes](https://github.com/redis/redis-rb/releases) - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v4.1.4...v4.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	5d39d8606f	Bump ast from 2.4.0 to 2.4.1 (#14035 ) Bumps [ast](https://github.com/whitequark/ast) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/whitequark/ast/releases) - [Changelog](https://github.com/whitequark/ast/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/ast/compare/v2.4.0...v2.4.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	311060c803	Bump aws-sdk-s3 from 1.67.1 to 1.68.1 (#14033 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.67.1 to 1.68.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/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
Thibaut Girka	83dc54c487	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.	4 years ago
dependabot[bot]	33aa238637	Bump rubocop from 0.85.0 to 0.85.1 (#14009 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.85.0 to 0.85.1. - [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.85.0...v0.85.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	d3fd9d8386	Bump regexp_parser from 1.7.0 to 1.7.1 (#14008 ) Bumps [regexp_parser](https://github.com/ammar/regexp_parser) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/ammar/regexp_parser/releases) - [Changelog](https://github.com/ammar/regexp_parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/ammar/regexp_parser/compare/v1.7.0...v1.7.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago
dependabot[bot]	81a7addbfd	Bump sanitize from 5.1.0 to 5.2.0 (#14006 ) Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.1.0...v5.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	4 years ago

1 2 3 4 5 ...

1093 Commits (a787759254498c2f7c019ceed3af60385a21b205)