900a0d9402
Bump aws-sdk-s3 from 1.23.0 to 1.23.1 ( #9174 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.23.0 to 1.23.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-08 21:14:25 +01:00
91584828bb
Bump capybara from 3.10.0 to 3.10.1 ( #9216 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.10.0 to 3.10.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.10.0...3.10.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-08 21:13:44 +01:00
473638701b
Bump pkg-config from 1.3.1 to 1.3.2 ( #9215 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.1...1.3.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-08 21:13:27 +01:00
e18018e930
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-06 15:22:44 +01:00
15fd2bb8cd
[Security] Bump rack from 2.0.5 to 2.0.6 ( #9214 )
...
Bumps [rack](https://github.com/rack/rack ) from 2.0.5 to 2.0.6. **This update includes security fixes.**
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/2.0.5...2.0.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-06 05:36:56 +01:00
88d15e4f6c
Bump active_model_serializers from 0.10.7 to 0.10.8 ( #9209 )
...
Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers ) from 0.10.7 to 0.10.8.
- [Release notes](https://github.com/rails-api/active_model_serializers/releases )
- [Changelog](https://github.com/rails-api/active_model_serializers/blob/master/CHANGELOG-0-10.md )
- [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.7...v0.10.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 19:01:17 +01:00
8c19b9abce
Bump rack-attack from 5.4.1 to 5.4.2 ( #9186 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 5.4.1 to 5.4.2.
- [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.4.1...v5.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 18:50:53 +01:00
bdc036586f
Bump redis from 4.0.2 to 4.0.3 ( #9187 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.0.2 to 4.0.3.
- [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.2...v4.0.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-03 09:34:43 +09:00
fd18ed4cea
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00
4d5a219013
[Security] Bump loofah from 2.2.2 to 2.2.3 ( #9160 )
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.2.2 to 2.2.3. **This update includes security fixes.**
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.2...v2.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-30 22:59:11 +09:00
7406141a71
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-30 11:22:25 +01:00
8633ac4b68
Bump oj from 3.6.12 to 3.7.0 ( #9155 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.6.12 to 3.7.0.
- [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.6.12...v3.7.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-30 06:39:52 +01:00
bd79977354
Bump i18n-tasks from master to 0.9.28 ( #9148 )
2018-10-30 01:06:47 +01:00
bc97c2ab8a
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-29 14:09:54 +01:00
eaf49c5d94
Bump sanitize from 4.6.6 to 5.0.0 ( #9140 )
2018-10-29 14:05:25 +01:00
13ea29754d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/simple_form.ja.yml
Not a real conflict, one new string was introduced in
glitch and one in upstream.
2018-10-29 14:00:41 +01:00
543bcb5984
Update i18n-tasks to master ( #9139 )
2018-10-29 13:46:39 +01:00
469ef48ec6
Bump parallel_tests from 2.25.0 to 2.26.0 ( #9137 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.25.0 to 2.26.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.25.0...v2.26.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-29 12:55:55 +01:00
0da11a56a9
Bump tzinfo-data from 1.2018.6 to 1.2018.7 ( #9136 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2018.6 to 1.2018.7.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.6...v1.2018.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-29 12:55:34 +01:00
b02fbdb5a5
Bump rubocop from 0.59.2 to 0.60.0 ( #9135 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.59.2 to 0.60.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.59.2...v0.60.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-29 12:55:16 +01:00
9e7c002d69
Bump doorkeeper from 5.0.1 to 5.0.2 ( #9134 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.1...v5.0.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-29 12:54:56 +01:00
c954f89bdd
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-28 08:37:49 +01:00
057c91a4e2
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
c32a5f86b6
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
24689747b9
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
0e1c4b7d77
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
7be9dfa8c6
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
534a78c97e
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
704eff1159
Bump rspec-rails from 3.8.0 to 3.8.1 ( #9078 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.0 to 3.8.1.
- [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.8.0...v3.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-24 07:51:04 +02:00
e08d12d1aa
Bump i18n-tasks from 0.9.26 to 0.9.27 ( #9079 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.26 to 0.9.27.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.26...v0.9.27 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-24 07:50:34 +02:00
b0038f959f
Bump i18n-tasks from 0.9.25 to 0.9.26 ( #9071 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.25 to 0.9.26.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.25...v0.9.26 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-23 23:11:37 +02:00
2b7b807df0
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-23 17:15:57 +02:00
c02aea6230
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
46259a36d0
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
5b02326d92
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
8b72ee011f
Bump strong_migrations from 0.3.0 to 0.3.1 ( #9015 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.3.0 to 0.3.1.
- [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.3.0...v0.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-19 18:51:40 +02:00
bd77b125d6
Bump tzinfo-data from 1.2018.5 to 1.2018.6 ( #9016 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2018.5 to 1.2018.6.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.5...v1.2018.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-19 20:20:07 +09:00
4d611170f2
Use Ruby ==2.5.2== 2.5.3 ( #9003 )
...
* Use Ruby 2.5.2
* Specify 2.5.2p104 as RUBY VERSION
Heorku refers to RUBY VERSION in Gemfile.lock
* Use ruby-2.5.3
2018-10-18 22:32:47 +02:00
8dd6c48031
Bump oj from 3.6.11 to 3.6.12 ( #8996 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.6.11 to 3.6.12.
- [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.6.11...v3.6.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-17 16:56:26 +02:00
84bbed8394
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
ba8d358e0d
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
4121045113
Bump doorkeeper from 5.0.0 to 5.0.1 ( #8954 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.0...v5.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-11 19:26:39 +02:00
70a7f72fda
Merge commit '0167397218110e26300bbc6891bc4b1849add083' into glitch-soc/merge-upstream
2018-10-11 14:12:36 +02:00
0167397218
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
9c66e239d1
Bump bullet from 5.7.5 to 5.7.6 ( #8947 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.5 to 5.7.6.
- [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/5.7.5...5.7.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-10 22:09:53 +09:00
de89e3670e
Bump scss_lint from 0.57.0 to 0.57.1 ( #8948 )
...
Bumps [scss_lint](https://github.com/brigade/scss-lint ) from 0.57.0 to 0.57.1.
- [Release notes](https://github.com/brigade/scss-lint/releases )
- [Changelog](https://github.com/brigade/scss-lint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/brigade/scss-lint/compare/v0.57.0...v0.57.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-10 22:09:23 +09:00
8cb843039c
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
02b17344fd
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
a1be1d17fe
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
4580979e28
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
dbaded7ed2
Bump memory_profiler from 0.9.11 to 0.9.12 ( #8937 )
...
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler ) from 0.9.11 to 0.9.12.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases )
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.11...v0.9.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-09 19:39:46 +09:00
74e411f4e8
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-08 13:51:33 +02:00
e303c0730f
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
7e089b5a31
Bump tty-prompt from 0.17.0 to 0.17.1 ( #8925 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.17.0 to 0.17.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.17.0...v0.17.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-08 07:45:08 +02:00
63581a9262
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
098012ab39
Bump i18n-tasks from 0.9.21 to 0.9.25 ( #8923 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.21 to 0.9.25.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.21...v0.9.25 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-08 14:24:07 +09:00
bdbbbb1bdb
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-07 19:47:56 +02:00
6c328374b4
Remove unused ruby-progressbar dependency ( #8896 )
...
* Remove unused ruby-progressbar dependency
* Remove unused colorize dependency
2018-10-06 08:33:26 +09:00
463f250f26
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-05 21:48:25 +02:00
645442b1af
Bump omniauth-saml from 1.10.0 to 1.10.1 ( #8885 )
...
Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml ) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/omniauth/omniauth-saml/releases )
- [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.0...v1.10.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-05 19:01:00 +02:00
524282ff6b
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
b4fedcc15e
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
f627ea99e4
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
5cdaec1ec2
[Security] Bump nokogiri from 1.8.4 to 1.8.5 ( #8881 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.8.4 to 1.8.5. **This update includes security fixes.**
- [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.4...v1.8.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-05 04:07:44 +02:00
dba3a17481
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
5c7944c05d
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
f2fb5ff317
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
d5137ab0e0
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
f038cd9386
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
236c64d3f2
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
df36e809d0
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
31e72c8d8a
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
76a58fd933
Bump derailed_benchmarks from 1.3.4 to 1.3.5 ( #8857 )
...
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks ) from 1.3.4 to 1.3.5.
- [Release notes](https://github.com/schneems/derailed_benchmarks/releases )
- [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md )
- [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.3.4...v1.3.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-03 15:22:06 +02:00
26e789df21
Bump capistrano-rbenv from 2.1.3 to 2.1.4 ( #8859 )
...
Bumps [capistrano-rbenv](https://github.com/capistrano/rbenv ) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/capistrano/rbenv/releases )
- [Changelog](https://github.com/capistrano/rbenv/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/rbenv/compare/v2.1.3...v2.1.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-03 15:21:30 +02:00
180c80e6a3
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
ae98c83af8
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
a7dcf7d1a8
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
62d196a12e
Bump redis from 4.0.1 to 4.0.2 ( #8850 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.0.1 to 4.0.2.
- [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.1...v4.0.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-02 20:16:05 +02:00
53ddb6d042
Bump fastimage from 2.1.1 to 2.1.4 ( #8847 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.1.1 to 2.1.4.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.1...v2.1.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-02 17:20:52 +09:00
c170f4af68
Bump webpush from 0.3.3 to 0.3.4 ( #8846 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.3 to 0.3.4.
- [Release notes](https://github.com/zaru/webpush/releases )
- [Commits](https://github.com/zaru/webpush/compare/v0.3.3...v0.3.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-02 15:37:28 +09:00
e1e167a18f
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
5e51b53fc8
Promote colorize to top-level dependency ( #8844 )
2018-10-02 05:34:25 +09:00
dbc2386ed3
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-01 14:36:06 +02:00
44a3d97eb0
Bump annotate from 2.7.3 to 2.7.4 ( #8840 )
...
Bumps [annotate](https://github.com/ctran/annotate_models ) from 2.7.3 to 2.7.4.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc )
- [Commits](https://github.com/ctran/annotate_models/compare/v2.7.3...v2.7.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-01 14:10:07 +02:00
d54f7a2a91
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
f5eaefc485
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
a976cb4b04
Bump strong_migrations from 0.2.2 to 0.2.3 ( #8818 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.2.2 to 0.2.3.
- [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.2...v0.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-28 13:35:44 +02:00
20af1615c1
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
7ea3526554
Bump bootsnap from 1.3.0 to 1.3.2 ( #8816 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.3.0 to 1.3.2.
- [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.0...v1.3.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-28 13:33:10 +02:00
3804744368
Bump simple_form from 4.0.0 to 4.0.1 ( #8814 )
...
Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 4.0.0 to 4.0.1.
- [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.0...v4.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-28 13:32:40 +02:00
9464903154
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
6ba78f634c
Bump stackprof from 0.2.11 to 0.2.12 ( #8803 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.11 to 0.2.12.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-27 17:11:54 +02:00
c2fef26762
Bump tty-command from 0.8.0 to 0.8.2 ( #8802 )
...
Bumps [tty-command](https://github.com/piotrmurach/tty-command ) from 0.8.0 to 0.8.2.
- [Release notes](https://github.com/piotrmurach/tty-command/releases )
- [Changelog](https://github.com/piotrmurach/tty-command/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-command/compare/v0.8.0...v0.8.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-27 17:11:29 +02:00
bd27027411
Bump tzinfo-data from 1.2018.4 to 1.2018.5 ( #8800 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2018.4 to 1.2018.5.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.4...v1.2018.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-27 14:59:15 +09:00
1b0972c6d7
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
43361423cf
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
98fc3a30d0
Bump memory_profiler from 0.9.10 to 0.9.11 ( #8790 )
...
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler ) from 0.9.10 to 0.9.11.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases )
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.10...v0.9.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-26 15:06:05 +09:00
45713852cf
Bump pkg-config from 1.3.0 to 1.3.1 ( #8788 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.0...1.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-26 14:50:02 +09:00
34203564d8
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
e1d6309727
Bump sidekiq from 5.1.3 to 5.2.2 ( #8779 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.1.3 to 5.2.2.
- [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.1.3...v5.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-25 20:33:00 +02:00
ac467a1f7f
Bump mime-types from 3.1 to 3.2.2 ( #8781 )
...
Bumps [mime-types](https://github.com/mime-types/ruby-mime-types ) from 3.1 to 3.2.2.
- [Release notes](https://github.com/mime-types/ruby-mime-types/releases )
- [Changelog](https://github.com/mime-types/ruby-mime-types/blob/master/History.md )
- [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.1...v3.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-25 20:32:37 +02:00
008c2443d2
Bump sanitize from 4.6.4 to 4.6.6 ( #8783 )
...
Bumps [sanitize](https://github.com/rgrove/sanitize ) from 4.6.4 to 4.6.6.
- [Release notes](https://github.com/rgrove/sanitize/releases )
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md )
- [Commits](https://github.com/rgrove/sanitize/compare/v4.6.4...v4.6.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-26 03:31:46 +09:00
c7bd9b4ea6
Bump pghero from 2.1.0 to 2.2.0 ( #8782 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.1.0 to 2.2.0.
- [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.1.0...v2.2.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-25 20:31:40 +02:00
9937eedb55
Update ruby dependencies ( #8743 )
...
* Update ffi to 1.9.25
* Update private_address_check to 0.5.0
2018-09-21 00:42:59 +02:00
ae5c237607
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Vagrantfile
app/javascript/packs/public.js
app/views/admin/settings/edit.html.haml
app/views/settings/preferences/show.html.haml
app/views/settings/profiles/show.html.haml
config/locales/es.yml
config/locales/simple_form.en.yml
config/webpack/configuration.js
config/webpack/loaders/babel.js
package.json
yarn.lock
Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
2018-09-19 21:46:01 +02:00
23ab704b2b
Upgrade Babel to version 7.0.0 ( #5925 )
2018-09-14 17:59:48 +02:00
9c693844d0
update devise_pam_authenticatable2, new feature: pam gets ip address of client ( #8623 )
2018-09-14 17:42:45 +02:00
4f4908311d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/api/v1/mutes_controller.rb
config/locales/simple_form.pl.yml
2018-08-27 18:09:28 +02:00
97c292e0d1
Add thor to Gemfile directly ( #8467 )
...
It's a common dependency, but just in case
2018-08-26 20:02:32 +02:00
ae4240d236
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/views/layouts/application.html.haml
Edited:
app/helpers/application_helper.rb
app/views/admin/domain_blocks/new.html.haml
Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.
Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing.
2018-08-26 14:23:24 +02:00
62d8a0832c
fix pam authentication for certain hostnames ( #8412 )
2018-08-25 22:35:29 +02:00
e6e600bffa
Upgrade Doorkeeper to 5.0.0 ( #8409 )
...
See doorkeeper-gem/doorkeeper#1137
2018-08-24 18:17:11 +02:00
98dccee657
Merge branch 'master' into glitch-soc/master
...
Conflicts:
config/routes.rb
Added the “endorsements” route from upstream.
2018-08-21 18:24:48 +02:00
97f2dc6761
Revert to using Paperclip's filesystem storage, and fix dangling records in remove_remote ( #8339 )
...
* Fix uncaching worker
* Revert to using Paperclip's filesystem backend instead of fog-local
fog-local has lots of concurrency issues, causing failure to delete files,
dangling file records, and spurious errors UncacheMediaWorker
2018-08-21 17:53:01 +02:00
b572332710
Upgrade doorkeeper to 4.4.2 ( #8321 )
2018-08-20 22:42:02 +02:00
c043697caa
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-19 09:27:18 +02:00
464f5ec269
Revert "Upgrade Doorkeeper to 4.4.1 ( #8197 )" ( #8231 )
...
* Revert "Upgrade Doorkeeper to 4.4.1 (#8197 )"
This reverts commit 659556ab1f
2018-08-19 03:20:37 +02:00
59e3ad5162
Add Makara dependency to support read-replicas ( #8216 )
...
Not active by default unless config/database.yml is edited
2018-08-18 21:06:12 +02:00
659556ab1f
Upgrade Doorkeeper to 4.4.1 ( #8197 )
2018-08-14 20:24:47 +02:00
2b9de88f26
Update Rails ( #8141 )
...
* Update Rails
* fix Update Rails
2018-08-13 18:17:20 +02:00
81bd37b1a7
Update Rails ( #8141 )
...
* Update Rails
* fix Update Rails
2018-08-12 12:25:23 +02:00
8bd7b9b586
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/models/user.rb
Resolved by adding :default_language to user settings fields
2018-06-21 20:49:57 +02:00
cf33555c1f
Update sprockets gem ( #7858 )
...
https://blog.heroku.com/rails-asset-pipeline-vulnerability
2018-06-20 15:22:37 +02:00
a84cc6ffd2
Update bcrypt to 3.1.12 fix issue with Fedora ( #7845 )
2018-06-19 00:19:17 +02:00
3d6c594903
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/javascript/mastodon/initial_state.js
db/schema.rb
Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…
2018-06-15 20:51:39 +02:00
9ed3212e35
Remove rack-timeout ( #7809 )
...
Timeout considered harmful due to leaving the app in a broken
state, including unreaped database connections
2018-06-15 19:46:25 +02:00
c384e0f3de
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
f291907ae5
Upgrade posix-spawn to master ( #7542 )
2018-05-19 02:20:43 +02:00
7d5dbed502
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Gemfile
Solved conflicts by using upstream's line for posix-spawn
2018-05-16 21:52:38 +02:00
a922fb60f5
Fix posix-spawn to version 0.3.12 ( #7517 )
...
Because 0.3.13 causes build error in x86 or other ILP32 environments.
closes #7453
2018-05-16 16:52:19 +02:00
efd2441d1f
Merge branch 'master' into glitch-soc/merge
2018-05-14 20:51:50 +02:00
15a8a75117
Update http_parser.rb to head version ( #7467 )
2018-05-13 11:32:46 +02:00
a846656008
Downgrade doorkeeper to version 4.2.6 ( #7456 )
...
ref https://github.com/doorkeeper-gem/doorkeeper/pull/1060
2018-05-12 12:08:12 +02:00
af504e62ff
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
9d64bcdac7
Port travis_retry for CI ( #7379 )
...
* Port travis_retry for CI
* Add license
2018-05-06 10:55:50 +02:00
ea46024add
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
Gemfile.lock
2018-05-04 09:42:31 -05:00
860701a9a8
Marginally improve convert/ffmpeg calls performance with posix-spawn ( #7346 )
2018-05-04 13:22:23 +02:00
c87f1d99e4
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
2018-05-03 17:23:44 -05:00
7236e9effe
Add pry-byebug ( #7307 )
2018-05-03 12:08:54 +02:00
ca1c696dbd
Slightly reduce RAM usage ( #7301 )
...
* No need to re-require sidekiq plugins, they are required via Gemfile
* Add derailed_benchmarks tool, no need to require TTY gems in Gemfile
* Replace ruby-oembed with FetchOEmbedService
Reduce startup by 45382 allocated objects
* Remove preloaded JSON-LD in favour of caching HTTP responses
Reduce boot RAM by about 6 MiB
* Fix tests
* Fix test suite by stubbing out JSON-LD contexts
2018-05-02 18:58:48 +02:00
e83e74f36d
Update dependencies for Ruby (2018-04-23) ( #7237 )
...
* Update annotate to version 2.7.3
* Update aws-sdk-s3 to version 1.9.2
* Update browser to version 2.5.3
* Update capistrano to version 3.10.2
* Update domain_name to version 0.5.20180417
* Update http to version 3.2.0
* Update lograge to version 0.10.0
* Update oj to version 3.5.1
* Update parallel_tests to version 2.21.3
* Update puma to version 3.11.4
* Update rubocop to version 0.55.0
* Update scss_lint to version 0.57.0
* Update simplecov to version 0.16.1
* Update tty-command to version 0.8.0
* Update tty-prompt to version 0.16.0
* Update pkg-config to version 1.3.0
* Update fog-local to version 0.5.0
* Update fog-openstack to version 0.1.25
* Update devise-two-factor to version 3.0.3
* bundle update
2018-04-23 11:29:17 +02:00
0d4342e146
Introduce rspec-retry ( #7206 )
2018-04-20 19:31:30 +02:00
fd98bfd108
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
config/application.rb
2018-04-13 16:36:46 -05:00
9761b940ac
Upgrade Rails to version 5.2.0 ( #5898 )
2018-04-12 14:45:17 +02:00
ac1ac20ee9
Merge remote-tracking branch 'tootsuite/master'
...
Conflicts:
app/controllers/statuses_controller.rb
2018-04-12 03:30:57 -05:00
8a9da4c414
update gem, test pam authentication ( #7028 )
...
* update gem, test pam authentication
* add description for test parameters
* fix inclusion of optional group
2018-04-11 21:40:38 +02:00
337fc136fd
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/serializers/initial_state_serializer.rb
The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047 ). Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
2018-04-08 19:05:02 -05:00
a814aa8e4d
Add a circuit breaker for ActivityPub deliveries ( #7053 )
2018-04-07 21:36:58 +02:00
658440838b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-30 19:17:17 +00:00
ccacb263da
Upgrade charlock_holmes to version 0.7.6 ( #6966 )
...
This version fixes compilation errors when trying to build its native extension with ICU 61.
2018-03-30 09:52:44 +02:00
ae55717f50
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-25 15:17:21 +00:00
6daa722e87
Revert "Revert "Upgrade Paperclip to version 6.0.0" ( #6807 )" ( #6808 )
...
This reverts commit d35272245e
2018-03-24 12:52:45 +01:00
a9bcd383b8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-21 17:17:20 +00:00
e62904bcba
Update sanitize and loofah ( #6855 )
...
Fixes CVE-2018-8048 and CVE-2018-3740, two medium-severity XSS
vulnerabilities present in these gems when built against
libxml2 >= 2.9.2.
2018-03-21 17:43:28 +01:00
eba1b109db
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-19 20:17:18 +00:00
4fc9827b69
bugfixes and gem update ( #6831 )
...
* update to new version of devise_pam_authenticatable2
* fix behaviour if suffix is nil, fix environment loading, fix user email creation
* code cleanup/fix linter warning
2018-03-19 20:08:56 +01:00
d35272245e
Revert "Upgrade Paperclip to version 6.0.0" ( #6807 )
...
* Revert "Bump version to 2.3.2rc1"
This reverts commit 64d5c8a512#6806 )"
This reverts commit 36734278ba#6782 )"
This reverts commit 8f374100ed#6800 )"
This reverts commit 7b247b15f2#6754 )"
This reverts commit cd6dee83a1
2018-03-17 14:20:35 +01:00
cd6dee83a1
Upgrade Paperclip to version 6.0.0 ( #6754 )
2018-03-17 12:37:58 +01:00
54608d0486
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-09 00:17:17 +00:00
3008a0f73a
Upgrade chewy to version 5.0.0 ( #6649 )
2018-03-06 06:14:26 +01:00
c08c971dd3
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/serializers/rest/instance_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.ja.yml
2018-03-02 21:46:44 -06:00
faa3fe644d
Update omniauth-saml to 1.10 ( #6587 )
...
Fixes CVE-2017-11428
2018-03-02 02:32:08 +01:00
9721b7746a
Fix #942 : Seamless LDAP login ( #6556 )
2018-02-28 19:04:53 +01:00
eed7c16ab0
remove-uglifier ( #6561 )
2018-02-26 16:19:48 +01:00
a5a434a8f6
Raise Mastodon::HostValidationError when host for HTTP request is private ( #6410 )
2018-02-24 19:16:11 +01:00
c0aabbec0f
Merge branch 'master' of https://github.com/tootsuite/mastodon
...
# Conflicts:
# app/controllers/settings/exports_controller.rb
# app/models/media_attachment.rb
# app/models/status.rb
# app/views/about/show.html.haml
# docker_entrypoint.sh
# spec/views/about/show.html.haml_spec.rb
2018-02-23 23:28:31 +09:00
f6884555d7
Account archive download ( #6460 )
...
* Fix #201 : Account archive download
* Export actor and private key in the archive
* Optimize BackupService
- Add conversation to cached associations of status, because
somehow it was forgotten and is source of N+1 queries
- Explicitly call GC between batches of records being fetched
(Model class allocations are the worst offender)
- Stream media files into the tar in 1MB chunks
(Do not allocate media file (up to 8MB) as string into memory)
- Use #bytesize instead of #size to calculate file size for JSON
(Fix FileOverflow error)
- Segment media into subfolders by status ID because apparently
GIF-to-MP4 media are all named "media.mp4" for some reason
* Keep uniquely generated filename in Paperclip::GifTranscoder
* Ensure dumped files do not overwrite each other by maintaing directory partitions
* Give tar archives a good name
* Add scheduler to remove week-old backups
* Fix code style issue
2018-02-21 23:21:32 +01:00
c34ff9fb82
Fix avatar and header issues by using custom geometry detector ( #6515 )
...
* Fix avatar and header issues by using custom geometry detector
Revert a part of #6508 . The file passed to dynamic styles method
was not actually a file, but an instance of Paperclip::Attachment,
which broke all styles by always returning {} from the method.
One problem with GIF avatars was that Paperclip::GeometryDetector
reported wrong dimensions for them, e.g. 120x120 GIF avatar would
for some reason be detected as 120x53. By writing our own geometry
parser, we can use FastImage, which also happens to be faster than
ImageMagick, to detect image dimensions, which are also correct.
Unfortunately, this PR does not implement skipping a `convert`
entirely if the dimensions are already correct, as I found no easy
way to write that behaviour into Paperclip without rewriting the
Paperclip::Thumbnail class.
* Only invoke convert if dimension or format needs to be changed
2018-02-21 03:40:12 +01:00
596deb050b
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
Gemfile
config/locales/simple_form.pl.yml
2018-02-17 00:02:37 -06:00
9b7490cede
Save video metadata and improve video OpenGraph tags ( #6481 )
...
* Save metadata from video attachments, put correct dimensions into OG tags
* Add twitter:player for videos
* Fix code style and test
2018-02-16 07:22:20 +01:00
bf93764ca0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-11 18:17:11 +00:00
e8e6786d6f
Interactive `rake mastodon:setup` task ( #6451 )
...
* Add better CLI prompt
* Add rake mastodon:setup interactive wizard
* Test db/redis/smtp configurations and add admin user at the end
* Test database connection even when database does not exist yet
2018-02-11 18:40:57 +01:00
3a1f58e9eb
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-11 04:10:16 +00:00
79f594fcba
Introduce html2text for extracting plaintext from statuses. #236 .
...
Unlike strip_tags, html2text will preserve text present in other nodes,
e.g. anchor tags:
[1] pry(main)> str = '<a href="http://www.example.com ">A link</a>'
=> "<a href=\"http://www.example.com \">A link</a>"
[2] pry(main)> Html2Text.convert(str)
=> "[A link](http://www.example.com )"
[3] pry(main)> include ActionView::Helpers::SanitizeHelper
=> Object
[4] pry(main)> strip_tags(str)
=> "A link"
Preserving the href of an anchor allows keyword mutes to also match on
URLs, which is something that the frontend regex filter can currently
do.
2018-02-10 10:36:16 -06:00
7ca5a06505
Full-text search for authorized statuses ( #6423 )
...
* Add full-text search for authorized statuses
- Search API will return statuses that match the query
- Only for logged in users
- Only if you are author of the status,
- Or you were mentioned in it
- Or you favourited or reblogged it
- Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX`
- Run `rails chewy:deploy` to create & populate index
Fix #5880
Fix #4293
Fix #1152
* Add commented out docker-compose configuration for ES container
* Optimize index import, filter search results
* Add basic normalization to the index
* Add better stemming and normalization to the index
* Skip webfinger request if search query includes both @ and a space
* Fix code style
* Visually separate search result sections
* Fix code style issues
2018-02-09 23:04:47 +01:00
4f8122a98c
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
.env.production.sample
app/controllers/auth/confirmations_controller.rb
db/schema.rb
2018-02-04 16:36:19 -06:00
5322013f25
CAS + SAML authentication feature ( #6425 )
...
* Cas authentication feature
* Config
* Remove class_eval + Omniauth initializer
* Codeclimate review
* Codeclimate review 2
* Codeclimate review 3
* Remove uid/email reconciliation
* SAML authentication
* Clean up code
* Improve login form
* Fix code style issues
* Add locales
2018-02-04 05:42:13 +01:00
6d1023b2e9
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-02-02 08:39:52 -06:00
23ce0c86da
pam authentication ( #5303 )
...
* add pam support, without extra column
* bugfixes for pam login
* document options
* fix code style
* fix codestyle
* fix tests
* don't call remember_me without password
* fix codestyle
* improve checks for pam usage (should fix tests)
* fix remember_me part 1
* add remember_token column because :rememberable requires either a password or this column.
* migrate db for remember_token
* move pam_authentication to the right place, fix logic bug in edit.html.haml
* fix tests
* fix pam authentication, improve username lookup, add comment
* valid? is sometimes not honored, return nil instead trying to authenticate with pam
* update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests
* update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user
* codeconvention fixes
* code convention fixes
* fix idention
* update dependency, explicit conflict check
* fix disabled password updates if in pam mode
* fix check password if password is present, fix templates
* block registration if account is maintained by pam
* Revert "block registration if account is maintained by pam"
This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20.
* fix identation error introduced by rebase
* block usernames maintained by pam
* document pam settings better
* fix code style
2018-02-02 10:18:55 +01:00
564e2c448b
Upgrade Paperclip > 5.2.1 ( #6404 )
...
Mitigation for CVE-2017-0889.
https://www.cvedetails.com/cve/CVE-2017-0889/
https://medium.com/in-the-weeds/all-about-paperclips-cve-2017-0889-server-side-request-forgery-ssrf-vulnerability-8cb2b1c96fe8
2018-02-01 17:54:22 +01:00
3cd4a0804b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-24 19:17:11 +00:00
0efaa528c4
Update goldfinger, ostatus2 and http.rb versions ( #6337 )
2018-01-23 14:30:42 +01:00
a95ca95b7b
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/settings/two_factor_authentication/confirmations_controller.rb
2018-01-21 13:36:10 -06:00
a1979b50c9
Redirect to 2FA creation page when otp_secret is not available ( #6314 )
2018-01-21 13:21:28 +01:00
d45ebe26dc
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
app/javascript/styles/mastodon/modal.scss
2018-01-19 15:22:10 -06:00
2df7c3a008
Add support Ruby v2.5.0 ( #6097 )
2018-01-19 20:53:30 +01:00
de7283a318
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
2018-01-15 22:17:48 -06:00
9613c3238c
HTML e-mails for UserMailer ( #6256 )
...
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
2018-01-16 03:29:11 +01:00
796a39a283
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-04 23:17:11 +00:00
321be04a5f
Fix OpenSSL dependency in ostatus2 ( #6174 )
2018-01-04 10:56:00 +09:00
b42e6973a1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-03 04:17:11 +00:00
3c20cfd734
Add confirmation step for email changes ( #6071 )
...
* Add confirmation step for email changes
This adds a confirmation step for email changes of existing users.
Like the initial account confirmation, a confirmation link is sent
to the new address.
Additionally, a notification is sent to the existing address when
the change is initiated. This message includes instruction to reset
the password immediately or to contact the instance admin if the
change was not initiated by the account owner.
Fixes #3871
* Add review fixes
2018-01-02 16:55:00 +01:00
0a2cc2361c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-26 18:17:16 +00:00
e2ccf65789
add ruby-progressbar to gemfile ( fixes #6110 ) ( #6111 )
2017-12-26 18:43:52 +01:00
bc9421631b
Merge pull request #263 from KnzkDev/optimize-paperclip
...
Optimizing paperclip
2017-12-12 09:15:52 -05:00
6fb6b1eb5d
optimize paperclip
2017-12-12 12:29:09 +09:00
f76681ebd6
Revert fog-aws (ref #5604 ) ( #5934 )
2017-12-09 00:47:52 +01:00
b037fbf9f4
Remove rabl dependency ( #5894 )
...
* Remove rabl dependency
* Replicate old Oj configuration
2017-12-06 15:04:49 +09:00
e3ab149f97
Update dependencies for Ruby (2017-12-03) ( #5878 )
...
* Update active_model_serializers to version 0.10.7
* Update capistrano-rails to version 1.3.1
* Update capistrano-rbenv to version 2.1.3
* Update capybara to version 2.16.1
* Update devise-two-factor to version 3.0.2
* Update i18n-tasks to version 0.8.19
* Update ox to version 2.8.2
* Update parallel_tests to version 2.19.0
* Update puma to version 3.11.0
* Update redis-namespace to version 1.6.0
* Update rspec-rails to version 3.7.2
* Update scss_lint to version 0.56.0
* Update webmock to version 3.1.1
* Update webpush to version 0.3.3
* bundle update
2017-12-03 16:55:27 +01:00
a624688ebd
Unify file upload to using fog ( #5604 )
2017-11-07 14:30:31 +01:00
f066d2418a
Revert ruby-jwt version ( #5575 )
...
jwt 2.1.0 still does not work well.
ref. https://github.com/zaru/webpush/issues/42
2017-11-01 00:47:35 +09:00
10b30bd94e
Update dependencies for Ruby (2017-10-30) ( #5566 )
...
* Update better_errors to version 2.4.0
* Update binding_of_caller to version 0.7.3
* Update bootsnap to version 1.1.5
* Update browser to version 2.5.2
* Update capistrano to version 3.10.0
* Update capistrano-bundler to version 1.3.0
* Update capistrano-rbenv to version 2.1.2
* Update capybara to version 2.15.4
* Update cld3 to version 3.2.1
* Update fabrication to version 2.18.0
* Update fog-openstack to version 0.1.22
* Update kaminari to version 1.1.1
* Update lograge to version 0.7.1
* Update nokogiri to version 1.8.1
* Update oj to version 3.3.9
* Update ox to version 2.8.1
* Update parallel_tests to version 2.17.0
* Update pkg-config to version 1.2.8
* Update rspec-rails to version 3.7.1
* Update rubocop to version 0.51.0
* Update scss_lint to version 0.55.0
* Update sidekiq to version 5.0.5
* Update sidekiq-scheduler to version 2.1.10
* Update tzinfo-data to version 1.2017.3
* Update webpacker to version 3.0.2
* bundle update
2017-10-31 12:22:32 +01:00
7c1f3173bb
Close connection when succeeded posting ( #5390 )
...
* Close connection when succeeded posting
* Update webmock
2017-10-14 14:38:57 +02:00
6033b8eac1
Replace self-rolled statsd instrumention with localshred/nsa ( #5118 )
2017-09-29 03:16:44 +02:00
12b7306a03
Upgrade Webpacker to version 3.0.1 ( #5122 )
2017-09-27 14:41:54 +02:00
a90aac6953
Update brakeman to 3.0 and bundler-audit to 0.6 ( #5117 )
2017-09-27 03:13:09 +02:00
65827bd2b4
Add strong_migrations gem to warn when creating unsafe migrations ( #5078 )
2017-09-25 02:11:14 +02:00
0de28e70e8
Bump ruby version to 2.4.2 ( #4958 )
...
* Bump ruby version to 2.4.2
https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-4-2-released/
Gemfile.lock is also updated.
TODO
- [ ] Update Dockerfile with Alpine release of ruby-2.4.2
* Revert jwt version
It seems that jwt 2.0.0 fails in some environment.
ref. https://github.com/zaru/webpush/issues/42
* Bump Ruby version on docker image
2017-09-18 04:55:57 +02:00
d4a1ddd46a
Fix filterable_languages method of SettingsHelper ( #4966 )
2017-09-16 14:59:41 +02:00
4b1d1a698d
Bump puma from 3.9.1 to 3.10.0 ( #4879 )
...
Bumps [puma](https://github.com/puma/puma ) from 3.9.1 to 3.10.0.
- [Release notes](https://github.com/puma/puma/releases/tag/v3.10.0 )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v3.9.1...v3.10.0 )
2017-09-11 23:43:19 +02:00
05b12e52ac
Bump rails from 5.1.3 to 5.1.4 ( #4875 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.1.3 to 5.1.4.
- [Commits](https://github.com/rails/rails/compare/v5.1.3...v5.1.4 )
2017-09-11 23:03:14 +02:00
a27821f725
Fix language filter codes ( #4841 )
...
* Fix language filter codes
CLD3 returns BCP-47 language identifier, filter settings expect
identifiers in the ISO 639-1 format. Convert between formats,
and exclude duplicate languages from filter choices (zh-CN->zh)
* Fix zh name
2017-09-08 12:32:22 +02:00
57a821d4b9
swift-enable the paperclip! 📎 ( #2322 )
2017-09-05 23:17:06 +02:00
155b35e3ad
Update bundler-audit and brakeman ( #4740 )
2017-08-30 03:30:13 +02:00
5147147da9
Add handling of Linked Data Signatures in payloads ( #4687 )
...
* Add handling of Linked Data Signatures in payloads
* Add a way to sign JSON, fix canonicalization of signature options
* Fix signatureValue encoding, send out signed JSON when distributing
* Add missing security context
2017-08-26 13:47:38 +02:00
e2eb4983ab
Update addressable to version 2.5.2 ( #4686 )
2017-08-25 14:17:08 +02:00
e3eb31818f
Update charlock_holmes to 0.7.5 ( #4620 )
2017-08-17 14:46:53 +02:00
4e7e54ace5
Update dependencies for Ruby ( #4543 )
...
* Update twitter-text to version 1.14.7
* Update tilt to version 2.0.8
* Update statsd-instrument to version 2.1.4
* Update sidekiq to version 5.0.4
* Update sidekiq-scheduler to version 2.1.8
* Update sidekiq-unique-jobs to version 5.0.9
* Update redis-activesupport to version 5.0.3
* Update rails-settings-cached to version v0.6.6
* Update pkg-config to version 1.2.4
* Update parallel_tests to version 2.14.2
* Update jsonapi-renderer to version 0.1.3
* Update i18n-tasks to version 0.9.16
* Update httplog to version 0.99.7
* Update fabrication to version 2.16.2
* Update bootsnap to version 1.1.2
* Update aws-sigv4 to version 1.0.1
* Update aws-sdk-core to version 2.10.21
* Update hashdiff to version 0.3.5
* Update rails to version 5.1.3
2017-08-07 18:55:36 +02:00
50cc4ee027
Update goldfinger to 2.0.1, see tootsuite/goldfinger#5 ( #4527 )
2017-08-05 15:29:52 +02:00
0319c4958f
Run `bundle` (regression from #4284 ) ( #4290 )
2017-07-21 14:22:05 +02:00
92e49e5c5d
Update Goldfinger gem to 2.0 ( #4286 )
...
- No masking of HTTP::Error and OpenSSL::SSL::SSLError
- No longer accepts non-HTTPS WebFinger endpoints
2017-07-21 13:40:48 +02:00
df59dc6639
Refactor ResolveRemoteAccountService ( #4258 )
...
* Refactor ResolveRemoteAccountService
* Remove trailing whitespace
* Use redis locks around critical ResolveRemoteAccountService code
* Add test for race condition of lock
2017-07-19 14:44:04 +02:00
9c1791c546
Optimize uri normalization ( #4212 )
...
* Add dependency on idn-ruby to speed up URI normalization
* Use normalized_host instead of normalize.host when applicable
When we are only interested in the normalized host, calling normalized_host
avoids normalizing the other components of the URI as well as creating a
new object
2017-07-15 17:24:35 +02:00
1065b0ac32
Follow renaming of microformats2 gem ( #4203 )
2017-07-14 19:57:49 +02:00
5138dde794
Fix #4149 , fix #1199 - Store emojis as unicode ( #4189 )
...
- Use unicode when selecting emoji through picker
- Convert shortcodes to unicode when storing text input server-side
- Do not convert shortcodes in JS anymore
2017-07-14 19:47:53 +02:00
ecab38fd66
Web Push Notifications ( #3243 )
...
* feat: Register push subscription
* feat: Notify when mentioned
* feat: Boost, favourite, reply, follow, follow request
* feat: Notification interaction
* feat: Handle change of public key
* feat: Unsubscribe if things go wrong
* feat: Do not send normal notifications if push is enabled
* feat: Focus client if open
* refactor: Move push logic to WebPushSubscription
* feat: Better title and body
* feat: Localize messages
* chore: Fix lint errors
* feat: Settings
* refactor: Lazy load
* fix: Check if push settings exist
* feat: Device-based preferences
* refactor: Simplify logic
* refactor: Pull request feedback
* refactor: Pull request feedback
* refactor: Create /api/web/push_subscriptions endpoint
* feat: Spec PushSubscriptionController
* refactor: WebPushSubscription => Web::PushSubscription
* feat: Spec Web::PushSubscription
* feat: Display first media attachment
* feat: Support direction
* fix: Stuff broken while rebasing
* refactor: Integration with session activations
* refactor: Cleanup
* refactor: Simplify implementation
* feat: Set VAPID keys via environment
* chore: Comments
* fix: Crash when no alerts
* fix: Set VAPID keys in testing environment
* fix: Follow link
* feat: Notification actions
* fix: Delete previous subscription
* chore: Temporary logs
* refactor: Move migration to a later date
* fix: Fetch the correct session activation and misc bugs
* refactor: Move migration to a later date
* fix: Remove follow request (no notifications)
* feat: Send administrator contact to push service
* feat: Set time-to-live
* fix: Do not show sensitive images
* fix: Reducer crash in error handling
* feat: Add badge
* chore: Fix lint error
* fix: Checkbox label overlap
* fix: Check for payload support
* fix: Rename action "type" (crash in latest Chrome)
* feat: Action to expand notification
* fix: Lint errors
* fix: Unescape notification body
* fix: Do not allow boosting if the status is hidden
* feat: Add VAPID keys to the production sample environment
* fix: Strip HTML tags from status
* refactor: Better error messages
* refactor: Handle browser not implementing the VAPID protocol (Samsung Internet)
* fix: Error when target_status is nil
* fix: Handle lack of image
* fix: Delete reference to invalid subscriptions
* feat: Better error handling
* fix: Unescape HTML characters after tags are striped
* refactor: Simpify code
* fix: Modify to work with #4091
* Sort strings alphabetically
* i18n: Updated Polish translation
it annoys me that it's not fully localized :P
* refactor: Use current_session in PushSubscriptionController
* fix: Rebase mistake
* fix: Set cacheName to mastodon
* refactor: Pull request feedback
* refactor: Remove logging statements
* chore(yarn): Fix conflicts with master
* chore(yarn): Copy latest from master
* chore(yarn): Readd offline-plugin
* refactor: Use save! and update!
* refactor: Send notifications async
* fix: Allow retry when push fails
* fix: Save track for failed pushes
* fix: Minify sw.js
* fix: Remove account_id from fabricator
2017-07-13 22:15:32 +02:00
07024f56df
Use charlock_holmes instead of nkf at FetchLinkCardService ( #4080 )
...
* Specs for language detection
* Use CharlockHolmes instead of NKF
* Correct mistakes
* Correct style
* Set hint_enc instead of falling back and strip_tags
* Improve specs
* Add dependencies
2017-07-08 22:44:31 +02:00
20e15ecfb3
Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl ( #4090 )
2017-07-07 04:02:06 +02:00
4a041cde77
Explicitly require MIME::Types ( #4083 )
2017-07-05 23:58:03 +02:00
620618f7bc
Version bumps for gems ( #4002 )
...
* Update aws-sdk to version 2.10.4
* Update bootsnap to version 1.1.1
* Update capistrano to version 3.8.2
* Update capybara to version 2.14.4
* Update cld3 to version 3.1.3
* Update http_accept_language to version 2.1.1
* Update sidekiq to version 5.0.3
* Update rspec-sidekiq to version 3.0.3
* Update sidekiq-scheduler to version 2.1.7
* Update oj to version 3.2.0
* Update openssl to version 2.0.4
* Update pg to version 0.21.0
* Update twitter-text to version 1.14.6
* Update unicode-display_width to version 1.3.0
* Update scss_lint to version 0.54.0
* Update hamlit to version 2.8.4
* Update erubi to version 1.6.1
* Update httplog to version 0.99.4
* Update aws-sdk to version 2.10.6
2017-06-30 13:42:04 +02:00
9127df69d3
Update Rails to v5.1.2 ( #3968 )
2017-06-27 13:41:03 +02:00
c465c5b3a8
Add overview of active sessions ( #3929 )
...
* Add overview of active sessions
* Better display of browser/platform name
* Improve how browser information is stored and displayed for sessions overview
* Fix test
2017-06-25 16:54:30 +02:00
dece663cd0
Upgrade Webpacker to version 2.0 ( #3729 )
2017-06-18 02:57:09 +02:00
8ae61fc4cf
Fix #3582 - Update OStatus2 gem ( #3699 )
2017-06-11 17:47:29 +02:00
10c5c41a5c
Gem versions, including security-related mail gem update ( #3687 )
...
* Update mail to version 2.6.6
* Update aws-sdk to version 2.9.37
* Update capybara to version 2.14.2
* Update oj to version 3.1.0
* Update sidekiq to version 5.0.2
* Update puma to version 3.9.1
* Update sanitize to version 4.5.0
* Update capistrano-rails to version 1.3.0
2017-06-10 20:26:50 +02:00
78a63b4aa9
Update nokogumbo to 1.4.13 ( #3617 )
...
$ bundle update --source nokogumbo# Please enter the commit message for your changes. Lines starting
nokogumbo 1.4.11 and 1.4.12 don't work on Heroku.
2017-06-06 20:43:02 +02:00
1ee9f97270
Gem version bumps ( #3524 )
...
* Update annotate to version 2.7.2
* Update puma to version 3.9.0
* Update aws-sdk to version 2.9.28
* Update bootsnap to version 1.0.0
* Update nio4r to version 2.1.0
* Update nokogumbo to version 1.4.12
* Update oj to version 3.0.11
* Update pkg-config to version 1.2.3
* Update rubocop to version 0.49.1
* Update sidekiq-scheduler to version 2.1.5
2017-06-05 01:10:13 +02:00
aa6740c21b
change sidekiq queueing to bulk push ( #3536 )
2017-06-04 00:11:15 +02:00
6ba27023e3
bump rails version in Gemfile: '~> 5.0.0' -> '~> 5.1.0' ( #3523 )
2017-06-02 20:11:13 +02:00
eea027c5c2
Update Rails to version 5.1.1 ( #3121 )
...
* Update rails to version 5.1.1
* Run `rails app:update`
* Remove the override of polymorphic activity relationship
* Silence warning about otp_secret attribute being unknown to rails
* We will only introduce form_with where we want to use remote data
2017-06-01 20:53:37 +02:00
b652c52992
Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail) ( #3479 )
...
* Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail)
* use climate_control
2017-05-31 17:09:17 +02:00
32a01c42c1
Run bundle command (follow up #3403 ) ( #3427 )
2017-05-30 03:04:44 +02:00
faf53a5a3e
Extract authorization policy for viewing statuses ( #3150 )
2017-05-29 18:22:22 +02:00
6fb5ac2410
Version bumps for non-rails gems ( #3398 )
...
* Update xpath to version 2.1.0
* Update aws-sdk to version 2.9.25
* Update oj to version 3.0.10
* Update brakeman to version 3.6.2
* Update rufus-scheduler to version 3.4.2
* Update doorkeeper to version 4.2.6
* Update rubocop to version 0.49.0
2017-05-29 18:18:06 +02:00
8410ff1d34
Update bootsnap to 0.3.0 (fix xattr.h error) ( #3390 )
2017-05-28 16:32:29 +02:00
718b507c8a
Adds bootsnap. Faster boot time ( #3176 )
2017-05-20 19:42:27 +02:00
d09c2c3061
Gem updates without rails five one ( #3137 )
...
* Update terminal-table to version 1.8.0
* Update aws-sdk to version 2.9.20
* Update cld3 to version 3.1.2
* Update microformats2 to version 3.1.0
* Update rails-controller-testing to version 1.0.2
* Update oj to version 3.0.8
* Update http-form_data to version 1.0.3
* Update nokogumbo to version 1.4.11
* Update simplecov-html to version 0.10.1
* Update aws-sdk to version 2.9.21
* Update oj to version 3.0.9
* Update sass to version 3.4.24
* Update simple_form to version 3.5.0
2017-05-19 16:22:10 +02:00
d892b40248
Update devise to version 4.3.0 ( #3074 )
...
Supports rails 5.1
2017-05-15 22:36:45 +02:00
4752edb183
Update rails to version 5.0.3 ( #3054 )
...
* Update rails to version 5.0.3
* Update aws-sdk to version 2.9.17
* Update capistrano to version 3.8.1
* Update climate_control to version 0.2.0
* Update debug_inspector to version 0.0.3
* Update et-orbi to version 1.0.4
* Update oj to version 3.0.7
* Update microformats2 to version 2.9.0
* Update lograge to version 0.5.1
* Clean up usage of Microformats2 object to remove deprecation warnings
* Update microformats2 to version 3.0.1
2017-05-14 16:30:14 +02:00
61edc8e98d
Add pessimistic constraints to gem versions ( #2980 )
2017-05-11 11:27:01 +02:00
57bcf6a74e
Update cld3 to 3.1.1 ( #2958 )
...
According to the release message:
> Fix for macOS and minor improvements
2017-05-10 14:39:28 +02:00
a1abb11656
Use CLD3 ( #2949 )
...
Compact Language Detector v3 (CLD3) is the successor of CLD2, which was
used in the previous implementation. CLD3 includes improvements since CLD2,
and supports newer compilers. On the other hand, it has additional
requirements and cld3-ruby, the FFI of CLD3 for Ruby, is still new and may
be still inmature.
Though CLD3 is named after CLD2, it is implemented with a neural network
model, different from the old implementation, which is based on a Naïve
Bayesian classifier.
CLD3 supports newer compilers, such as GCC 6. CLD2 is not compatible with
GCC 6 because it assigns negative values to varibales typed unsigned.
(see internal/cld_generated_cjk_uni_prop_80.cc) The support for GCC 6 and
newer compilers are essential today, when some server operating system
such as Ubuntu Server 16.10 has GCC 6 by default.
On the one hand, CLD3 requires C++11 support. Environments with old
compilers such as Ubuntu Server 14.04 needs to update the system or install
a newer compiler.
CLD3 needs protocol buffers as a new dependency. However,it is not
considered problematic because major server operating systems, CentOS and
Ubuntu Server provide them.
The FFI cld3-ruby was written by me (Akihiko Odaki) for use in Mastodon.
It is still new and may be inmature, but confirmed to pass existing tests.
2017-05-09 19:58:03 +02:00
4a4e6f59ec
Remove rails_12factor ( #2901 )
2017-05-09 05:15:54 +02:00
062e8f04d3
Misc gem bumps ( #2919 )
...
* Update bundler-audit to version 0.5.0
* Update oj to version 3.0.6
* Update http-form_data to version 1.0.2
* Update parallel to version 1.11.2
* Update rails-i18n to version 5.0.4
* Update rack-protection to version 2.0.0
* Update haml to version 5.0.1
* Update scss_lint to version 0.53.0
* Relax requirement on i18n-tasks
* Remove haml and haml_lint gem requirement
2017-05-08 18:55:42 +02:00
cf1f65bf58
Added haml-lint and fix warnings ( #2773 )
...
* add haml_lint to Gemfile
* add .haml-lint.yml
* fix warnings of haml_lint
2017-05-08 03:35:25 +02:00
283e1e265a
Enable CodeClimate SCSS Lint checks ( #2886 )
...
* add scss_lint to Gemfile
* add .scss-lint.yml
* fix warnings of scss-lint
* chmod -x styles/variables.scss
* Enable CodeClimate SCSS Lint checks
2017-05-07 20:47:31 +02:00
f88ff75a8d
namespace redis usage ( #2869 )
...
* add redis-namespace gem
* namespace redis usage
* refactor redis namespace code to be less intrusive
previously : would be prepended to keys when the
REDIS_NAMESPACE env var was not set
now if it is not set the namespacing functions are
not used at all, which should prevent disruptions
when instances update.
* fix redis namespace variable style in streaming js
* remove trailing space
* final redis namespace style fix
2017-05-07 19:42:32 +02:00
f1bf2214bc
Remove local_time gem, and add similar ( #2875 )
2017-05-07 15:22:54 +02:00
9d2266f420
Enable CodeClimate Brakeman checks ( #2861 )
...
* add brakeman to Gemfile
* Enable CodeClimate brakeman checks
* add config/brakeman.ignore
2017-05-07 02:45:33 +02:00
092d220c97
Enable CodeClimate Bundler-Audit checks ( #2862 )
...
* add bundler-audit to Gemfile
* Enable CodeClimate bundler-audit checks
2017-05-07 02:41:12 +02:00
7d8b674ef6
Version bumps for gems ( #2838 )
...
* Update aws-sdk to version 2.9.15
* Update ox to version 2.5.0
* Update sidekiq-unique-jobs to version 5.0.8
* Update rspec-rails to version 3.6.0
2017-05-06 13:37:07 +02:00
c32e312061
More robust PuSH subscription refreshes ( #2799 )
...
* Fix #2473 - Use sidekiq scheduler to refresh PuSH subscriptions instead of cron
Fix an issue where / in domain would raise exception in TagManager#normalize_domain
PuSH subscriptions refresh done in a round-robin way to avoid hammering a single
server's hub in sequence. Correct handling of failures/retries through Sidekiq (see
also #2613 ). Optimize Account#with_followers scope. Also, since subscriptions
are now delegated to Sidekiq jobs, an uncaught exception will not stop the entire
refreshing operation halfway through
Fix #2702 - Correct user agent header on outgoing http requests
* Add test for SubscribeService
* Extract #expiring_accounts into method
* Make mastodon:push:refresh no-op
* Queues are now defined in sidekiq.yml
* Queues are now in sidekiq.yml
2017-05-05 02:23:01 +02:00
d30ae1bc44
Remove the react-rails gem ( #2801 )
...
* Remove react-rails gem
* Fix broken view spec
2017-05-04 23:45:18 +02:00
232b822d86
Replace best_in_place editor on admin settings page ( #2789 )
...
* Remove best_in_place
* Replace best_in_place usage with rails helpers
* Move admin/settings#index to #edit action
* Remove click_to__edit from i18n
2017-05-04 18:12:44 +02:00
6f24c831e9
update gems ( #2754 )
2017-05-03 21:28:29 +02:00
9db85085a9
Language improvements, replace whatlanguage with CLD ( #2753 )
...
* add failing en specs
* add cld2 gem
* Replace WhatLanguage with CLD
2017-05-03 16:59:31 +02:00
022353e522
Added support parallel_tests ( #2740 )
...
- Added new gem the `parallel_tests`.
- Updated .travis.yml.
- Improved scripts and environment variable.
2017-05-03 12:20:38 +02:00
ef2af79a48
Replace sprockets/browserify with Webpack ( #2617 )
...
* Replace browserify with webpack
* Add react-intl-translations-manager
* Do not minify in development, add offline-plugin for ServiceWorker background cache updates
* Adjust tests and dependencies
* Fix production deployments
* Fix tests
* More optimizations
* Improve travis cache for npm stuff
* Re-run travis
* Add back support for custom.scss as before
* Remove offline-plugin and babili
* Fix issue with Immutable.List().unshift(...values) not working as expected
* Make travis load schema instead of running all migrations in sequence
* Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of
React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in
<UI />
* Add react definitions to places that use JSX
* Add Procfile.dev for running rails, webpack and streaming API at the same time
2017-05-03 02:04:16 +02:00
e5eb070430
annotate models ( #2697 )
...
* add annotate to Gemfile
* rails g annotate:install
* configure annotate_models
* add schema info to models
* fix rubocop to add frozen_string_literal
2017-05-02 02:14:47 +02:00
7c65bcbdb7
Downgrade rubocop 0.48.1 => 0.46.0 ( #2628 )
...
* downgrade rubocop 0.48.1 => 0.46.0
* exclude vendor/**/* from rubocop target files
* add frozen_string_literal comment line
* fix percent literal delimited by ( and )
* fix alignment
* remove comment disabling unknown cop
2017-04-30 00:23:45 +02:00
c94ba9d90c
Gem version updates ( #2566 )
...
* Update autoprefixer-rails to version 6.7.7.2
* Update aws-sdk to version 2.9.12
* Update http to version 2.2.2
* Update mail to version 2.6.5
* Update pghero to version 1.6.5
* Update ox to version 2.4.13
* Update json to version 2.1.0
* Update capistrano-rbenv to version 2.1.1
* Update httplog to version 0.99.3
* Update rainbow to version 2.2.2
* Update pkg-config to version 1.2.0
* Update globalid to version 0.4.0
* Update redis-rack to version 2.0.2
* Update webmock to version 3.0.1
* Update oj to version 3.0.2
2017-04-28 15:10:58 +02:00
97dff125a8
Improve shared status verification ( #2525 )
...
* Instead of parsing shared status contents verbatim, make roundtrip
to purported original URL. Confirm that the "original" URL is from the
same domain as the author it claims to be from.
* Fix obvious typo, add comment
* Use URI look-up first
* Add test, update Goldfinger dependency to make less useless HTTP requests per Webfinger lookup
2017-04-27 17:06:47 +02:00
4a7dc4fadc
OEmbed support for PreviewCard ( #2337 )
...
* OEmbed support for PreviewCard
* Improve ProviderDiscovery code failure treatment
* Do not crawl links if there is a content warning, since those
don't display a link card anyway
* Reset db schema
* Fresh migrate
* Fix rubocop style issues
Fix #1681 - return existing access token when applicable instead of creating new
* Fix test
* Extract http client to helper
* Improve oembed controller
2017-04-27 14:42:22 +02:00
21c1b4bf8a
Use local_time gem for timezone replacement ( #2174 )
...
For the 'time ago' value of stream entry simple statuses and the timestamp value
of detailed statuses - output their UTC value and use the browser timezone to
convert locally.
2017-04-21 18:19:59 +02:00
b9b9edd4c8
Add language detection ( #1772 )
...
* Add language detection via WhatLanguage and (de)serialization of it through Atom
* Fix default language in ProcessFeedService
* Re-add newline before 'react-rails' Gem to fix groupings
Fixes Code Climate issue
2017-04-16 20:32:17 +02:00
b0a13abcb3
Fix #1670 - Update OStatus2 gem ( #1936 )
2017-04-16 19:32:47 +02:00
58c16ea3a4
lock capistrano to 3.8.0 ( #1890 )
2017-04-16 12:52:18 +02:00
5eadbbfc36
Remove unused gem: coffee-rails ( #1885 )
2017-04-16 04:02:29 +02:00
27b7c6712f
Add rails-i18n gem ( #1837 )
2017-04-15 13:32:53 +02:00
90aa720d2e
add basic microformats tests ( #1803 )
...
as suggested, moving to view tests rather than a controller test
replaces https://github.com/tootsuite/mastodon/pull/1786 which i will
close momentary
2017-04-15 02:37:00 +02:00
29f169f7f0
Introduce capybara and first feature spec ( #1801 )
...
This commit introduces Capybara and the first feature spec.
I focused on coverage for log in for the first feature spec because that would
have prevented a1c63cb01d#1236 .
2017-04-15 01:21:02 +02:00
c4fd19a841
Include pkg-config as a gem dependency. ( #1717 )
...
The pkg-config gem was necessary in order for nokogiri to find the system
libraries when building on OpenBSD.
Closes #1637
Signed-off-by: Bryce Chidester <bryce@cobryce.com>
2017-04-14 11:15:03 +02:00
c06f09dfe2
Implementing Subresource Integrity ( #1729 )
...
* Add sprockets-rails to Gemfile
* Add sprockets-rails to Gemfile.lock
* Update show.html.haml
* Update index.html.haml
* Update admin.html.haml
* Update auth.html.haml
* Update embedded.html.haml
* Update public.html.haml
2017-04-14 11:09:20 +02:00
fcec9fcd99
Pagination improvements ( #1445 )
...
* Replace will_paginate with kaminari
* Use #page instead of #paginate in controllers
* Replace will_paginate.page_gap with pagination.truncate in i18n
* Customize kaminari views to match prior styles
* Set kaminari options to match prior behavior
* Replace will_paginate with paginate in views
2017-04-11 01:11:41 +02:00
68f3ce7d0c
API param to exclude notification types from response ( #1341 )
...
* Add exclude_types param to /api/v1/notifications
* Exclude notification types in web UI through exclude_types in the API
2017-04-10 23:45:29 +02:00
b4950a59bb
Version bumps for ruby and misc gems ( #1159 )
...
* Update rspec-rails to version 3.5.2
* Update addressable to version 2.5.1
* Update autoprefixer-rails to version 6.7.7.1
* Update bullet to version 5.5.1
* Update domain_name to version 0.5.20170404
* Update letter_opener_web to version 1.3.1
* Upate redis-rails to version 5.0.2
* Update active_record_query_trace to version 1.5.4
* Update capistrano-rails to version 1.2.3
* Update dotenv-rails to version 2.2.0
* Update pg to version 0.20.0
* Update tilt to version 2.0.7
* Update warden to version 1.2.7
* Update tins to version 1.13.2
* Update terminal-table to version 1.7.3
* Update oj to version 2.18.5
* Update simplecov to version 0.14.1
* Update uglifier to version 3.1.13
* Update hashdiff to version 0.3.2
* Update webmock to version 2.3.2
* Update devise to version 4.2.1
* Use ruby version 2.4.1
* Update sass to version 3.4.23
* Update puma to version 3.8.2
* Update will_paginate to version 3.1.5
* Update font-awesome-rails to version 4.7.0.1
* Update fuubar to version 2.2.0
* Update pry-rails to version 0.3.6
* Update simple-navigation to version 4.0.5
* Update rubocop to version 0.48.1
* Update doorkeeper to version 4.2.5
* Update faker to version 1.7.3
* Update aws-sdk to version 2.9.5
* Update fabrication to version 2.16.1
* Update hamlit-rails to version 0.2.0
* Update http to version 2.2.1
* Update httplog to version 0.99.2
* Update sidekiq to version 4.2.10
* Update rspec-sidekiq to version 3.0.0
* Update pghero to version 1.6.4
* Update rack-cors to version 0.4.1
* Update i18n-tasks to version 0.9.13
* Update ruby-oembed to version 0.12.0
* Update jquery-rails to version 4.3.1
* Update simple_form to version 3.4.0
* Update react-rails to version 1.11.0
* Update aws-sdk to version 2.9.6
* Update sidekiq-unique-jobs to version 5.0.0
* Update uglifier to version 3.2.0
2017-04-10 22:47:41 +02:00
9252133084
Use HTTP Accept-Language to detect locale ( #1166 )
...
* Use HTTP Accept-Language to detect locale
* Fix gem order to comply with codeclimate
* Sort gem to comply with rubocop
* I18n.default_locale fallback when there is no accept-language header
2017-04-09 18:40:24 +02:00
24c77e57b2
Rewrite Atom generation from stream entries to use Ox instead of Nokogiri ( #1124 )
...
* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder
StreamEntry is now limited to only statuses, which allows some optimization. Removed
extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper
used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer
and PubSubHubbub::DistributionWorker
PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker
instead.
All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri
* All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account
2017-04-07 05:56:56 +02:00
b2c43bcdf0
Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0
2017-04-04 21:31:02 -07:00
9f80b2dd4e
add more tests to models
2017-04-05 00:29:56 +02:00
e85ec98efb
Remove sidekiq-merger
2017-04-04 14:28:57 +02:00
e60c473917
Reduce number of items in feeds, optimize regeneration worker slightly,
...
make regeneration worker unique, (only schedule/execute once at a time)
2017-04-04 13:58:34 +02:00
99918c71e7
update Dockerfile
2017-04-03 00:46:44 +02:00
8946b3cb97
Upgrade Rails to 5.0.2
2017-03-22 15:37:03 +01:00
64be072702
Make account search blazing fast and rank followers/followees higher in the results
2017-03-17 20:48:14 +01:00
5e7ce2af8b
Fix JS require-issue
2017-02-26 14:10:01 +01:00
7413dcb28a
Fix #555 - Use a better URL parser
2017-02-22 19:35:11 +01:00
a6b992b18e
Speed up capistrano deployments
2017-02-16 02:34:21 +01:00
d384845469
Fix #61 - Add list of blocked users to the UI; clean up failed push notifications API
...
Try to fix Travis CI setup
2017-02-05 19:18:11 +01:00
28e528bfcb
Add capistrano to development environment
2017-01-30 20:03:17 +01:00
9327d05bf7
API for apps to register for push notifications
2017-01-29 01:30:32 +01:00
9b8670c939
Added optional two-factor authentication
2017-01-27 20:35:16 +01:00
096ff9ba38
Removed accidental n+1 query from notifications, updated some deps,
...
improved how "show more" link looks
2017-01-26 14:52:07 +01:00
28e65027b2
Fix #365 , 1/2 of #408 - replace rails_autolink with URI.regexp, run link_hashtags on simplified_format
2017-01-23 14:45:09 +01:00
432cc1d3c1
Set remote dev environments to use letter_opener_web, add default .env.vagrant variables
2017-01-21 20:22:49 +11:00
f748a91ec7
Fix #463 - Fetch and display previews of URLs using OpenGraph tags
2017-01-20 01:00:14 +01:00
31d48af0d1
Fix statsd null backend not being initialized properly
2017-01-19 09:37:07 +01:00
86264a950c
Add optional StatsD performance tracking
2017-01-18 23:44:29 +01:00
7e7c2bbb0f
Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings
...
with YAML-defined defaults. Add admin page for editing global settings. Add "site_description"
setting that would show as a paragraph on the frontpage
2017-01-12 20:46:24 +01:00
992c8d2c41
Add ruby version to Gemfile, move devDependencies in package.json to dependencies,
...
fix bug in process feed service
2017-01-11 15:39:31 +01:00
df2f14d2dd
Adding remote follow button
2017-01-01 19:54:34 +01:00
0ff01c37e4
Update Rails to 5.0.1
2016-12-21 19:09:59 +01:00
66e08d880c
Improved admin UI
2016-12-13 13:42:10 +01:00
8d4ef0b6c3
Per-status control for unlisted mode, also federation for unlisted mode
...
Fix #233 , fix #268
2016-11-30 21:34:59 +01:00
67db2cd871
Upgrade Paperclip to 5, AWS-SDK to 2, do not generate medium/small versions of avatars
2016-11-29 14:20:15 +01:00
3c1c2b0e06
Adding rack timeout of 30sec, PuSH jobs moved to push queue so they
...
can be processed separately
2016-11-29 02:07:14 +01:00
30f9e9e624
Remove Neo4J
2016-11-24 23:46:27 +01:00
8ab2fcbb2c
Mini Profiler not working well, remove it
2016-11-24 19:59:11 +01:00
30010a6dbd
Moving some counter queries out of subqueries in the API
2016-11-22 22:59:54 +01:00
2945c5d3dd
Upgrade to latest Rails, which apparently improves ActionCable performance
2016-11-22 22:26:44 +01:00
1b61e404b4
Localizations for most server-side strings
2016-11-16 00:55:33 +01:00
cbfa28b9cc
Use full-text search for autosuggestions
2016-11-12 14:36:10 +01:00
a6667f7f58
Replace setting custom CORS headers with rack-cors, set it on /oauth/token endpoint
2016-11-09 18:06:01 +01:00
24abc550ab
Replace react-skylight with own solution that centers images better
2016-11-07 18:23:36 +01:00
d83fbd85ac
Downgrade aws gem as this one was incompatible with Paperclip
2016-11-06 20:55:57 +01:00
eb6ad973d1
Adding optional S3, fail-mastodon
2016-11-06 18:35:46 +01:00
8ae3306bd3
Add pghero for analyzing postgres performance in production
2016-11-04 18:35:04 +01:00
71836838dd
Enable caching for some rabl views
2016-11-03 13:28:36 +01:00
c3c122d2ba
Replace in-memory cache store with redis store, should decrease memory
...
footprint of each running process by 128mb
2016-11-02 13:30:52 +01:00
a788b6c584
Update ostatus2 version
2016-10-17 01:41:45 +02:00
5860094354
Adding sync of follow relationships to Neo4J, accounts/suggestions API
2016-10-14 23:10:07 +02:00
a1d34be18b
Improve Friendica support (but still not there yet)
2016-10-12 21:07:00 +02:00
d51efdd1dc
Adding user settings (model and mailer), no form yet
2016-10-07 13:17:56 +02:00
6e8165696c
Update OStatus2 to handle malformed Salmon without raising unexpected exceptions
2016-10-06 14:47:38 +02:00
4909bbf415
Add logging for outgoing http requests
2016-10-02 14:58:06 +02:00
b36197c307
Fix tests, update goldfinger to catch XML errors
2016-09-30 23:08:29 +02:00
e63aebff7a
Adding landing page
2016-09-27 23:12:33 +02:00
57583f3fb8
Improve partial rendering and Haml performance (Haml->Hamlit)
2016-09-24 13:40:42 +02:00
4bec613897
Fix #24 - Thread resolving for remote statuses
...
This is a big one, so let me enumerate:
Accounts as well as stream entry pages now contain Link headers that
reference the Atom feed and Webfinger URL for the former and Atom entry
for the latter. So you only need to HEAD those resources to get that
information, no need to download and parse HTML <link>s.
ProcessFeedService will now queue ThreadResolveWorker for each remote
status that it cannot find otherwise. Furthermore, entries are now
processed in reverse order (from bottom to top) in case a newer entry
references a chronologically previous one.
ThreadResolveWorker uses FetchRemoteStatusService to obtain a status
and attach the child status it was queued for to it.
FetchRemoteStatusService looks up the URL, first with a HEAD, tests
if it's an Atom feed, in which case it processes it directly. Next
for Link headers to the Atom feed, in which case that is fetched
and processed. Lastly if it's HTML, it is checked for <link>s to the Atom
feed, and if such is found, that is fetched and processed. The account for
the status is derived from author/name attribute in the XML and the hostname
in the URL (domain). FollowRemoteAccountService and ProcessFeedService
are used.
This means that potentially threads are resolved recursively until a dead-end
is encountered, however it is performed asynchronously over background jobs,
so it should be ok.
2016-09-21 01:50:31 +02:00
608a2bfffc
Upgrade to PubSubHubbub 0.4 (removing verify_token)
2016-09-20 02:43:20 +02:00
1cfc9aa20e
OStatus2 and Goldfinger gems now have timeouts for requests
2016-09-20 01:10:51 +02:00
1245ee42fb
Update OStatus2 library
2016-09-19 23:52:42 +02:00
af375b5bac
Update sidekiq, remove sinatra dependency
2016-09-18 13:40:30 +02:00
18d21f1a39
Update doorkeeper dependency and replace libav with backported ffmpeg in docker
2016-09-17 18:24:58 +02:00
ce29624c6d
Fixing image upload limits, allowing webm, merge/unmerge events trigger
...
timeline reload in UI, other small fixes
2016-09-12 18:22:43 +02:00
85d89b472d
Optimized n+1 queries in accounts Atom and HTML views
...
Added stack trace for SQL queries in development
Removed badly thought out accounts/lookup API
2016-09-08 20:36:01 +02:00
0f4bc56719
Improving production logs, removing n+1 on media attachments in atom,
...
adding attachments display to static views
2016-09-08 01:24:26 +02:00
bc0692d75b
Removing mini-profiler that doesn't work, formatting timelines a bit better
2016-08-24 19:23:37 +02:00
49520d6e62
Adding React.js, Redux, revamping dashboard
2016-08-24 17:56:44 +02:00
6deb9f966e
Live timelines using ActionCable
2016-08-18 15:49:51 +02:00
dependabot[bot]