luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-19 05:13:01 +00:00
Code Issues Projects Releases Wiki Activity
7838 commits 1 branch 0 tags 248 MiB
Commit graph

295 commits

Author SHA1 Message Date
Thibaut Girka b00f60f1d3 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-28 08:37:49 +01:00
Eugen Rochko 26fe37c414
Update i18n-tasks and change CircleCI command (#9104) 
* Update i18n-tasks and CircleCI command

* Fix #9088

* Update i18n-tasks

* Fix ast
 2018-10-28 07:15:20 +01:00
Thibaut Girka 5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml

Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.

Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.
 2018-10-26 20:41:43 +02:00
dependabot[bot] 98b4cdf198 Bump parallel_tests from 2.24.0 to 2.25.0 (#9090) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.24.0 to 2.25.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.24.0...v2.25.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-25 08:29:25 +02:00
dependabot[bot] 4e6cffe00c Bump aws-sdk-s3 from 1.21.0 to 1.23.0 (#9089) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.21.0 to 1.23.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-10-25 08:29:12 +02:00
Eugen Rochko df3a7e724d
Fix missing plural keys (#9084) 
* Update i18n-tasks to feature-missing-plural-keys

* Fix pluralizations with missing keys in Arabic

Fix #8554

* Add i18n-tasks missing-plural-keys to CircleCI
 2018-10-25 00:09:45 +02:00
dependabot[bot] 9f3283086f Bump capybara from 3.9.0 to 3.10.0 (#9077) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.9.0 to 3.10.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.9.0...3.10.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-24 23:22:18 +09:00
Thibaut Girka 8f3096b846 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-23 17:15:57 +02:00
dependabot[bot] 65867b6e61 Bump parallel_tests from 2.23.0 to 2.24.0 (#9064) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.23.0 to 2.24.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.23.0...v2.24.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-23 08:17:26 +02:00
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
 2018-10-22 17:51:38 +02:00
Eugen Rochko 4f0bdbaaaf
Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 (#9049) 
Fix #8889
 2018-10-22 16:58:36 +02:00
dependabot[bot] 8b0a980e28 Bump strong_migrations from 0.2.3 to 0.3.0 (#8991) 
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.2.3 to 0.3.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.2.3...v0.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-16 07:50:09 +02:00
dependabot[bot] 734d55c3cf Bump pundit from 1.1.0 to 2.0.0 (#8873) 
Bumps [pundit](https://github.com/varvet/pundit) from 1.1.0 to 2.0.0.
- [Release notes](https://github.com/varvet/pundit/releases)
- [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/varvet/pundit/compare/v1.1.0...v2.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-12 22:48:16 +02:00
Thibaut Girka 8f720be9f3 Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream 2018-10-11 14:12:36 +02:00
dependabot[bot] ac7df62a04 Bump better_errors from 2.4.0 to 2.5.0 (#8946) 
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.4.0...v2.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-10 19:36:41 +02:00
Thibaut Girka a02244f17c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/javascript/packs/public.js

Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
 2018-10-09 21:08:26 +02:00
dependabot[bot] 46e4a759bb Bump capistrano-rails from 1.3.1 to 1.4.0 (#8936) 
Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/capistrano/rails/releases)
- [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-09 19:43:26 +02:00
dependabot[bot] 076ceffa84 Bump dotenv-rails from 2.2.2 to 2.5.0 (#8934) 
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.2.2 to 2.5.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/compare/v2.2.2...v2.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-09 19:43:05 +02:00
dependabot[bot] d4b7d75968 Bump faker from 1.8.7 to 1.9.1 (#8935) 
Bumps [faker](https://github.com/stympy/faker) from 1.8.7 to 1.9.1.
- [Release notes](https://github.com/stympy/faker/releases)
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-09 19:59:34 +09:00
Thibaut Girka d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
dependabot[bot] 4c4ff05a46 Bump capybara from 3.8.2 to 3.9.0 (#8924) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.8.2 to 3.9.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.8.2...3.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-08 07:45:31 +02:00
dependabot[bot] 10e38b441f Bump aws-sdk-s3 from 1.20.0 to 1.21.0 (#8926) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.20.0 to 1.21.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-10-08 07:44:53 +02:00
Thibaut Girka 611740ce81 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-07 19:47:56 +02:00
Eugen Rochko 30dd7f3d90 Remove unused ruby-progressbar dependency (#8896) 
* Remove unused ruby-progressbar dependency

* Remove unused colorize dependency
 2018-10-06 08:33:26 +09:00
Thibaut Girka 98bb6815a7 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 21:48:25 +02:00
dependabot[bot] 6812f811b1 Bump parallel_tests from 2.21.3 to 2.23.0 (#8884) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.21.3 to 2.23.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.21.3...v2.23.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-05 18:59:35 +02:00
dependabot[bot] 7c154c6afd Bump puma from 3.11.4 to 3.12.0 (#8883) 
Bumps [puma](https://github.com/puma/puma) from 3.11.4 to 3.12.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.11.4...v3.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-05 18:58:13 +02:00
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
 2018-10-05 15:23:57 +02:00
dependabot[bot] da8abef56d Bump fog-openstack, rspec-rails and fog-core (#8877) 
Bumps [fog-openstack](https://github.com/fog/fog-openstack), [rspec-rails](https://github.com/rspec/rspec-rails) and [fog-core](https://github.com/fog/fog-core). These dependencies needed to be updated together.

Updates `fog-openstack` from 0.3.6 to 1.0.3
- [Release notes](https://github.com/fog/fog-openstack/releases)
- [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fog/fog-openstack/compare/v0.3.6...v1.0.3)

Updates `rspec-rails` from 3.7.2 to 3.8.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.7.2...v3.8.0)

Updates `fog-core` from 1.45.0 to 2.1.2
- [Release notes](https://github.com/fog/fog-core/releases)
- [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md)
- [Commits](https://github.com/fog/fog-core/compare/v1.45.0...v2.1.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-04 15:35:18 +02:00
dependabot[bot] 928102284a Bump webmock from 3.3.0 to 3.4.2 (#8874) 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.3.0 to 3.4.2.
- [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.3.0...v3.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-04 12:34:17 +02:00
dependabot[bot] 10f7916f37 Bump fuubar from 2.3.1 to 2.3.2 (#8875) 
Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.3.1 to 2.3.2.
- [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.3.1...releases/v2.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-04 12:33:02 +02:00
dependabot[bot] b70de2cf69 Bump http from 3.2.0 to 3.3.0 (#8871) 
Bumps [http](https://github.com/httprb/http) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/httprb/http/releases)
- [Changelog](https://github.com/httprb/http/blob/master/CHANGES.md)
- [Commits](https://github.com/httprb/http/compare/v3.2.0...v3.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-04 12:32:26 +02:00
dependabot[bot] ebb3631216 Bump brakeman from 4.2.1 to 4.3.1 (#8872) 
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.2.1 to 4.3.1.
- [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.2.1...v4.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-04 12:31:22 +02:00
dependabot[bot] ad459ab837 Bump fog-openstack from 0.1.25 to 0.3.6 (#8860) 
Bumps [fog-openstack](https://github.com/fog/fog-openstack) from 0.1.25 to 0.3.6.
- [Release notes](https://github.com/fog/fog-openstack/releases)
- [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fog/fog-openstack/compare/v0.1.25...v0.3.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-04 01:07:13 +02:00
dependabot[bot] 941c9d0d42 Bump aws-sdk-s3 from 1.9.1 to 1.20.0 (#8848) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.9.1 to 1.20.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-10-04 01:06:54 +02:00
dependabot[bot] 3b6ab82db7 Bump capybara from 2.18.0 to 3.8.2 (#8858) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 2.18.0 to 3.8.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/2.18.0...3.8.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-03 15:24:48 +02:00
dependabot[bot] 730f196b96 Bump pg from 1.0.0 to 1.1.3 (#8856) 
Bumps [pg](https://bitbucket.org/ged/ruby-pg) from 1.0.0 to 1.1.3.
- [Changelog](https://bitbucket.org/ged/ruby-pg/src/master/History.rdoc)
- [Commits](https://bitbucket.org/ged/ruby-pg/branches/compare/v1.1.3..v1.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-03 15:20:56 +02:00
dependabot[bot] 53275b949e Bump httplog from 1.0.2 to 1.1.1 (#8839) 
Bumps [httplog](https://github.com/trusche/httplog) from 1.0.2 to 1.1.1.
- [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.0.2...v1.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-03 04:56:00 +02:00
dependabot[bot] 3f62b119e4 Bump rubocop from 0.55.0 to 0.59.2 (#8849) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.55.0 to 0.59.2.
- [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.55.0...v0.59.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-02 20:16:51 +02:00
dependabot[bot] 194ad2c90b Bump rack-attack from 5.2.0 to 5.4.1 (#8838) 
Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.2.0 to 5.4.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/v5.2.0...v5.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-01 22:49:26 +02:00
Grey Baker 3a2f007eb0 Promote colorize to top-level dependency (#8844) 2018-10-02 05:34:25 +09:00
Thibaut Girka 24d05c7a50 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 14:36:06 +02:00
dependabot[bot] 746da5ccda Bump ox from 2.9.2 to 2.10.0 (#8837) 
Bumps [ox](https://github.com/ohler55/ox) from 2.9.2 to 2.10.0.
- [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.9.2...v2.10.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-01 14:08:33 +02:00
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
 2018-10-01 12:43:20 +02:00
Eugen Rochko e09301f414
Adjust bootsnap configuration for newer version (#8826) 2018-09-29 18:34:36 +02:00
dependabot[bot] 5da51771cd Bump oj from 3.5.1 to 3.6.11 (#8815) 
Bumps [oj](https://github.com/ohler55/oj) from 3.5.1 to 3.6.11.
- [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.5.1...v3.6.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-28 13:34:31 +02:00
dependabot[bot] e046a987f6 Bump capistrano from 3.10.2 to 3.11.0 (#8801) 
Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.10.2 to 3.11.0.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Changelog](https://github.com/capistrano/capistrano/blob/master/CHANGELOG.md)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.10.2...v3.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-27 18:24:06 +02:00
dependabot[bot] 7efa3d02c7 Bump sidekiq-scheduler from 2.2.1 to 3.0.0 (#8789) 
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 2.2.1 to 3.0.0.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases)
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v2.2.1...v3.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-27 02:11:21 +09:00
dependabot[bot] 65e7c6d9b5 Bump tty-prompt from 0.16.0 to 0.17.0 (#8791) 
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.16.0 to 0.17.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.16.0...v0.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-27 02:02:38 +09:00
Grey Baker 6e075b9cc4 Bump devise from 4.4.3 to 4.5.0 (#8778) 
Bumps [devise](https://github.com/plataformatec/devise) from 4.4.3 to 4.5.0.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.4.3...v4.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-26 04:27:53 +09:00