Thibaut Girka
516adec7ad
Revert "Add database statement timeout of 60s ( #9382 )"
...
This reverts commit 01861b4f8e
.
2018-12-06 14:39:04 +01:00
Thibaut Girka
4aca9b4e0f
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-06 12:44:38 +01:00
ysksn
6d73528424
Remove pending spec ( #9442 )
...
`#from_account` isn't defined.
2018-12-06 17:39:15 +09:00
ysksn
23607d43da
Add spec for Identity.find_for_oauth ( #9441 )
2018-12-06 17:38:49 +09:00
dependabot[bot]
579e2d632a
Bump rails from 5.2.1.1 to 5.2.2 ( #9430 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.1.1 to 5.2.2.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.1.1...v5.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-06 16:10:18 +09:00
dependabot[bot]
ae2eafd897
Bump rails-controller-testing from 1.0.3 to 1.0.4 ( #9440 )
...
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing ) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/rails/rails-controller-testing/releases )
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.3...v1.0.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-06 16:09:13 +09:00
dependabot[bot]
79c837efd9
Bump rubocop from 0.60.0 to 0.61.0 ( #9439 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.60.0 to 0.61.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.60.0...v0.61.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-06 16:08:54 +09:00
ThibG
88faa4ff2d
Attempt fixing deadlocks by moving account stats update outside transaction ( #9437 )
...
* Use `update_column` instead of `update_attribute` in callback
`update_attribute` would normally cause callbacks to be called.
Called from a callback, it seems to stop further callbacks from executing.
`update_column` does the same work, but without calling callbacks or
preventing other callbacks from executing.
* Fix deadlocks by moving account stats update outside transaction
2018-12-05 22:51:12 +01:00
Paweł Ngei
2a9843a021
Add visible dates for notifications in Notification column ( #9423 )
...
* add RelativeTimestamp elements
* style the elements properly with CSS
2018-12-05 05:08:43 +01:00
ThibG
5e2cd7f672
Fix thread depth computation in statuses_controller ( #9426 )
...
* Add test that should currently fail
* Fix depth computation (will still fail if statuses have been filtered out)
* Fix handling of broken threads
2018-12-05 02:12:29 +01:00
dependabot[bot]
9734868448
Bump capybara from 3.11.1 to 3.12.0 ( #9388 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.11.1 to 3.12.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.11.1...3.12.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-04 09:27:17 +09:00
dependabot[bot]
58a6c7004f
Bump rails-controller-testing from 1.0.2 to 1.0.3 ( #9417 )
...
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing ) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/rails/rails-controller-testing/releases )
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.2...v1.0.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-04 09:26:55 +09:00
dependabot[bot]
9cecfb2e4f
Bump pry-rails from 0.3.7 to 0.3.8 ( #9418 )
...
Bumps [pry-rails](https://github.com/rweng/pry-rails ) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/rweng/pry-rails/releases )
- [Commits](https://github.com/rweng/pry-rails/compare/v0.3.7...v0.3.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-04 09:26:40 +09:00
Eugen Rochko
01861b4f8e
Add database statement timeout of 60s ( #9382 )
2018-12-03 01:32:27 +01:00
Eugen Rochko
626a544d08
Improve account suspension speed and completeness ( #9290 )
...
- Some associations were missing from the clean-up
- Some attributes were not reset on suspension
- Skip federation and streaming deletes when purging a dead domain
- Move account association definitions to concern
2018-12-03 01:32:08 +01:00
David Yip
3988b60bc2
Merge pull request #838 from ThibG/glitch-soc/features/reply-all-streaming-entries
...
Display a double reply arrow on public pages for toots that are replies
2018-12-02 16:30:52 -06:00
ThibG
5aaf52b46c
Merge pull request #842 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-02 20:42:10 +01:00
Thibaut Girka
e5aadde0d5
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-02 20:29:14 +01:00
Eugen Rochko
9b85750348
Bump version to 2.6.5 ( #9413 )
2018-12-02 17:41:38 +01:00
ThibG
4813053e97
Preload common JSON-LD contexts ( #9412 )
...
Fixes #9411
2018-12-02 16:46:13 +01:00
ThibG
f523852b87
Merge pull request #840 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-02 11:35:26 +01:00
Thibaut Girka
d67776ac83
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-01 21:00:16 +01:00
Thibaut Girka
606f0df712
Fix since_id
2018-12-01 18:59:24 +01:00
ThibG
a3f01ec6f8
Fix last_status parameter for notifications and conversations ( #9407 )
2018-12-01 18:36:41 +01:00
Quentí
d69ee38a7b
[i18n] update and corrections for Occitan locale ( #9404 )
...
* Update + correction
Colomna and not columna
Pòt, verb missing
* Correction
D’aquí is followed by a time period, and dins by a season.
Read : https://github.com/briannesbitt/Carbon/pull/1403 for more details.
* Correction admin zone
* Correction
Reïnicializacion, with the funny ï
2018-12-01 17:39:13 +01:00
Paweł Ngei
49fe8fa425
Add a tooltip explaining what a locked account is ( #9403 )
...
* create a title tooltip explaining what a locked account is
* improve phrasing
* minor phrasing fix to unify default and english
2018-12-01 14:25:15 +01:00
ThibG
c430672460
Merge pull request #837 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-11-30 22:37:58 +01:00
Thibaut Girka
a281d3ebd3
Scroll to selected toot even if the ancestors happen to be loaded
2018-11-30 22:37:38 +01:00
Thibaut Girka
8117ba2cb1
Scroll to detailed status when new ancestors get inserted
2018-11-30 22:37:38 +01:00
Thibaut Girka
5a03b30f13
[Glitch] Fix bug in order of conversations in web UI
...
Port 2af43c3dce
to glitch-soc
2018-11-30 22:37:38 +01:00
Thibaut Girka
ff50412846
[Glitch] Replace recursion in status mapStateToProps
...
Port 20a23c7d08
to glitch-soc
2018-11-30 22:37:38 +01:00
Thibaut Girka
45ba4e83e0
[Glitch] Fix context building in the reducer
...
Port a5c740ba41
to glitch-soc
2018-11-30 22:37:38 +01:00
Thibaut Girka
05d7c498ba
[Glitch] Introduce flat layout to contexts reducer
...
Port 4e718bbb25
to glitch-soc
2018-11-30 22:37:38 +01:00
Thibaut Girka
b808ba6a77
Display a double reply arrow on public pages for toots that are replies
2018-11-30 22:09:52 +01:00
Eugen Rochko
ecc22893f6
Bump version to 2.6.4 ( #9402 )
2018-11-30 21:38:09 +01:00
Thibaut Girka
fda8506a9c
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-30 20:16:26 +01:00
mayaeh
88e40d03d9
Fix that translation is not applied to "joining hashtags" ( #9397 )
2018-11-30 19:36:09 +01:00
Eugen Rochko
272c58904f
Remove npm-run-all dependency ( #9401 )
...
Fix #9359
2018-11-30 19:16:32 +01:00
dependabot[bot]
3a75150a93
Bump oj from 3.7.1 to 3.7.4 ( #9393 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.1 to 3.7.4.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.1...v3.7.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-30 19:09:31 +01:00
dependabot[bot]
1b7a2516e8
Bump fastimage from 2.1.4 to 2.1.5 ( #9395 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.1.4 to 2.1.5.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.4...v2.1.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-30 19:08:31 +01:00
Eugen Rochko
ab3f2aba04
Bump version to 2.6.3 ( #9391 )
2018-11-30 14:20:15 +01:00
ThibG
546ce24295
Merge pull request #835 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-11-29 21:47:18 +01:00
Thibaut Girka
77b9249250
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-29 19:22:52 +01:00
Thibaut Girka
fc707adcde
Improve detailed status component lifecycle
...
- Move componentWillMount and componentWillReceiveProps logic to
getDerivedStateFromProps.
- Compute CW auto-unfold status earlier
2018-11-29 18:32:42 +01:00
ThibG
a6b5451df5
Swap avatar and header input fields in profile page ( #9271 )
...
Fixes #9211
2018-11-29 02:56:09 +01:00
Thibaut Girka
c37a81a5d7
Do not hardcode preferences link, pleroma doesn't have it
2018-11-28 22:36:01 +01:00
Thibaut Girka
cb2822b68a
Add error boundary component to catch Web UI crashes
2018-11-28 22:36:01 +01:00
Thibaut Girka
c0675a272e
Do not crash the whole UI when loading an invalid column
2018-11-28 22:36:01 +01:00
Thibaut Girka
76603a189a
Switch “cycling” reply policy link to set of radio inputs
...
Fixes #832
2018-11-28 22:35:42 +01:00
dependabot[bot]
45cdfe00c5
Bump aws-sdk-s3 from 1.25.0 to 1.27.0 ( #9385 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.25.0 to 1.27.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-28 16:34:53 +01:00