dependabot[bot] 
							
						 
					 
					
						
						
							
						
						25330a9f04 
					 
					
						
						
							
							Bump http from 4.4.1 to 5.0.1 ( #16438 )  
						
						 
						
						... 
						
						
						
						Bumps [http](https://github.com/httprb/http ) from 4.4.1 to 5.0.1.
- [Release notes](https://github.com/httprb/http/releases )
- [Changelog](https://github.com/httprb/http/blob/master/CHANGES.md )
- [Commits](https://github.com/httprb/http/compare/v4.4.1...v5.0.1 )
---
updated-dependencies:
- dependency-name: http
  dependency-type: direct:production
  update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-08-28 18:17:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						1c8ce9ae34 
					 
					
						
						
							
							Bump faker from 2.18.0 to 2.19.0 ( #16646 )  
						
						 
						
						... 
						
						
						
						Bumps [faker](https://github.com/faker-ruby/faker ) from 2.18.0 to 2.19.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.18.0...v2.19.0 )
---
updated-dependencies:
- dependency-name: faker
  dependency-type: direct:development
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-08-27 21:47:00 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						4e2a8c9b38 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						
						
						
					 
					
						2021-08-20 13:01:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						ce8f41e560 
					 
					
						
						
							
							Bump oj from 3.12.2 to 3.13.2 ( #16620 )  
						
						 
						
						... 
						
						
						
						Bumps [oj](https://github.com/ohler55/oj ) from 3.12.2 to 3.13.2.
- [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.12.2...v3.13.2 )
---
updated-dependencies:
- dependency-name: oj
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-08-17 13:58:07 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						ec0b8f7e81 
					 
					
						
						
							
							Bump aws-sdk-s3 from 1.98.0 to 1.99.0 ( #16611 )  
						
						 
						
						... 
						
						
						
						Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.98.0 to 1.99.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-08-17 12:49:21 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						f3084bbf7c 
					 
					
						
						
							
							Bump webmock from 3.13.0 to 3.14.0 ( #16587 )  
						
						 
						
						... 
						
						
						
						Bumps [webmock](https://github.com/bblimke/webmock ) from 3.13.0 to 3.14.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.13.0...v3.14.0 )
---
updated-dependencies:
- dependency-name: webmock
  dependency-type: direct:development
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-08-17 12:49:00 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						479a8d1004 
					 
					
						
						
							
							Bump rubocop from 1.18.4 to 1.19.0 ( #16618 )  
						
						 
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.18.4 to 1.19.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.18.4...v1.19.0 )
---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-08-17 12:40:17 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						8ec4be4233 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						... 
						
						
						
						Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream-updated dependency (redis) textually too
  close to glitch-soc-only dependecy.
  Updated redis gem like upstream did. 
						
						
					 
					
						2021-08-09 23:25:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						432e3d1eaf 
					 
					
						
						
							
							Bump sanitize from 5.2.3 to 6.0.0 ( #16580 )  
						
						 
						
						... 
						
						
						
						Fixes nokogumbo/nokogiri conflicts by dropping the nokogumbo gem, as it has
been merged in the nokogiri gem. 
						
						
					 
					
						2021-08-09 20:46:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						7bd7e45608 
					 
					
						
						
							
							Bump aws-sdk-s3 from 1.96.2 to 1.98.0 ( #16559 )  
						
						 
						
						... 
						
						
						
						Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.96.2 to 1.98.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-08-07 13:10:27 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						fe8750e851 
					 
					
						
						
							
							Bump nokogiri from 1.11.7 to 1.12.0 ( #16560 )  
						
						 
						
						... 
						
						
						
						Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.7 to 1.12.0.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.7...v1.12.0 )
---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-08-07 13:01:59 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						a517fc49ef 
					 
					
						
						
							
							Bump puma from 5.3.2 to 5.4.0 ( #16561 )  
						
						 
						
						... 
						
						
						
						Bumps [puma](https://github.com/puma/puma ) from 5.3.2 to 5.4.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v5.3.2...v5.4.0 )
---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-08-07 13:01:32 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						755e946220 
					 
					
						
						
							
							Bump redis from 4.3.1 to 4.4.0 ( #16562 )  
						
						 
						
						... 
						
						
						
						Bumps [redis](https://github.com/redis/redis-rb ) from 4.3.1 to 4.4.0.
- [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.3.1...v4.4.0 )
---
updated-dependencies:
- dependency-name: redis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-08-07 13:00:49 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						7efe0cb024 
					 
					
						
						
							
							Bump brakeman from 5.0.4 to 5.1.1 ( #16538 )  
						
						 
						
						... 
						
						
						
						Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 5.0.4 to 5.1.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v5.0.4...v5.1.1 )
---
updated-dependencies:
- dependency-name: brakeman
  dependency-type: direct:development
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-08-01 11:13:41 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						b5e10d07ff 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						
						
						
					 
					
						2021-07-25 12:48:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						b16d220ec9 
					 
					
						
						
							
							Bump oj from 3.11.8 to 3.12.1 ( #16493 )  
						
						 
						
						... 
						
						
						
						Bumps [oj](https://github.com/ohler55/oj ) from 3.11.8 to 3.12.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.11.8...v3.12.1 )
---
updated-dependencies:
- dependency-name: oj
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-07-20 22:25:09 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						cdf20f4367 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						... 
						
						
						
						Conflicts:
- `app/serializers/rest/instance_serializer.rb`:
  Upstream changed the fields returned by /api/v1/instance by adding a
  `configuration` field holding a lot of useful information making our
  `max_toot_chars` and `poll_limits` fields obsolete.
  Keeping those around for now for compatibility.
- `app/validators/status_length_validator.rb`:
  No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to
  MAX_CHARS which is defined differently in glitch-soc.
  Ported upstream changes. 
						
						
					 
					
						2021-07-11 21:41:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daigo 3 Dango 
							
						 
					 
					
						
						
							
						
						3d5183e99c 
					 
					
						
						
							
							Use ruby-2.7.4 ( #16481 )  
						
						 
						
						... 
						
						
						
						Stop using older version of resolv gem as the bug has been fixed.
https://bugs.ruby-lang.org/issues/17781  
						
						
					 
					
						2021-07-10 01:29:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						3160e050a9 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						... 
						
						
						
						Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/accounts/_header.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/directories/index.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change. 
						
						
					 
					
						2021-07-08 16:17:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						d36cfb99da 
					 
					
						
						
							
							Bump addressable from 2.7.0 to 2.8.0 ( #16474 )  
						
						 
						
						... 
						
						
						
						Bumps [addressable](https://github.com/sporkmonger/addressable ) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases )
- [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.7.0...addressable-2.8.0 )
---
updated-dependencies:
- dependency-name: addressable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-07-08 14:35:20 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						7b14b8074d 
					 
					
						
						
							
							Bump rails from 6.1.3.2 to 6.1.4 ( #16436 )  
						
						 
						
						... 
						
						
						
						Bumps [rails](https://github.com/rails/rails ) from 6.1.3.2 to 6.1.4.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.3.2...v6.1.4 )
---
updated-dependencies:
- dependency-name: rails
  dependency-type: direct:production
  update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-07-04 05:07:32 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						1e2097afd4 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						
						
						
					 
					
						2021-07-02 16:12:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						01de07c91a 
					 
					
						
						
							
							Bump rubocop from 1.17.0 to 1.18.1 ( #16451 )  
						
						 
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.17.0 to 1.18.1.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.17.0...v1.18.1 )
---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-07-01 01:59:58 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						3460df6fe3 
					 
					
						
						
							
							Bump sidekiq-unique-jobs from 7.0.12 to 7.1.1 ( #16450 )  
						
						 
						
						... 
						
						
						
						Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.0.12 to 7.1.1.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.12...v7.1.1 )
---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-07-01 00:45:49 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						83b4e8584b 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						
						
						
					 
					
						2021-06-24 18:59:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						9cd724a3b4 
					 
					
						
						
							
							Bump rubocop from 1.16.1 to 1.17.0 ( #16424 )  
						
						 
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.16.1 to 1.17.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.16.1...v1.17.0 )
---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-06-25 00:55:34 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						afc170a231 
					 
					
						
						
							
							Bump rubocop-rails from 2.10.1 to 2.11.0 ( #16419 )  
						
						 
						
						... 
						
						
						
						Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.10.1...v2.11.0 )
---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-06-24 23:57:03 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						4aa78027ea 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						... 
						
						
						
						Conflicts:
- `Gemfile.lock`: upstream-updated dependency (redis) textually too close to
   glitch-specific one (redcarpet).
   Ported upstream change. 
						
						
					 
					
						2021-06-16 11:24:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						42dc78569f 
					 
					
						
						
							
							Bump redis from 4.2.5 to 4.3.1 ( #16396 )  
						
						 
						
						... 
						
						
						
						Bumps [redis](https://github.com/redis/redis-rb ) from 4.2.5 to 4.3.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.2.5...v4.3.1 )
---
updated-dependencies:
- dependency-name: redis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-06-14 23:58:47 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						0b72aecab3 
					 
					
						
						
							
							Bump sidekiq-scheduler from 3.0.1 to 3.1.0 ( #16365 )  
						
						 
						
						... 
						
						
						
						Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler ) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases )
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.0.1...v3.1.0 )
---
updated-dependencies:
- dependency-name: sidekiq-scheduler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-06-10 23:46:18 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						a1c7ab968a 
					 
					
						
						
							
							Bump rubocop from 1.15.0 to 1.16.0 ( #16368 )  
						
						 
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.15.0 to 1.16.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.15.0...v1.16.0 )
---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-06-10 23:46:04 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						9abf81d10e 
					 
					
						
						
							
							Bump aws-sdk-s3 from 1.95.1 to 1.96.0 ( #16372 )  
						
						 
						
						... 
						
						
						
						Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.95.1 to 1.96.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-06-10 23:45:27 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						fb8c5979b4 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						
						
						
					 
					
						2021-05-31 11:53:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						cf08a595af 
					 
					
						
						
							
							Bump rubocop from 1.14.0 to 1.15.0 ( #16300 )  
						
						 
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.14.0 to 1.15.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.14.0...v1.15.0 )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-05-29 09:17:34 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						30cdedfa6e 
					 
					
						
						
							
							Bump httplog from 1.4.3 to 1.5.0 ( #16303 )  
						
						 
						
						... 
						
						
						
						Bumps [httplog](https://github.com/trusche/httplog ) from 1.4.3 to 1.5.0.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/v1.5.0/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.4.3...v1.5.0 )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-05-29 09:17:23 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						10a31a934f 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						... 
						
						
						
						Conflicts:
- `README.md`:
  Upstream's README got updated, but we have a completely different one.
  Kept ours. 
						
						
					 
					
						2021-05-27 17:58:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						2efe711a51 
					 
					
						
						
							
							Bump aws-sdk-s3 from 1.94.1 to 1.95.0 ( #16298 )  
						
						 
						
						... 
						
						
						
						Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.94.1 to 1.95.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/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> 
						
						
					 
					
						2021-05-27 17:55:25 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						01dfa58aab 
					 
					
						
						
							
							Bump webpacker from 5.3.0 to 5.4.0 ( #16297 )  
						
						 
						
						... 
						
						
						
						Bumps [webpacker](https://github.com/rails/webpacker ) from 5.3.0 to 5.4.0.
- [Release notes](https://github.com/rails/webpacker/releases )
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/webpacker/compare/v5.3.0...v5.4.0 )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-05-27 17:48:18 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						5f334807d2 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						
						
						
					 
					
						2021-05-22 13:11:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						dc86f709e3 
					 
					
						
						
							
							Bump simple-navigation from 4.1.0 to 4.3.0 ( #16255 )  
						
						 
						
						... 
						
						
						
						Bumps [simple-navigation](https://github.com/codeplant/simple-navigation ) from 4.1.0 to 4.3.0.
- [Release notes](https://github.com/codeplant/simple-navigation/releases )
- [Changelog](https://github.com/codeplant/simple-navigation/blob/master/CHANGELOG.md )
- [Commits](https://github.com/codeplant/simple-navigation/commits/v4.3.0 )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-05-22 00:52:32 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						8ce6cc8bf9 
					 
					
						
						
							
							Bump faker from 2.17.0 to 2.18.0 ( #16259 )  
						
						 
						
						... 
						
						
						
						Bumps [faker](https://github.com/faker-ruby/faker ) from 2.17.0 to 2.18.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.17.0...v2.18.0 )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-05-22 00:49:03 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						3012a12f02 
					 
					
						
						
							
							Bump webmock from 3.12.2 to 3.13.0 ( #16254 )  
						
						 
						
						... 
						
						
						
						Bumps [webmock](https://github.com/bblimke/webmock ) from 3.12.2 to 3.13.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.12.2...v3.13.0 )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-05-22 00:46:44 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						7ac8bcf209 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						
						
						
					 
					
						2021-05-10 21:45:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						a8cce402e0 
					 
					
						
						
							
							Bump rubocop from 1.13.0 to 1.14.0 ( #16192 )  
						
						 
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.13.0...v1.14.0 )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-05-10 17:41:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						04e4e864c1 
					 
					
						
						
							
							Bump rqrcode from 1.2.0 to 2.0.0 ( #16198 )  
						
						 
						
						... 
						
						
						
						Bumps [rqrcode](https://github.com/whomwah/rqrcode ) from 1.2.0 to 2.0.0.
- [Release notes](https://github.com/whomwah/rqrcode/releases )
- [Changelog](https://github.com/whomwah/rqrcode/blob/master/CHANGELOG.md )
- [Commits](https://github.com/whomwah/rqrcode/compare/v1.2.0...v2.0.0 )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-05-10 17:36:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						43e8b4982f 
					 
					
						
						
							
							Bump rubocop-rails from 2.9.1 to 2.10.1 ( #16193 )  
						
						 
						
						... 
						
						
						
						Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.9.1 to 2.10.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.9.1...v2.10.1 )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-05-10 17:35:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						10cd2d1e86 
					 
					
						
						
							
							Bump puma from 5.2.2 to 5.3.0 ( #16194 )  
						
						 
						
						... 
						
						
						
						Bumps [puma](https://github.com/puma/puma ) from 5.2.2 to 5.3.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v5.2.2...v5.3.0 )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-05-10 17:27:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Claire 
							
						 
					 
					
						
						
							
						
						50b430d9a2 
					 
					
						
						
							
							Merge branch 'main' into glitch-soc/merge-upstream  
						
						 
						
						... 
						
						
						
						- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes. 
						
						
					 
					
						2021-05-07 18:21:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						b44585aa89 
					 
					
						
						
							
							Bump webpacker from 5.2.1 to 5.3.0 ( #16144 )  
						
						 
						
						... 
						
						
						
						Bumps [webpacker](https://github.com/rails/webpacker ) from 5.2.1 to 5.3.0.
- [Release notes](https://github.com/rails/webpacker/releases )
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/webpacker/compare/v5.2.1...v5.3.0 )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-05-07 12:33:21 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						9e5bdd8007 
					 
					
						
						
							
							Bump devise from 4.7.3 to 4.8.0 ( #16140 )  
						
						 
						
						... 
						
						
						
						Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.3 to 4.8.0.
- [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.3...v4.8.0 )
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
						
						
					 
					
						2021-05-07 12:27:58 +09:00