dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						1170073a67 
					 
					
						
						
							
							Bump rubocop-rails from 2.4.2 to 2.5.2 ( #13459 )  
						
						... 
						
						
						
						Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.2 to 2.5.2.
- [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.2...v2.5.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-04-13 23:36:57 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						00df65df77 
					 
					
						
						
							
							Bump capistrano from 3.12.1 to 3.13.0 ( #13455 )  
						
						... 
						
						
						
						Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.12.1 to 3.13.0.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.12.1...v3.13.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-04-13 23:33:53 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						fdd0beefa7 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours. 
						
						
					 
					
						2020-04-12 16:50:27 +02:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						42389bda80 
					 
					
						
						
							
							Bump annotate from 3.0.3 to 3.1.1 ( #13417 )  
						
						... 
						
						
						
						Bumps [annotate](https://github.com/ctran/annotate_models ) from 3.0.3 to 3.1.1.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ctran/annotate_models/compare/v3.0.3...v3.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-04-10 03:32:39 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						9101254d0a 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes. 
						
						
					 
					
						2020-04-05 18:32:06 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						5c2e63acd5 
					 
					
						
						
							
							Bump rails from 5.2.4.1 to 5.2.4.2 and kind-of from 6.0.2 to 6.0.3 ( #13387 )  
						
						... 
						
						
						
						* Bump rails from 5.2.4.1 to 5.2.4.2
* Bump kind-of from 6.0.2 to 6.0.3 
						
						
					 
					
						2020-04-04 23:24:59 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						f3eff922a3 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update. 
						
						
					 
					
						2020-04-02 20:32:00 +02:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						69558d2fe5 
					 
					
						
						
							
							Bump rspec-rails from 3.9.1 to 4.0.0 ( #13364 )  
						
						... 
						
						
						
						Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.9.1 to 4.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-04-02 18:54:41 +02:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						77772baf34 
					 
					
						
						
							
							Bump tty-prompt from 0.20.0 to 0.21.0 ( #13366 )  
						
						... 
						
						
						
						Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.20.0 to 0.21.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases )
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.20.0...v0.21.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-04-01 10:02:24 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						66e82e9506 
					 
					
						
						
							
							Bump faker from 2.10.1 to 2.11.0 ( #13363 )  
						
						... 
						
						
						
						Bumps [faker](https://github.com/faker-ruby/faker ) from 2.10.1 to 2.11.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/commits/v2.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-04-01 10:01:50 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						caabc0ee76 
					 
					
						
						
							
							Bump parallel_tests from 2.30.1 to 2.32.0 ( #13341 )  
						
						... 
						
						
						
						Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.30.1 to 2.32.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.1...v2.32.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-03-31 12:44:33 +02:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						a37ff2bd8b 
					 
					
						
						
							
							Bump better_errors from 2.5.1 to 2.6.0 ( #13340 )  
						
						... 
						
						
						
						Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-03-31 12:42:44 +02:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						1bcf466fb1 
					 
					
						
						
							
							Bump ox from 2.12.1 to 2.13.2 ( #13342 )  
						
						... 
						
						
						
						Bumps [ox](https://github.com/ohler55/ox ) from 2.12.1 to 2.13.2.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.12.1...v2.13.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-03-31 12:42:17 +02:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						bf1919e44a 
					 
					
						
						
							
							Bump brakeman from 4.7.2 to 4.8.0 ( #13309 )  
						
						... 
						
						
						
						Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.7.2 to 4.8.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.7.2...v4.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-03-27 22:35:49 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						7b435fd9bf 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly. 
						
						
					 
					
						2020-03-27 21:54:44 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						c1a82d9538 
					 
					
						
						
							
							Bump aws-sdk-s3 from 1.60.1 to 1.61.1 ( #13306 )  
						
						... 
						
						
						
						Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.60.1 to 1.61.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-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-03-25 22:49:27 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						3d7264a94e 
					 
					
						
						
							
							Bump discard from 1.1.0 to 1.2.0 ( #13308 )  
						
						... 
						
						
						
						Bumps [discard](https://github.com/jhawthorn/discard ) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/jhawthorn/discard/releases )
- [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jhawthorn/discard/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-03-25 22:48:52 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						9abb227250 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes. 
						
						
					 
					
						2020-03-22 16:10:44 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						56531d646e 
					 
					
						
						
							
							Bump sidekiq from 5.2.7 to 6.0.4 ( #11727 )  
						
						... 
						
						
						
						* Bump sidekiq from 5.2.7 to 6.0.0
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.7 to 6.0.0.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.7...v6.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* Sidekiq::Logger.logger -> Sidekiq.logger
* Drop support Ruby 2.4
* update
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh > 
						
						
					 
					
						2020-03-21 12:04:54 +09:00 
						 
				 
			
				
					
						
							
							
								Shlee 
							
						 
					 
					
						
						
							
						
						b5dace62b0 
					 
					
						
						
							
							Decommission support for Ruby 2.4 ( #13287 )  
						
						... 
						
						
						
						* Update Gemfile
* Update README.md 
						
						
					 
					
						2020-03-21 03:10:24 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						c39ad4ab2f 
					 
					
						
						
							
							Bump capistrano from 3.11.2 to 3.12.1 ( #13264 )  
						
						... 
						
						
						
						* Bump capistrano from 3.11.2 to 3.12.1
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.11.2 to 3.12.1.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.2...v3.12.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* Bump capistrano from 3.11.2 to 3.12.1
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh > 
						
						
					 
					
						2020-03-18 21:48:03 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						7088633ae1 
					 
					
						
						
							
							Bump cld3 from 3.2.6 to 3.3.0 ( #13107 )  
						
						... 
						
						
						
						* Bump cld3 from 3.2.6 to 3.3.0
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby ) from 3.2.6 to 3.3.0.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases )
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.6...v3.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* Fix compatibility with cld3 3.3.0
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com > 
						
						
					 
					
						2020-03-09 00:12:52 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						c790ecb14d 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict due to upstream adding a new parameter (with_rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/services/post_status_service.rb`:
  Conflict due to upstream adding a new parameter (rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to us not exposing theme settings here (as we have
  a different flavour/skin menu).
  Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
  Coding style fixes for a part we have rewritten.
  Discarded upstream changes. 
						
						
					 
					
						2020-03-08 19:38:53 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						764b89939f 
					 
					
						
						
							
							Bump doorkeeper from 5.2.3 to 5.3.1 ( #13144 )  
						
						... 
						
						
						
						Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.2.3 to 5.3.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.3...v.5.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 
						
						
					 
					
						2020-03-08 16:22:12 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						74c2490cdd 
					 
					
						
						
							
							Bump strong_migrations from 0.5.1 to 0.6.2 ( #13071 )  
						
						... 
						
						
						
						Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.5.1 to 0.6.2.
- [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.1...v0.6.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-03-02 21:44:44 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						b0a7cb71be 
					 
					
						
						
							
							Update glitch-soc-specific dependencies  
						
						... 
						
						
						
						- drop html2text which has been unused in a while
- update redcarpet 
						
						
					 
					
						2020-02-29 22:32:33 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						85933bc9ff 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2020-02-25 14:28:13 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						89a9eeb675 
					 
					
						
						
							
							Bump rack from 2.1.2 to 2.2.2 ( #13108 )  
						
						... 
						
						
						
						Bumps [rack](https://github.com/rack/rack ) from 2.1.2 to 2.2.2.
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/2.1.2...v2.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-02-20 09:24:16 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						e037002401 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2020-02-19 23:04:18 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						879b71eacb 
					 
					
						
						
							
							Bump json-ld-preloaded from 3.0.6 to 3.1.0 ( #12982 )  
						
						... 
						
						
						
						Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.0.6 to 3.1.0.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.6...3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-02-10 21:26:53 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						432e00af7c 
					 
					
						
						
							
							Bump capybara from 3.30.0 to 3.31.0 ( #12983 )  
						
						... 
						
						
						
						Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.30.0 to 3.31.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.30.0...3.31.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-02-10 20:51:14 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						925159abf0 
					 
					
						
						
							
							Bump simplecov from 0.17.1 to 0.18.1 ( #13027 )  
						
						... 
						
						
						
						Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.17.1 to 0.18.1.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.17.1...v0.18.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-02-10 20:46:25 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						dc8d57d092 
					 
					
						
						
							
							Bump pry-byebug from 3.7.0 to 3.8.0 ( #12985 )  
						
						... 
						
						
						
						Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug ) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.7.0...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-02-10 20:46:05 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						170e8e0725 
					 
					
						
						
							
							Bump letter_opener_web from 1.3.4 to 1.4.0 ( #13028 )  
						
						... 
						
						
						
						Bumps [letter_opener_web](https://github.com/fgrehm/letter_opener_web ) from 1.3.4 to 1.4.0.
- [Release notes](https://github.com/fgrehm/letter_opener_web/releases )
- [Changelog](https://github.com/fgrehm/letter_opener_web/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fgrehm/letter_opener_web/compare/v1.3.4...v1.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-02-10 20:28:22 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						dae5e446fe 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `Gemfile`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `Gemfile.lock`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
  Upstream added better unsupported link stripping,
  while we had different sanitizing configs.
  Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
  Strings unused in glitch-soc had been removed from
  glitch-soc, reintroduced them even if they are not
  useful, to reduce the risk of later merge conflicts. 
						
						
					 
					
						2020-02-09 12:15:55 +01:00 
						 
				 
			
				
					
						
							
							
								mayaeh 
							
						 
					 
					
						
						
							
						
						57c42c20c0 
					 
					
						
						
							
							Bump httplog from 1.4.1 to 1.4.2 ( #13059 )  
						
						
						
						
					 
					
						2020-02-09 12:05:31 +01:00 
						 
				 
			
				
					
						
							
							
								Lynne 
							
						 
					 
					
						
						
							
						
						05064757d9 
					 
					
						
						
							
							update gemfile to reflect yanked httplog 1.4.0  
						
						
						
						
					 
					
						2020-02-09 09:49:28 +01:00 
						 
				 
			
				
					
						
							
							
								mayaeh 
							
						 
					 
					
						
						
							
						
						d9a4ce4ca2 
					 
					
						
						
							
							Bump httplog from 1.4.0 to 1.4.1. ( #13051 )  
						
						... 
						
						
						
						httplog 1.4.0 is yanked. 
						
						
					 
					
						2020-02-08 21:39:44 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						44744e3ce1 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2020-01-28 19:15:03 +01:00 
						 
				 
			
				
					
						
							
							
								Shlee 
							
						 
					 
					
						
						
							
						
						720fee0685 
					 
					
						
						
							
							Bump Rack from 2.0.8 to 2.1.2 ( #12991 )  
						
						... 
						
						
						
						* Update Gemfile
* Update Gemfile.lock 
						
						
					 
					
						2020-01-28 15:23:16 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						c56a504d11 
					 
					
						
						
							
							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. 
						
						
					 
					
						2020-01-27 15:46:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daigo 3 Dango 
							
						 
					 
					
						
						
							
						
						7b8e0d3477 
					 
					
						
						
							
							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...>
``` 
						
						
					 
					
						2020-01-27 11:06:34 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						dc2ab6e646 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places. 
						
						
					 
					
						2020-01-20 18:31:11 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						06f6995860 
					 
					
						
						
							
							Bump httplog from 1.3.3 to 1.4.0 ( #12902 )  
						
						... 
						
						
						
						Bumps [httplog](https://github.com/trusche/httplog ) from 1.3.3 to 1.4.0.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.3.3...v1.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-01-20 23:45:10 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						45709d6987 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/master  
						
						... 
						
						
						
						Conflicts:
- `README.md`:
  We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `yarn.lock`:
  No real conflict, glitch-specific dependency too close to
  an updated one. Adapted upstream change. 
						
						
					 
					
						2020-01-20 15:00:22 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						4bdbaf809b 
					 
					
						
						
							
							Bump webmock from 3.7.6 to 3.8.0 ( #12900 )  
						
						... 
						
						
						
						Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.6 to 3.8.0.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.6...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-01-20 12:46:03 +01:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						114ee287dc 
					 
					
						
						
							
							Remove derailed_benchmarks dependency ( #12861 )  
						
						
						
						
					 
					
						2020-01-14 00:43:12 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						031a432559 
					 
					
						
						
							
							Bump ox from 2.11.0 to 2.12.1 ( #12853 )  
						
						... 
						
						
						
						Bumps [ox](https://github.com/ohler55/ox ) from 2.11.0 to 2.12.1.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.11.0...v2.12.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-01-14 03:02:20 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						2950b09706 
					 
					
						
						
							
							Bump json-ld from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0 ( #12852 )  
						
						... 
						
						
						
						Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0. This release includes the previously tagged commit.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](e742697a09support@dependabot.com > 
						
						
					 
					
						2020-01-14 03:01:43 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						a0ad1f5cda 
					 
					
						
						
							
							Bump rubocop from 0.78.0 to 0.79.0 ( #12851 )  
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.78.0 to 0.79.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.78.0...v0.79.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-01-14 02:58:56 +09:00