dependabot[bot] 
							
						 
					 
					
						
						
							
						
						3d374ed18b 
					 
					
						
						
							
							Bump bootsnap from 1.3.2 to 1.4.0 ( #10022 )  
						
						... 
						
						
						
						Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.3.2 to 1.4.0.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.3.2...v1.4.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-02-13 02:55:06 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						0e34e91661 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2019-02-12 20:32:48 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						241661e009 
					 
					
						
						
							
							Bump rubocop from 0.63.1 to 0.64.0 ( #10006 )  
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.63.1 to 0.64.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.63.1...v0.64.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-02-12 05:11:06 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						bf94a43496 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
  Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
  Two changes too close to each other
- app/models/media_attachment.rb
  New changes too close to glitch-soc only changes.
- app/models/user.rb
  Two changes too close to each other.
- app/services/remove_status_service.rb
  Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
  Two changes too close to each other.
- config/locales/en.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
  Reverted upstream's decision of enabling posting application by default. 
						
						
					 
					
						2019-02-10 21:10:09 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						3031b8a8f2 
					 
					
						
						
							
							Bump parallel_tests from 2.27.1 to 2.28.0 ( #9985 )  
						
						... 
						
						
						
						Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.27.1 to 2.28.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.27.1...v2.28.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-02-10 18:17:34 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						e28fe2ef26 
					 
					
						
						
							
							Bump microformats from 4.0.7 to 4.1.0 ( #9980 )  
						
						... 
						
						
						
						Bumps [microformats](https://github.com/microformats/microformats-ruby ) from 4.0.7 to 4.1.0.
- [Release notes](https://github.com/microformats/microformats-ruby/releases )
- [Commits](https://github.com/microformats/microformats-ruby/compare/v4.0.7...v4.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-02-06 16:46:37 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						c5071f2d78 
					 
					
						
						
							
							Bump capybara from 3.12.0 to 3.13.2 ( #9935 )  
						
						... 
						
						
						
						Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.12.0 to 3.13.2.
- [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.12.0...3.13.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-02-03 03:40:40 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						04e2c67389 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2019-01-25 11:37:49 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						c30287cf7c 
					 
					
						
						
							
							Bump addressable from 2.5.2 to 2.6.0 ( #9888 )  
						
						... 
						
						
						
						Bumps [addressable](https://github.com/sporkmonger/addressable ) from 2.5.2 to 2.6.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases )
- [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.5.2...addressable-2.6.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-01-21 21:38:00 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						5e0cf92fd1 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						No conflicts. 
						
						
					 
					
						2019-01-19 18:28:37 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						bf31f394fb 
					 
					
						
						
							
							Bump json-ld from 2.2.1 to 3.0.2 ( #8804 )  
						
						... 
						
						
						
						Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 2.2.1 to 3.0.2.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/2.2.1...3.0.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-01-18 16:02:29 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						f424e99e46 
					 
					
						
						
							
							Bump brakeman from 4.3.1 to 4.4.0 ( #9848 )  
						
						... 
						
						
						
						Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.3.1 to 4.4.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.3.1...v4.4.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-01-18 15:57:41 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						451ae6896d 
					 
					
						
						
							
							Bump rubocop from 0.62.0 to 0.63.0 ( #9827 )  
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.62.0 to 0.63.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.62.0...v0.63.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-01-17 22:21:32 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						dbe311f0e9 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- config/locales/simple_form.pl.yml 
						
						
					 
					
						2019-01-16 14:20:07 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						ee5e24807f 
					 
					
						
						
							
							Add tootctl domains crawl ( #9809 )  
						
						
						
						
					 
					
						2019-01-15 09:24:35 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						5ac425ad28 
					 
					
						
						
							
							Bump sidekiq-unique-jobs from 5.0.10 to 6.0.8 ( #9801 )  
						
						... 
						
						
						
						Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 5.0.10 to 6.0.8.
- [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/v5.0.10...v6.0.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-01-14 09:18:55 +00:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						944de8a6c9 
					 
					
						
						
							
							Bump dotenv-rails from 2.5.0 to 2.6.0 ( #9803 )  
						
						... 
						
						
						
						Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases )
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md )
- [Commits](https://github.com/bkeepers/dotenv/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-01-14 09:13:34 +00:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						a2a64ecd3e 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- .eslintrc.yml
  Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
  Minor code cleanup when porting one of our features.
- app/models/account.rb
  Note length validation has changed upstream.
  We now use upstream's validation (dropped legacy glitch-soc
  account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
  Upstream has added support for scheduled toots, refactoring
  the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
  Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
  Not a real conflict, changes too close. 
						
						
					 
					
						2019-01-10 21:00:30 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						b418ef5ba8 
					 
					
						
						
							
							Bump nokogiri from 1.9.1 to 1.10.0 ( #9757 )  
						
						... 
						
						
						
						Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.9.1 to 1.10.0.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.9.1...v1.10.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-01-08 14:10:30 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						1c23124ba4 
					 
					
						
						
							
							Bump rubocop from 0.61.1 to 0.62.0 ( #9702 )  
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.61.1 to 0.62.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.61.1...v0.62.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-01-03 08:22:01 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						dd43cbdf25 
					 
					
						
						
							
							Bump httplog from 1.1.1 to 1.2.0 ( #9681 )  
						
						... 
						
						
						
						Bumps [httplog](https://github.com/trusche/httplog ) from 1.1.1 to 1.2.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.1.1...v1.2.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2019-01-02 22:39:02 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						571d219bb9 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock 
						
						
					 
					
						2019-01-02 15:36:53 +01:00 
						 
				 
			
				
					
						
							
							
								ashleyhull-versent 
							
						 
					 
					
						
						
							
						
						29484f6555 
					 
					
						
						
							
							Replace Ruby 2.3 with 2.6 in CircleCI ( #9652 )  
						
						... 
						
						
						
						* Update config.yml
* Update Gemfile
* dropping ruby 2.3
2.3 EOL date: scheduled for 2019-03-31
* Updating docker containers
* Update Gemfile 
						
						
					 
					
						2018-12-29 07:23:07 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						17cd443b37 
					 
					
						
						
							
							Bump webmock from 3.4.2 to 3.5.1 ( #9641 )  
						
						... 
						
						
						
						Bumps [webmock](https://github.com/bblimke/webmock ) from 3.4.2 to 3.5.1.
- [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.4.2...v3.5.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-12-27 12:23:27 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						8be0843467 
					 
					
						
						
							
							Bump cld3 from 3.2.2 to 3.2.3 ( #9632 )  
						
						... 
						
						
						
						Bumps [cld3](https://github.com/akihikodaki/cld3-ruby ) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases )
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.2...v3.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-12-26 06:39:17 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						034ffc079e 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there. 
						
						
					 
					
						2018-12-18 16:55:15 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						071eb0e202 
					 
					
						
						
							
							Bump nokogiri from 1.8.5 to 1.9.1 ( #9557 )  
						
						... 
						
						
						
						Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.8.5 to 1.9.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.5...v1.9.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-12-18 16:41:41 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						bfd0ebf925 
					 
					
						
						
							
							Bump omniauth from 1.8.1 to 1.9.0 ( #9544 )  
						
						... 
						
						
						
						Bumps [omniauth](https://github.com/omniauth/omniauth ) from 1.8.1 to 1.9.0.
- [Release notes](https://github.com/omniauth/omniauth/releases )
- [Commits](https://github.com/omniauth/omniauth/compare/v1.8.1...v1.9.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-12-17 10:15:14 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						65e994b29b 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb
Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours. 
						
						
					 
					
						2018-12-15 10:45:53 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						fcc35f6ec1 
					 
					
						
						
							
							Bump aws-sdk-s3 from 1.27.0 to 1.30.0 ( #9429 )  
						
						... 
						
						
						
						Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.27.0 to 1.30.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-12-14 20:37:29 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						7241db299c 
					 
					
						
						
							
							Bump redis from 4.0.3 to 4.1.0 ( #9520 )  
						
						... 
						
						
						
						Bumps [redis](https://github.com/redis/redis-rb ) from 4.0.3 to 4.1.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.0.3...v4.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-12-14 06:52:06 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						a48fe52375 
					 
					
						
						
							
							Bump letter_opener from 1.6.0 to 1.7.0 ( #9493 )  
						
						... 
						
						
						
						Bumps [letter_opener](https://github.com/ryanb/letter_opener ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/ryanb/letter_opener/releases )
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-12-11 14:34:02 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						f1041637ff 
					 
					
						
						
							
							Bump json-ld-preloaded from 2.2.3 to 3.0.0 ( #9416 )  
						
						... 
						
						
						
						Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 2.2.3 to 3.0.0.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/2.2.3...3.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-12-11 05:40:01 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						1df392819d 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2018-12-06 12:44:38 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						d5245434ec 
					 
					
						
						
							
							Bump rails from 5.2.1.1 to 5.2.2 ( #9430 )  
						
						... 
						
						
						
						Bumps [rails](https://github.com/rails/rails ) from 5.2.1.1 to 5.2.2.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.1.1...v5.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-12-06 16:10:18 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						c73c463478 
					 
					
						
						
							
							Bump rubocop from 0.60.0 to 0.61.0 ( #9439 )  
						
						... 
						
						
						
						Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.60.0 to 0.61.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.60.0...v0.61.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-12-06 16:08:54 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						a61ce1c947 
					 
					
						
						
							
							Bump capybara from 3.11.1 to 3.12.0 ( #9388 )  
						
						... 
						
						
						
						Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.11.1 to 3.12.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.11.1...3.12.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-12-04 09:27:17 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						d32d33f408 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2018-12-02 20:29:14 +01:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
						
						84e5ed43e7 
					 
					
						
						
							
							Preload common JSON-LD contexts ( #9412 )  
						
						... 
						
						
						
						Fixes  #9411  
					
						2018-12-02 16:46:13 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						ad7a3974cc 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2018-11-29 19:22:52 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						6fac300ea4 
					 
					
						
						
							
							Bump aws-sdk-s3 from 1.25.0 to 1.27.0 ( #9385 )  
						
						... 
						
						
						
						Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.25.0 to 1.27.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-11-28 16:34:53 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						f8e07ca5cd 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- app/models/status.rb
Resolved by taking both changes (not a real conflict, just changes too close
to each other). 
						
						
					 
					
						2018-11-27 13:23:02 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						d5fac45f5b 
					 
					
						
						
							
							Bump tty-prompt from 0.17.2 to 0.18.0 ( #9354 )  
						
						... 
						
						
						
						Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.17.2 to 0.18.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.17.2...v0.18.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-11-27 12:27:00 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						0206d569c3 
					 
					
						
						
							
							Bump simple_form from 4.0.1 to 4.1.0 ( #9331 )  
						
						... 
						
						
						
						Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/plataformatec/simple_form/releases )
- [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/simple_form/compare/v4.0.1...v4.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-11-23 14:29:59 +09:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						473998ca27 
					 
					
						
						
							
							Bump sidekiq-bulk from 0.1.1 to 0.2.0 ( #9306 )  
						
						... 
						
						
						
						Bumps [sidekiq-bulk](https://github.com/aprescott/sidekiq-bulk ) from 0.1.1 to 0.2.0.
- [Release notes](https://github.com/aprescott/sidekiq-bulk/releases )
- [Changelog](https://github.com/aprescott/sidekiq-bulk/blob/master/CHANGES.md )
- [Commits](https://github.com/aprescott/sidekiq-bulk/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-11-22 12:47:36 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						c100e82a56 
					 
					
						
						
							
							Bump aws-sdk-s3 from 1.24.0 to 1.25.0 ( #9321 )  
						
						... 
						
						
						
						Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.24.0 to 1.25.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-11-22 12:47:14 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						367ad21995 
					 
					
						
						
							
							Bump aws-sdk-s3 from 1.23.1 to 1.24.0 ( #9289 )  
						
						... 
						
						
						
						Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.23.1 to 1.24.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-11-16 11:19:09 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						96165a29ba 
					 
					
						
						
							
							Bump capybara from 3.10.1 to 3.11.0 ( #9285 )  
						
						... 
						
						
						
						Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.10.1 to 3.11.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.10.1...3.11.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-11-15 14:49:06 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						bfe2b9cc50 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2018-11-13 16:28:07 +01:00 
						 
				 
			
				
					
						
							
							
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						c81bdafb07 
					 
					
						
						
							
							Bump parallel_tests from 2.26.2 to 2.27.0 ( #9263 )  
						
						... 
						
						
						
						Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.26.2 to 2.27.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.2...v2.27.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com > 
						
						
					 
					
						2018-11-12 12:50:48 +01:00