tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
8,387 Commits 20 Branches 113 Tags 222 MiB
eff1c94744
Commit Graph

434 Commits

Author SHA1 Message Date
Thibaut Girka
eff1c94744 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-13 14:41:06 +01:00
dependabot[bot]
43ff92dfc8 Bump sidekiq from 5.2.3 to 5.2.5 (#9765) 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.3 to 5.2.5.
- [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.3...v5.2.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-11 07:27:04 +00:00
dependabot[bot]
b7ace49a73 Bump webpush from 0.3.5 to 0.3.6 (#9783) 
Bumps [webpush](https://github.com/zaru/webpush) from 0.3.5 to 0.3.6.
- [Release notes](https://github.com/zaru/webpush/releases)
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zaru/webpush/compare/v0.3.5...v0.3.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-11 07:26:25 +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]
a16638e500 Bump parallel_tests from 2.27.0 to 2.27.1 (#9703) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.27.0 to 2.27.1.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.27.0...v2.27.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-03 15:59:04 +09:00
dependabot[bot]
71db4f642c Bump webpush from 0.3.4 to 0.3.5 (#9701) 
Bumps [webpush](https://github.com/zaru/webpush) from 0.3.4 to 0.3.5.
- [Release notes](https://github.com/zaru/webpush/releases)
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zaru/webpush/compare/v0.3.4...v0.3.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-03 15:58:04 +09:00
dependabot[bot]
9790f3b590 Bump tty-prompt from 0.18.0 to 0.18.1 (#9683) 
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.18.0 to 0.18.1.
- [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.18.0...v0.18.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-02 22:39:40 +01:00
dependabot[bot]
bee6fd52ed Bump pry-rails from 0.3.8 to 0.3.9 (#9682) 
Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.8 to 0.3.9.
- [Release notes](https://github.com/rweng/pry-rails/releases)
- [Commits](https://github.com/rweng/pry-rails/compare/v0.3.8...v0.3.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-02 22:39:23 +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
dependabot[bot]
75e5b61c52 Bump tzinfo-data from 1.2018.7 to 1.2018.9 (#9684) 
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.7 to 1.2018.9.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.7...v1.2018.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-02 22:38:18 +01:00
dependabot[bot]
ca98630f5c Bump oj from 3.7.4 to 3.7.6 (#9685) 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.4 to 3.7.6.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.4...v3.7.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-02 22:37:50 +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
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
e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
 2018-12-09 16:08:04 +01:00
dependabot[bot]
1c7061fb90 Bump rubocop from 0.61.0 to 0.61.1 (#9451) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.61.0 to 0.61.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.61.0...v0.61.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-07 16:42:50 +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]
781c7be08b Bump rails-controller-testing from 1.0.3 to 1.0.4 (#9440) 
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/rails/rails-controller-testing/releases)
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.3...v1.0.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-06 16:09:13 +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
dependabot[bot]
4ad6bac447 Bump rails-controller-testing from 1.0.2 to 1.0.3 (#9417) 
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/rails/rails-controller-testing/releases)
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.2...v1.0.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-04 09:26:55 +09:00
dependabot[bot]
2b657c175f Bump pry-rails from 0.3.7 to 0.3.8 (#9418) 
Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/rweng/pry-rails/releases)
- [Commits](https://github.com/rweng/pry-rails/compare/v0.3.7...v0.3.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-04 09:26:40 +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
bc8411ec87 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-30 20:16:26 +01:00
dependabot[bot]
d0453e77dc Bump oj from 3.7.1 to 3.7.4 (#9393) 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.1 to 3.7.4.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.1...v3.7.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-30 19:09:31 +01:00
dependabot[bot]
5866e0b909 Bump fastimage from 2.1.4 to 2.1.5 (#9395) 
Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.1.4 to 2.1.5.
- [Release notes](https://github.com/sdsykes/fastimage/releases)
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.4...v2.1.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-30 19:08:31 +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
dependabot[bot]
7f68452a15 [Security] Bump rails from 5.2.1 to 5.2.1.1 (#9383) 
Bumps [rails](https://github.com/rails/rails) from 5.2.1 to 5.2.1.1. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.1...v5.2.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-27 23:34:39 +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]
7278e32745 Bump capybara from 3.11.0 to 3.11.1 (#9305) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.11.0 to 3.11.1.
- [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.0...3.11.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-22 12:46:57 +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