]> cat aescling's git repositories - mastodon.git/log
mastodon.git
6 years agoMerge pull request #961 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 16 Mar 2019 16:10:27 +0000 (17:10 +0100)]
Merge pull request #961 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoFix settings/flavours
Thibaut Girka [Sat, 16 Mar 2019 15:21:20 +0000 (16:21 +0100)]
Fix settings/flavours

Update theming system to use new paths for media files

6 years ago[Glitch] Add relationship manager UI
Eugen Rochko [Sat, 16 Mar 2019 10:23:22 +0000 (11:23 +0100)]
[Glitch] Add relationship manager UI

Port SCSS changes from 1c113fd72df18999de1d6f09fa3790dd1f715506 to glitch-soc

6 years agoFix relationships controller/view wrt. glitch-soc theming engine
Thibaut Girka [Sat, 16 Mar 2019 13:26:14 +0000 (14:26 +0100)]
Fix relationships controller/view wrt. glitch-soc theming engine

6 years agoDo not try to parse gif files as CSS or JS
Thibaut Girka [Sat, 16 Mar 2019 13:23:50 +0000 (14:23 +0100)]
Do not try to parse gif files as CSS or JS

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 16 Mar 2019 12:52:55 +0000 (13:52 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/settings/follower_domains_controller.rb
  Removed upstream. Did the same here. Maybe we should not have?
- config/locales/en.yml
  Upstream removed the “Authorized followers” page and associated
  translations. This is too close in the file to our glitch-soc-specific
  “flavour” string. No actual conflict.
- config/locales/ja.yml
  Same as above.
- config/locales/pl.yml
  Same as above.
- config/navigation.rb
  No real conflict. New route added too close to the glitch-soc-specific
  “flavours” one.
- config/webpack/configuration.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpack/loaders/babel.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
  The contents of this file have been moved to package.json.
- config/webpack/shared.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpacker.yml
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- jest.config.js
  The contents of this file have been moved to package.json.
- package.json
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- yarn.lock
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.

6 years agoDo not use @babel/preset-env to compile node_modules (#10289)
Yamagishi Kazutoshi [Sat, 16 Mar 2019 10:24:26 +0000 (19:24 +0900)]
Do not use @babel/preset-env to compile node_modules (#10289)

6 years agoperf: remove stats.json generation in webpack (#10290)
Nolan Lawson [Sat, 16 Mar 2019 10:23:54 +0000 (03:23 -0700)]
perf: remove stats.json generation in webpack (#10290)

* perf: remove stats.json generation in webpack

* fix code comment

6 years agoAdd relationship manager UI (#10268)
Eugen Rochko [Sat, 16 Mar 2019 10:23:22 +0000 (11:23 +0100)]
Add relationship manager UI (#10268)

6 years agoperf: remove zopfli to speed up webpack (#10288)
Nolan Lawson [Sat, 16 Mar 2019 03:02:30 +0000 (20:02 -0700)]
perf: remove zopfli to speed up webpack (#10288)

6 years agoAdd specs for action log helper (#9605)
ysksn [Fri, 15 Mar 2019 15:57:23 +0000 (00:57 +0900)]
Add specs for action log helper (#9605)

* Add specs for ActionLogHelper

* Make some methods private

methods below never referenced from outside of their module:

- #linkable_log_target
- #log_target_from_history

6 years agoBump webpacker from 3.5.5 to 4.0.2 (#10277)
Yamagishi Kazutoshi [Fri, 15 Mar 2019 14:05:31 +0000 (23:05 +0900)]
Bump webpacker from 3.5.5 to 4.0.2 (#10277)

Bumps [webpacker](https://github.com/rails/webpacker) from 3.5.5 to 4.0.2.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v3.5.5...v4.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
6 years agoBump aws-sdk-s3 from 1.31.0 to 1.32.0 (#10279)
dependabot[bot] [Fri, 15 Mar 2019 13:53:34 +0000 (14:53 +0100)]
Bump aws-sdk-s3 from 1.31.0 to 1.32.0 (#10279)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.31.0 to 1.32.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.31.0...v1.32.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump oj from 3.7.9 to 3.7.10 (#10278)
dependabot[bot] [Fri, 15 Mar 2019 13:53:24 +0000 (14:53 +0100)]
Bump oj from 3.7.9 to 3.7.10 (#10278)

Bumps [oj](https://github.com/ohler55/oj) from 3.7.9 to 3.7.10.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.9...v3.7.10)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoFix detailed poll validation errors not being returned in the API (#10261)
Eugen Rochko [Fri, 15 Mar 2019 12:36:38 +0000 (13:36 +0100)]
Fix detailed poll validation errors not being returned in the API (#10261)

No more "Owned poll is invalid"

6 years agoShow disappointed elephant if web UI crashes (#10275)
Eugen Rochko [Fri, 15 Mar 2019 04:35:45 +0000 (05:35 +0100)]
Show disappointed elephant if web UI crashes (#10275)

* Do not crash the whole UI when loading an invalid column

* Add error boundary component to catch Web UI crashes

* Add stack trace on supported browsers

* Add component stack info, pre-format everything for github

* Make “Reload” a clickable link that calls window.location.reload()

* Remove elephant friend from error boundary, make title stand out more

* Simplify error boundary to only a graphic

6 years agoFix maxed-out invites not showing up as expired in UI (#10274)
Eugen Rochko [Fri, 15 Mar 2019 04:35:17 +0000 (05:35 +0100)]
Fix maxed-out invites not showing up as expired in UI (#10274)

6 years agoFix language detection of non-latin alphabets even at few characters (#10276)
Eugen Rochko [Fri, 15 Mar 2019 04:07:09 +0000 (05:07 +0100)]
Fix language detection of non-latin alphabets even at few characters (#10276)

6 years agoAdd `visibility` param to reblog REST API (#9851)
Eugen Rochko [Fri, 15 Mar 2019 03:36:41 +0000 (04:36 +0100)]
Add `visibility` param to reblog REST API (#9851)

Use async worker for creating reblog notification to improve performance

6 years agoUpgrade yargs to v12.0 (#9862)
Yamagishi Kazutoshi [Fri, 15 Mar 2019 02:53:38 +0000 (11:53 +0900)]
Upgrade yargs to v12.0 (#9862)

6 years agoAdd a preferences API so apps can share basic behaviours (#10109)
Eugen Rochko [Fri, 15 Mar 2019 01:39:20 +0000 (02:39 +0100)]
Add a preferences API so apps can share basic behaviours (#10109)

6 years agoMerge pull request #960 from ThibG/glitch-soc/merge-upstream
ThibG [Thu, 14 Mar 2019 21:11:56 +0000 (22:11 +0100)]
Merge pull request #960 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoI18n: Update Czech translation (#10272)
Aditoo17 [Thu, 14 Mar 2019 19:59:26 +0000 (20:59 +0100)]
I18n: Update Czech translation (#10272)

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 14 Mar 2019 19:11:17 +0000 (20:11 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoMigrate existing `open_registrations` setting to the new `registrations_mode` (#10269)
ThibG [Thu, 14 Mar 2019 19:10:43 +0000 (20:10 +0100)]
Migrate existing `open_registrations` setting to the new `registrations_mode` (#10269)

* Migrate existing `open_registrations` setting to the new `registrations_mode`

Fixes #10263

* Remove unrelated db changes that have creeped in

6 years ago[Glitch] Admission-based registrations mode
Eugen Rochko [Thu, 14 Mar 2019 04:28:30 +0000 (05:28 +0100)]
[Glitch] Admission-based registrations mode

Port SCSS changes from 51e154f5e87968d6bb115e053689767ab33e80cd to glitch-soc

6 years ago[Glitch] Improve invites list with click-to-copy inputs
Eugen Rochko [Thu, 14 Mar 2019 04:25:49 +0000 (05:25 +0100)]
[Glitch] Improve invites list with click-to-copy inputs

Port 6e3936aa6f4296ac202b54c0b178b4fa825d7885 to glitch-soc

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 14 Mar 2019 16:14:05 +0000 (17:14 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.

6 years agoFix error in AdminMailer#new_pending_account (#10264)
Eugen Rochko [Thu, 14 Mar 2019 13:20:22 +0000 (14:20 +0100)]
Fix error in AdminMailer#new_pending_account (#10264)

6 years agoFix wrong method used in PollExpirationNotifyWorker (#10265)
Eugen Rochko [Thu, 14 Mar 2019 13:04:07 +0000 (14:04 +0100)]
Fix wrong method used in PollExpirationNotifyWorker (#10265)

6 years agoAdmission-based registrations mode (#10250)
Eugen Rochko [Thu, 14 Mar 2019 04:28:30 +0000 (05:28 +0100)]
Admission-based registrations mode (#10250)

Fix #6856
Fix #6951

6 years agoImprove invites list with click-to-copy inputs (#10259)
Eugen Rochko [Thu, 14 Mar 2019 04:25:49 +0000 (05:25 +0100)]
Improve invites list with click-to-copy inputs (#10259)

6 years agoRefactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)
Eugen Rochko [Thu, 14 Mar 2019 01:13:42 +0000 (02:13 +0100)]
Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)

6 years ago[Security] Bump rails from 5.2.2 to 5.2.2.1 (#10257)
dependabot[bot] [Wed, 13 Mar 2019 23:25:53 +0000 (00:25 +0100)]
[Security] Bump rails from 5.2.2 to 5.2.2.1 (#10257)

Bumps [rails](https://github.com/rails/rails) from 5.2.2 to 5.2.2.1. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.2...v5.2.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoMerge pull request #958 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 13 Mar 2019 22:44:37 +0000 (23:44 +0100)]
Merge pull request #958 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Add UI for enabling/disabling poll notifications
ThibG [Wed, 13 Mar 2019 18:29:54 +0000 (19:29 +0100)]
[Glitch] Add UI for enabling/disabling poll notifications

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 13 Mar 2019 20:35:43 +0000 (21:35 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoAdd UI for enabling/disabling poll notifications (#10255)
ThibG [Wed, 13 Mar 2019 18:29:54 +0000 (19:29 +0100)]
Add UI for enabling/disabling poll notifications (#10255)

* Add UI for enabling/disabling poll notifications

* Add poll notifications to the (advanced) quick filter bar

* Update poll notification message

“Your poll has ended” → “A poll you have voted in has ended”

* Clear up associated notifications when a poll is deleted

6 years agoMerge pull request #957 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 13 Mar 2019 15:55:07 +0000 (16:55 +0100)]
Merge pull request #957 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Add muted style for polls in web UI
Eugen Rochko [Tue, 12 Mar 2019 21:08:18 +0000 (22:08 +0100)]
[Glitch] Add muted style for polls in web UI

Port 5b50c2cbaa75a07b5f665a0d55cbfd79de67cc63 to glitch-soc

6 years ago[Glitch] Fix public timeline page not paginating correctly
Eugen Rochko [Tue, 12 Mar 2019 20:53:56 +0000 (21:53 +0100)]
[Glitch] Fix public timeline page not paginating correctly

Port da45b8b4c9bf00495bb967dda38064ac74b85ead to glitch-soc

6 years ago[Glitch] Redesign landing page
Eugen Rochko [Tue, 12 Mar 2019 16:34:00 +0000 (17:34 +0100)]
[Glitch] Redesign landing page

Port 65fffeac3f960f9c74d693525a73ac14b201bf2b to glitch-soc

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 13 Mar 2019 14:16:02 +0000 (15:16 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb

6 years agoi18n: Add Japanese translations for new landing page (#10254)
mayaeh [Wed, 13 Mar 2019 13:56:40 +0000 (22:56 +0900)]
i18n: Add Japanese translations for new landing page (#10254)

* yarn manage:translations && i18n-tasks add-missing

* Update Japanese translations for new landing page.

I don't change the tagline from English yet.
I think that translating a tagline is difficult and requires time-consuming discussions.

Some translations related about the poll are already done in Weblate, so I will leave it as it is.

6 years agoFix `tagged` param not being normalized before querying tags (#10249)
Eugen Rochko [Wed, 13 Mar 2019 12:02:13 +0000 (13:02 +0100)]
Fix `tagged` param not being normalized before querying tags (#10249)

6 years agoFix to limit to discoverable accounts. (#10253)
mayaeh [Wed, 13 Mar 2019 12:01:57 +0000 (21:01 +0900)]
Fix to limit to discoverable accounts. (#10253)

6 years agoBump active_record_query_trace from 1.6.1 to 1.6.2 (#10252)
dependabot[bot] [Wed, 13 Mar 2019 05:57:02 +0000 (14:57 +0900)]
Bump active_record_query_trace from 1.6.1 to 1.6.2 (#10252)

Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases)
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md)
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6.1...v1.6.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoFix poll update handler calling method was that was not available (#10246)
Eugen Rochko [Tue, 12 Mar 2019 21:58:59 +0000 (22:58 +0100)]
Fix poll update handler calling method was that was not available (#10246)

* Fix poll update handler calling method was that was not available

Fix regression from #10209

* Refactor VoteService

* Refactor ActivityPub::DistributePollUpdateWorker and optimize it

* Fix typo

* Fix typo

6 years agoOptimize RemoveStatusService by removing n+1 query and using shared inboxes (#10247)
Eugen Rochko [Tue, 12 Mar 2019 21:34:55 +0000 (22:34 +0100)]
Optimize RemoveStatusService by removing n+1 query and using shared inboxes (#10247)

6 years agoAdd muted style for polls in web UI (#10248)
Eugen Rochko [Tue, 12 Mar 2019 21:08:18 +0000 (22:08 +0100)]
Add muted style for polls in web UI (#10248)

6 years agoFix public timeline page not paginating correctly (#10245)
Eugen Rochko [Tue, 12 Mar 2019 20:53:56 +0000 (21:53 +0100)]
Fix public timeline page not paginating correctly (#10245)

6 years agoRedesign landing page (#10232)
Eugen Rochko [Tue, 12 Mar 2019 16:34:00 +0000 (17:34 +0100)]
Redesign landing page (#10232)

6 years agoBump concurrent-ruby from 1.1.4 to 1.1.5 (#10242)
dependabot[bot] [Tue, 12 Mar 2019 12:05:20 +0000 (13:05 +0100)]
Bump concurrent-ruby from 1.1.4 to 1.1.5 (#10242)

Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.4 to 1.1.5.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases)
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.4...v1.1.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoSquish username before validation (#10239)
Aurélien Reeves [Mon, 11 Mar 2019 19:48:24 +0000 (20:48 +0100)]
Squish username before validation (#10239)

* Squish username before validation (#10101)

Fix #10101

* Move before_validation hook to a private method

Also add Unicode wite-spaces to the spec to support the use of squish
over strip.

6 years agoFix remote interaction dialogs being indexed by search engines (#10240)
Eugen Rochko [Mon, 11 Mar 2019 19:47:50 +0000 (20:47 +0100)]
Fix remote interaction dialogs being indexed by search engines (#10240)

Fix #10116

6 years agoMerge pull request #955 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 11 Mar 2019 16:52:18 +0000 (17:52 +0100)]
Merge pull request #955 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Mon, 11 Mar 2019 16:31:02 +0000 (17:31 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoBump aws-sdk-s3 from 1.30.1 to 1.31.0 (#10236)
dependabot[bot] [Mon, 11 Mar 2019 14:29:07 +0000 (15:29 +0100)]
Bump aws-sdk-s3 from 1.30.1 to 1.31.0 (#10236)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.30.1 to 1.31.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.30.1...1.31.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoRemove leftover console.log
Thibaut Girka [Mon, 11 Mar 2019 13:39:14 +0000 (14:39 +0100)]
Remove leftover console.log

6 years agoMake clicking on the account and status column headers scroll to top
Thibaut Girka [Fri, 8 Mar 2019 19:34:31 +0000 (20:34 +0100)]
Make clicking on the account and status column headers scroll to top

6 years agoAdd `tootctl statuses remove` to sweep unreferenced statuses (#10063)
Eugen Rochko [Mon, 11 Mar 2019 12:45:17 +0000 (13:45 +0100)]
Add `tootctl statuses remove` to sweep unreferenced statuses (#10063)

Query by @tateisu

Fix #1554

6 years agoBump pkg-config from 1.3.5 to 1.3.6 (#10235)
dependabot[bot] [Mon, 11 Mar 2019 12:31:16 +0000 (21:31 +0900)]
Bump pkg-config from 1.3.5 to 1.3.6 (#10235)

Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.5 to 1.3.6.
- [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.5...1.3.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump active_record_query_trace from 1.6 to 1.6.1 (#10237)
dependabot[bot] [Mon, 11 Mar 2019 12:29:53 +0000 (13:29 +0100)]
Bump active_record_query_trace from 1.6 to 1.6.1 (#10237)

Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.6 to 1.6.1.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases)
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md)
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6...v1.6.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoIncrease DNS timeouts (#10238)
ThibG [Mon, 11 Mar 2019 12:27:57 +0000 (13:27 +0100)]
Increase DNS timeouts (#10238)

6 years agoMerge pull request #953 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 11 Mar 2019 12:23:54 +0000 (13:23 +0100)]
Merge pull request #953 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Add support for poll ending notifications
Thibaut Girka [Mon, 11 Mar 2019 10:32:21 +0000 (11:32 +0100)]
[Glitch] Add support for poll ending notifications

Port front-end parts of 3a92885a860df12b12d8356faf179a3fc63be6f2 to glitch-soc

6 years agoDo not leak instance-local polls to remote followers
Thibaut Girka [Mon, 11 Mar 2019 10:25:38 +0000 (11:25 +0100)]
Do not leak instance-local polls to remote followers

6 years agoadd local setting to auto reveal media behind cw
ash lea [Sun, 10 Mar 2019 19:34:51 +0000 (15:34 -0400)]
add local setting to auto reveal media behind cw

6 years agofix poll fotter layout
Kirishima21 [Mon, 11 Mar 2019 06:57:00 +0000 (15:57 +0900)]
fix poll fotter layout

画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Mon, 11 Mar 2019 10:23:50 +0000 (11:23 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/services/post_status_service.rb
  Small conflict due to handling of instance-local toots.
  A subsequent change is required to ensure instance-local polls are not leaked
  through Update.

6 years agoFix streaming API always attempting to use SSL with Postgres (#10231)
Eugen Rochko [Sun, 10 Mar 2019 23:51:23 +0000 (00:51 +0100)]
Fix streaming API always attempting to use SSL with Postgres (#10231)

Fix #10223

6 years agoAvoid race conditions when creating backups (#10234)
ThibG [Sun, 10 Mar 2019 23:50:31 +0000 (00:50 +0100)]
Avoid race conditions when creating backups (#10234)

Under load, multiple backups for a single user could be planned, which
is very expensive.

6 years agoSupport pushing and receiving updates to poll tallies (#10209)
ThibG [Sun, 10 Mar 2019 23:49:31 +0000 (00:49 +0100)]
Support pushing and receiving updates to poll tallies (#10209)

* Process incoming poll tallies update

* Send Update on poll vote

* Do not send Updates for a poll more often than once every 3 minutes

* Include voters in people to notify of results update

* Schedule closing poll worker on poll creation

* Add new notification type for ending polls

* Add front-end support for ended poll notifications

* Fix UpdatePollSerializer

* Fix Updates not being triggered by local votes

* Fix tests failure

* Fix web push notifications for closing polls

* Minor cleanup

* Notify voters of both remote and local polls when those close

* Fix delivery of poll updates to mentioned accounts and voters

6 years agoMerge pull request #950 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 10 Mar 2019 19:43:54 +0000 (20:43 +0100)]
Merge pull request #950 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 10 Mar 2019 15:48:44 +0000 (16:48 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoReject existing Follows when suspending a remote account (#10230)
ThibG [Sun, 10 Mar 2019 15:18:58 +0000 (16:18 +0100)]
Reject existing Follows when suspending a remote account (#10230)

* Reject existing Follows when suspending a remote account

Partial fix to #10229

* Add tests

6 years agoFix SSL configuration regression in streaming API (#10225)
Eugen Rochko [Sun, 10 Mar 2019 15:00:54 +0000 (16:00 +0100)]
Fix SSL configuration regression in streaming API (#10225)

* Fix SSL configuration regression in streaming API

Fix #10223

* Fix code style issues and integrate #10219

* Fix dumb thing

6 years agoAdd clearer error when/if gpg fails to install (#10228)
Armand Fardeau [Sun, 10 Mar 2019 15:00:22 +0000 (16:00 +0100)]
Add clearer error when/if gpg fails to install (#10228)

6 years agoChange joinmastodon.org to joinmastodon.org/#getting-started for sign up on another...
Aditoo17 [Sat, 9 Mar 2019 16:07:59 +0000 (17:07 +0100)]
Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server (#10224)

6 years agoMerge pull request #947 from ThibG/glitch-soc/merge-upstream
ThibG [Fri, 8 Mar 2019 19:43:51 +0000 (20:43 +0100)]
Merge pull request #947 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoFix min/max duration poll limits being inverted
Thibaut Girka [Fri, 8 Mar 2019 19:20:40 +0000 (20:20 +0100)]
Fix min/max duration poll limits being inverted

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Fri, 8 Mar 2019 19:15:57 +0000 (20:15 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoFix setting up fields of a previously suspended account (#10222)
ThibG [Fri, 8 Mar 2019 18:59:08 +0000 (19:59 +0100)]
Fix setting up fields of a previously suspended account (#10222)

Fix #10177 for real

6 years agoRe-organize Dockerfile to improve incremental builds. (#10212)
Ben Lubar [Fri, 8 Mar 2019 15:12:48 +0000 (09:12 -0600)]
Re-organize Dockerfile to improve incremental builds. (#10212)

- Always run apt update before any other apt command. (This fixes
  incremental builds failing if a remote package is updated.)
- Only copy dependency lists before installing dependencies. (This means
  editing code doesn't force all dependencies to be re-downloaded.)
- Delete cache in the same layer that it is created. (Otherwise,
  deleting cache *increases* the size of the image on non-squashed
  builds.)
- Move the installation of some static dependencies to *before* Mastodon
  code is imported to Docker.

6 years agoconfig: add DB_SSLMODE for managed/remote PG (#10210)
Sascha [Fri, 8 Mar 2019 13:36:28 +0000 (14:36 +0100)]
config: add DB_SSLMODE for managed/remote PG (#10210)

* config: add DB_SSLMODE for managed/remote PG

* streaming: set PG sslmode, defaults to prefer

6 years agoBump pkg-config from 1.3.4 to 1.3.5 (#10218)
dependabot[bot] [Fri, 8 Mar 2019 10:16:55 +0000 (19:16 +0900)]
Bump pkg-config from 1.3.4 to 1.3.5 (#10218)

Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.4 to 1.3.5.
- [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.4...1.3.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoMerge pull request #945 from ThibG/glitch-soc/merge-upstream
ThibG [Fri, 8 Mar 2019 00:47:36 +0000 (01:47 +0100)]
Merge pull request #945 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Fix NaN in Poll component
Eugen Rochko [Thu, 7 Mar 2019 21:18:05 +0000 (22:18 +0100)]
[Glitch] Fix NaN in Poll component

Port 75cb93676b1dd41d3e47f62466c0c6430691a990 to glitch-soc

6 years ago[Glitch] Fix public timelines being broken by new toots when they are not mounted
Eugen Rochko [Thu, 7 Mar 2019 21:17:52 +0000 (22:17 +0100)]
[Glitch] Fix public timelines being broken by new toots when they are not mounted

Port be1c634b2b4372a525d304d2ff830392f04c5cc5 to glitch-soc

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 7 Mar 2019 23:57:13 +0000 (00:57 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoDo not allow adding votes to expired polls (#10214)
ThibG [Thu, 7 Mar 2019 23:54:50 +0000 (00:54 +0100)]
Do not allow adding votes to expired polls (#10214)

* Do not allow adding votes to expired polls

* Only validate expires_at on create

6 years agoImmediately display poll results to poll author (#10187)
Eugen Rochko [Thu, 7 Mar 2019 21:53:47 +0000 (22:53 +0100)]
Immediately display poll results to poll author (#10187)

* Immediately display poll results to poll author

* Refactor Poll#loaded_options and add Poll#voted? to improve DRYness

6 years agoFix NaN in Poll component (#10213)
Eugen Rochko [Thu, 7 Mar 2019 21:18:05 +0000 (22:18 +0100)]
Fix NaN in Poll component (#10213)

6 years agoFix public timelines being broken by new toots when they are not mounted (#10131)
Eugen Rochko [Thu, 7 Mar 2019 21:17:52 +0000 (22:17 +0100)]
Fix public timelines being broken by new toots when they are not mounted (#10131)

6 years agoHandle StaleObjectError when retrieving polls (#10208)
ThibG [Thu, 7 Mar 2019 14:52:38 +0000 (15:52 +0100)]
Handle StaleObjectError when retrieving polls (#10208)

6 years agoMerge pull request #944 from ThibG/glitch-soc/merge-upstream
ThibG [Thu, 7 Mar 2019 12:45:43 +0000 (13:45 +0100)]
Merge pull request #944 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 7 Mar 2019 12:24:30 +0000 (13:24 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoBump webpush from 0.3.6 to 0.3.7 (#10205)
dependabot[bot] [Thu, 7 Mar 2019 11:38:10 +0000 (20:38 +0900)]
Bump webpush from 0.3.6 to 0.3.7 (#10205)

Bumps [webpush](https://github.com/zaru/webpush) from 0.3.6 to 0.3.7.
- [Release notes](https://github.com/zaru/webpush/releases)
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zaru/webpush/compare/v0.3.6...v0.3.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoi18n:🇵🇱 (#10199)
marcin mikołajczak [Thu, 7 Mar 2019 01:52:43 +0000 (02:52 +0100)]
i18n:🇵🇱 (#10199)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years agoAvoid unnecessarily fetching the replies collection when it is empty (#10201)
ThibG [Thu, 7 Mar 2019 00:50:37 +0000 (01:50 +0100)]
Avoid unnecessarily fetching the replies collection when it is empty (#10201)