dependabot[bot]
9c76fab112
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>
2019-03-12 13:05:20 +01:00
Aurélien Reeves
ae33129975
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.
2019-03-11 20:48:24 +01:00
Eugen Rochko
2572884347
Fix remote interaction dialogs being indexed by search engines ( #10240 )
...
Fix #10116
2019-03-11 20:47:50 +01:00
ThibG
ce56a44760
Merge pull request #955 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-11 17:52:18 +01:00
Thibaut Girka
edd48921c6
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-11 17:31:02 +01:00
dependabot[bot]
b80943b08b
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>
2019-03-11 15:29:07 +01:00
Thibaut Girka
043978a20e
Remove leftover console.log
2019-03-11 14:39:45 +01:00
Thibaut Girka
1e4ea4f391
Make clicking on the account and status column headers scroll to top
2019-03-11 14:19:16 +01:00
Eugen Rochko
e7bc85a91a
Add tootctl statuses remove
to sweep unreferenced statuses ( #10063 )
...
Query by @tateisu
Fix #1554
2019-03-11 13:45:17 +01:00
dependabot[bot]
5101d1ea41
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>
2019-03-11 21:31:16 +09:00
dependabot[bot]
d8d9c9b983
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>
2019-03-11 13:29:53 +01:00
ThibG
154c8a0302
Increase DNS timeouts ( #10238 )
2019-03-11 13:27:57 +01:00
ThibG
91045bef61
Merge pull request #953 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-11 13:23:54 +01:00
Thibaut Girka
3a7fb657f3
[Glitch] Add support for poll ending notifications
...
Port front-end parts of 11ce444b8b
to glitch-soc
2019-03-11 13:08:21 +01:00
Thibaut Girka
bd6951a15d
Do not leak instance-local polls to remote followers
2019-03-11 13:08:20 +01:00
ash lea
00bc35891b
add local setting to auto reveal media behind cw
2019-03-11 12:14:45 +01:00
Kirishima21
2172dec88d
fix poll fotter layout
...
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
2019-03-11 12:09:30 +01:00
Thibaut Girka
33001891b6
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.
2019-03-11 11:23:50 +01:00
Eugen Rochko
5bc62cee47
Fix streaming API always attempting to use SSL with Postgres ( #10231 )
...
Fix #10223
2019-03-11 00:51:23 +01:00
ThibG
cdf5a7f854
Avoid race conditions when creating backups ( #10234 )
...
Under load, multiple backups for a single user could be planned, which
is very expensive.
2019-03-11 00:50:31 +01:00
ThibG
11ce444b8b
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
2019-03-11 00:49:31 +01:00
ThibG
dc285ec4ca
Merge pull request #950 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-10 20:43:54 +01:00
Thibaut Girka
88d4b28714
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-10 16:48:44 +01:00
ThibG
05aa8b9303
Reject existing Follows when suspending a remote account ( #10230 )
...
* Reject existing Follows when suspending a remote account
Partial fix to #10229
* Add tests
2019-03-10 16:18:58 +01:00
Eugen Rochko
d182fec01a
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
2019-03-10 16:00:54 +01:00
Armand Fardeau
31c7cd0942
Add clearer error when/if gpg fails to install ( #10228 )
2019-03-10 16:00:22 +01:00
Aditoo17
caa40e9d9b
Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server ( #10224 )
2019-03-09 17:07:59 +01:00
ThibG
dad42ecee0
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-08 20:43:51 +01:00
Thibaut Girka
96e7f430de
Fix min/max duration poll limits being inverted
2019-03-08 20:43:18 +01:00
Thibaut Girka
bed7758022
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-08 20:15:57 +01:00
ThibG
32f0cc5ccd
Fix setting up fields of a previously suspended account ( #10222 )
...
Fix #10177 for real
2019-03-08 19:59:08 +01:00
Ben Lubar
f461d0a193
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.
2019-03-08 16:12:48 +01:00
Sascha
291fbe21c2
config: add DB_SSLMODE for managed/remote PG ( #10210 )
...
* config: add DB_SSLMODE for managed/remote PG
* streaming: set PG sslmode, defaults to prefer
2019-03-08 14:36:28 +01:00
dependabot[bot]
51faba7b59
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>
2019-03-08 19:16:55 +09:00
ThibG
5baae3d9c0
Merge pull request #945 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-08 01:47:36 +01:00
Eugen Rochko
b9a799c343
[Glitch] Fix NaN in Poll component
...
Port 19cccea89a
to glitch-soc
2019-03-08 01:01:19 +01:00
Eugen Rochko
7565b8afa3
[Glitch] Fix public timelines being broken by new toots when they are not mounted
...
Port 8e9db67a6a
to glitch-soc
2019-03-08 01:00:14 +01:00
Thibaut Girka
9b093dfcde
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-08 00:57:13 +01:00
ThibG
dcbe6c16ba
Do not allow adding votes to expired polls ( #10214 )
...
* Do not allow adding votes to expired polls
* Only validate expires_at on create
2019-03-08 00:54:50 +01:00
Eugen Rochko
b7a8a52bc5
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
2019-03-07 22:53:47 +01:00
Eugen Rochko
19cccea89a
Fix NaN in Poll component ( #10213 )
2019-03-07 22:18:05 +01:00
Eugen Rochko
8e9db67a6a
Fix public timelines being broken by new toots when they are not mounted ( #10131 )
2019-03-07 22:17:52 +01:00
ThibG
641384d288
Handle StaleObjectError when retrieving polls ( #10208 )
2019-03-07 15:52:38 +01:00
ThibG
51e37e9d6a
Merge pull request #944 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-07 13:45:43 +01:00
Thibaut Girka
d8d8c64965
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-07 13:24:30 +01:00
dependabot[bot]
adc68b7a2e
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>
2019-03-07 20:38:10 +09:00
marcin mikołajczak
5232eccc5c
i18n: 🇵🇱 ( #10199 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2019-03-07 02:52:43 +01:00
ThibG
db21a6c5ee
Avoid unnecessarily fetching the replies collection when it is empty ( #10201 )
2019-03-07 01:50:37 +01:00
ThibG
401a3cfdf0
Fix AddLockVersionToPolls migration ( #10200 )
2019-03-07 01:50:06 +01:00
rinsuki
ed3d470069
Fix #10202 ( #10203 )
2019-03-07 01:49:42 +01:00