Thibaut Girka 
							
						 
					 
					
						
						
							
						
						980c004f06 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `Gemfile.lock`:
  No real conflict, glitch-soc-only dependency (redcarpet) too close to an
  upstream one (rdf-normalize)
- `README.md`:
  we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
  No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
  Upstream added code to keep bookmarked statuses, we were already doing so
  with slightly different code. Discarded upstream's changes.
- `package.json`:
  No real conflict, glitch-soc-only dependency (favico.js) too close to
  an upstream one 
						
						
					 
					
						2020-01-12 15:57:34 +01:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
						
						24cd2126c6 
					 
					
						
						
							
							Fix Ruby 2.7 support ( #12831 )  
						
						... 
						
						
						
						- update http gem to avoid errors
- update blurhash gem to avoid shared object loading error
- update goldfinger gem so the http gem could be updated
- update json gem to avoid warnings 
						
						
					 
					
						2020-01-12 15:49:30 +01:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
						
						57e2833f6a 
					 
					
						
						
							
							Remove dependency on OStatus2 gem ( #12822 )  
						
						
						
						
					 
					
						2020-01-11 21:36:53 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						2a5dee0f08 
					 
					
						
						
							
							Bump rqrcode from 0.10.1 to 1.1.2 ( #12357 )  
						
						... 
						
						
						
						Bumps [rqrcode](https://github.com/whomwah/rqrcode ) from 0.10.1 to 1.1.2.
- [Release notes](https://github.com/whomwah/rqrcode/releases )
- [Commits](https://github.com/whomwah/rqrcode/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-01-11 19:51:04 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						d1f68fb589 
					 
					
						
						
							
							Bump rdf-normalize from 0.3.3 to 0.4.0 ( #12785 )  
						
						... 
						
						
						
						Bumps [rdf-normalize](https://github.com/gkellogg/rdf-normalize ) from 0.3.3 to 0.4.0.
- [Release notes](https://github.com/gkellogg/rdf-normalize/releases )
- [Commits](https://github.com/gkellogg/rdf-normalize/compare/0.3.3...0.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-01-11 07:02:16 +09:00 
						 
				 
			
				
					
						
							
							
								Shlee 
							
						 
					 
					
						
						
							
						
						e326b0dda1 
					 
					
						
						
							
							Upgrade CircleCI testing to Ruby 2.4-2.7 ( #12800 )  
						
						... 
						
						
						
						* Update config.yml
* Update Gemfile 
						
						
					 
					
						2020-01-10 05:34:25 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						578553ba05 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2020-01-07 16:28:59 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						746c4131ec 
					 
					
						
						
							
							Bump aws-sdk-s3 from 1.59.0 to 1.60.1 ( #12784 )  
						
						... 
						
						
						
						Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.59.0 to 1.60.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.59.0...v1.60.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-01-06 23:03:05 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						1d039c27f8 
					 
					
						
						
							
							Bump bullet from 6.0.2 to 6.1.0 ( #12782 )  
						
						... 
						
						
						
						Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.2...6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-01-06 23:02:46 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						974a015d95 
					 
					
						
						
							
							Bump capybara from 3.29.0 to 3.30.0 ( #12781 )  
						
						... 
						
						
						
						Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.29.0 to 3.30.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.29.0...3.30.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-01-06 22:56:04 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						01eaeab56d 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system. 
						
						
					 
					
						2020-01-04 23:04:42 +01:00 
						 
				 
			
				
					
						
							
							
								Shlee 
							
						 
					 
					
						
						
							
						
						3537bb1b52 
					 
					
						
						
							
							Gemfile Updates - Ruby 2.7 prep ( #12758 )  
						
						... 
						
						
						
						* Update Gemfile
* Update Gemfile 
						
						
					 
					
						2020-01-04 22:48:34 +01:00 
						 
				 
			
				
					
						
							
							
								Shlee 
							
						 
					 
					
						
						
							
						
						882a7d3d14 
					 
					
						
						
							
							Gemfile Updates - fixes warnings ( #12759 )  
						
						... 
						
						
						
						* Update Gemfile.lock
* Update Gemfile.lock
* Update Gemfile 
						
						
					 
					
						2020-01-04 22:48:18 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						d5f93ea618 
					 
					
						
						
							
							Bump pg from 1.1.4 to 1.2.0 ( #12725 )  
						
						... 
						
						
						
						Bumps [pg](https://github.com/ged/ruby-pg ) from 1.1.4 to 1.2.0.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.1.4...v1.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-31 00:21:51 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						a439fc7f72 
					 
					
						
						
							
							Bump redis-namespace from 1.6.0 to 1.7.0 ( #12727 )  
						
						... 
						
						
						
						Bumps [redis-namespace](https://github.com/resque/redis-namespace ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/resque/redis-namespace/releases )
- [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md )
- [Commits](https://github.com/resque/redis-namespace/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-31 00:16:45 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						333009d8b1 
					 
					
						
						
							
							Bump faker from 2.9.0 to 2.10.0 ( #12728 )  
						
						... 
						
						
						
						Bumps [faker](https://github.com/faker-ruby/faker ) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.9.0...v2.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-31 00:15:16 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						ad29279214 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `README.md`
- `package.json` 
						
						
					 
					
						2019-12-28 17:48:40 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						ea08fc7dd2 
					 
					
						
						
							
							Bump rubocop from 0.77.0 to 0.78.0 ( #12677 )  
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.77.0 to 0.78.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.77.0...v0.78.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-25 02:27:14 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						ab25e9e691 
					 
					
						
						
							
							Bump faker from 2.8.1 to 2.9.0 ( #12680 )  
						
						... 
						
						
						
						Bumps [faker](https://github.com/faker-ruby/faker ) from 2.8.1 to 2.9.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.8.1...v2.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-25 02:25:14 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						28376b319b 
					 
					
						
						
							
							Bump oj from 3.9.2 to 3.10.0 ( #12683 )  
						
						... 
						
						
						
						Bumps [oj](https://github.com/ohler55/oj ) from 3.9.2 to 3.10.0.
- [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.9.2...v3.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-23 22:35:04 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						ab5ff638f2 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/master  
						
						... 
						
						
						
						Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc 
						
						
					 
					
						2019-12-19 13:52:54 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						45f8968404 
					 
					
						
						
							
							Bump rails from 5.2.3 to 5.2.4 ( #12584 )  
						
						... 
						
						
						
						* Bump rails from 5.2.3 to 5.2.4
Bumps [rails](https://github.com/rails/rails ) from 5.2.3 to 5.2.4.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.3...v5.2.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* sprockets ~> 3.7 
						
						
					 
					
						2019-12-18 08:58:53 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						71b4e2dcbb 
					 
					
						
						
							
							Bump parallel_tests from 2.29.2 to 2.30.0 ( #12634 )  
						
						... 
						
						
						
						Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.29.2 to 2.30.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.2...v2.30.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-18 03:32:51 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						bc6141b085 
					 
					
						
						
							
							Bump rubocop from 0.76.0 to 0.77.0 ( #12585 )  
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.76.0 to 0.77.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.76.0...v0.77.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-13 02:57:32 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						be4849c083 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system 
						
						
					 
					
						2019-12-12 15:40:06 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						d08a497946 
					 
					
						
						
							
							Bump aws-sdk-s3 from 1.57.0 to 1.59.0 ( #12581 )  
						
						... 
						
						
						
						Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.57.0 to 1.59.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/compare/v1.57.0...v1.59.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-11 20:39:11 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						ba2eac8824 
					 
					
						
						
							
							Bump strong_migrations from 0.4.2 to 0.5.0 ( #12583 )  
						
						... 
						
						
						
						Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.4.2 to 0.5.0.
- [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.4.2...v0.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-11 00:55:03 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						abcba5c198 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- package.json
  Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
  Not really a conflict, caused by an additional dependency in glitch-soc. 
						
						
					 
					
						2019-12-07 12:28:59 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						0465d2a3ce 
					 
					
						
						
							
							[Security] Bump puma from 4.2.0 to 4.3.1 ( #12559 )  
						
						... 
						
						
						
						Bumps [puma](https://github.com/puma/puma ) from 4.2.0 to 4.3.1. **This update includes a security fix.**
- [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/v4.2.0...v4.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-06 19:44:09 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						5097a8d12c 
					 
					
						
						
							
							Bump faker from 2.7.0 to 2.8.0 ( #12531 )  
						
						... 
						
						
						
						Bumps [faker](https://github.com/faker-ruby/faker ) from 2.7.0 to 2.8.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.7.0...v2.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-03 02:38:17 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						f64a132396 
					 
					
						
						
							
							Bump aws-sdk-s3 from 1.55.0 to 1.57.0 ( #12528 )  
						
						... 
						
						
						
						Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.55.0 to 1.57.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/compare/v1.55.0...v1.57.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-02 23:03:46 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						c9249fbb15 
					 
					
						
						
							
							Bump tty-prompt from 0.19.0 to 0.20.0 ( #12529 )  
						
						... 
						
						
						
						Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.19.0 to 0.20.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.19.0...v0.20.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-02 22:58:07 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						99f9579a04 
					 
					
						
						
							
							Bump rubocop-rails from 2.3.2 to 2.4.0 ( #12532 )  
						
						... 
						
						
						
						Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.2 to 2.4.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.3.2...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-02 22:56:53 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						0a1824d0f0 
					 
					
						
						
							
							Bump fabrication from 2.20.2 to 2.21.0 ( #12527 )  
						
						... 
						
						
						
						Bumps [fabrication](https://github.com/paulelliott/fabrication ) from 2.20.2 to 2.21.0.
- [Release notes](https://github.com/paulelliott/fabrication/releases )
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown )
- [Commits](https://github.com/paulelliott/fabrication/compare/2.20.2...2.21.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-12-02 22:55:43 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						2b7158427f 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2019-11-30 17:29:44 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						8040923501 
					 
					
						
						
							
							Bump net-ldap from 0.16.1 to 0.16.2 ( #12479 )  
						
						... 
						
						
						
						Bumps [net-ldap](https://github.com/ruby-ldap/ruby-net-ldap ) from 0.16.1 to 0.16.2.
- [Release notes](https://github.com/ruby-ldap/ruby-net-ldap/releases )
- [Changelog](https://github.com/ruby-ldap/ruby-net-ldap/blob/master/History.rdoc )
- [Commits](https://github.com/ruby-ldap/ruby-net-ldap/compare/v0.16.1...v0.16.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-11-27 21:33:20 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						c455a314fd 
					 
					
						
						
							
							Bump parallel from 1.18.0 to 1.19.1 ( #12475 )  
						
						... 
						
						
						
						Bumps [parallel](https://github.com/grosser/parallel ) from 1.18.0 to 1.19.1.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.18.0...v1.19.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-11-27 20:49:19 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						d4a2467c81 
					 
					
						
						
							
							Bump rack-cors from 1.0.6 to 1.1.0 ( #12477 )  
						
						... 
						
						
						
						Bumps [rack-cors](https://github.com/cyu/rack-cors ) from 1.0.6 to 1.1.0.
- [Release notes](https://github.com/cyu/rack-cors/releases )
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md )
- [Commits](https://github.com/cyu/rack-cors/compare/v1.0.6...v1.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-11-27 11:59:57 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						19feb9b667 
					 
					
						
						
							
							Bump charlock_holmes from 0.7.6 to 0.7.7 ( #12474 )  
						
						... 
						
						
						
						Bumps [charlock_holmes](https://github.com/brianmario/charlock_holmes ) from 0.7.6 to 0.7.7.
- [Release notes](https://github.com/brianmario/charlock_holmes/releases )
- [Commits](https://github.com/brianmario/charlock_holmes/compare/0.7.6...v0.7.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-11-27 11:53:50 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						7c9cb9d7e8 
					 
					
						
						
							
							Bump pghero from 2.3.0 to 2.4.1 ( #12478 )  
						
						... 
						
						
						
						Bumps [pghero](https://github.com/ankane/pghero ) from 2.3.0 to 2.4.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.3.0...v2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-11-27 09:03:02 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						d52e27f3db 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2019-11-20 17:57:17 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						5605b828e5 
					 
					
						
						
							
							Bump webpacker from 4.0.7 to 4.2.0 ( #12416 )  
						
						... 
						
						
						
						* Bump webpacker from 4.0.7 to 4.2.0
Bumps [webpacker](https://github.com/rails/webpacker ) from 4.0.7 to 4.2.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/v4.0.7...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* Use NODE_ENV=tests instead of test, to work around async modules not having a chunk 
						
						
					 
					
						2019-11-20 17:56:11 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						ff67385cfb 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code 
						
						
					 
					
						2019-11-20 15:36:09 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						4e992e4ea8 
					 
					
						
						
							
							Bump aws-sdk-s3 from 1.52.0 to 1.55.0 ( #12419 )  
						
						... 
						
						
						
						Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.52.0 to 1.55.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/compare/v1.52.0...v1.55.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-11-18 22:40:16 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						f2362f642a 
					 
					
						
						
							
							Bump rack-attack from 6.1.0 to 6.2.1 ( #12421 )  
						
						... 
						
						
						
						Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 6.1.0 to 6.2.1.
- [Release notes](https://github.com/kickstarter/rack-attack/releases )
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kickstarter/rack-attack/compare/v6.1.0...v6.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-11-18 22:26:08 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						a3a109d12c 
					 
					
						
						
							
							Bump parallel from 1.17.0 to 1.18.0 ( #12358 )  
						
						... 
						
						
						
						Bumps [parallel](https://github.com/grosser/parallel ) from 1.17.0 to 1.18.0.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.17.0...v1.18.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-11-11 22:43:43 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						b0c4eb28e0 
					 
					
						
						
							
							Bump rubocop from 0.75.1 to 0.76.0 ( #12355 )  
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.75.1 to 0.76.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.75.1...v0.76.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-11-11 22:42:50 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						6fa2f3eba3 
					 
					
						
						
							
							Bump faker from 2.6.0 to 2.7.0 ( #12354 )  
						
						... 
						
						
						
						Bumps [faker](https://github.com/faker-ruby/faker ) from 2.6.0 to 2.7.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.6.0...v2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-11-11 22:38:07 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						e311131176 
					 
					
						
						
							
							Bump stoplight from 2.1.3 to 2.2.0 ( #12360 )  
						
						... 
						
						
						
						Bumps [stoplight](https://github.com/orgsync/stoplight ) from 2.1.3 to 2.2.0.
- [Release notes](https://github.com/orgsync/stoplight/releases )
- [Changelog](https://github.com/orgsync/stoplight/blob/master/CHANGELOG.md )
- [Commits](https://github.com/orgsync/stoplight/compare/v2.1.3...v2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-11-11 22:34:48 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						c6960938dd 
					 
					
						
						
							
							Bump fuubar from 2.4.1 to 2.5.0 ( #12356 )  
						
						... 
						
						
						
						Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/thekompanee/fuubar/releases )
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.4.1...releases/v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2019-11-11 22:05:16 +09:00