9650bbc8b2
[i18n] Update Occitan ( #9491 )
...
* Adds the Profil directory
* Adds the line about directory
* Harmonisation
* Update oc.yml
* i18n-tasks normalize && i18n-tasks remove-unused
* yarn manage:translations
2018-12-11 05:38:57 +01:00
7d00e4edbd
Make custom emoji domains case insensitive #9351 ( #9474 )
...
* Make custom emoji domains case sensitive #9351
* Fixup style in downcase_domain to comply with codeclimate.
* switch if! to unless
* Don't use transactions, operate in batches.
Also revert spurious schema change.
2018-12-11 05:30:57 +01:00
dbb1ee269f
Improve e-mail MX validator and add tests ( #9489 )
2018-12-10 22:53:25 +01:00
3f12c07ff5
Use same CORS policy for /@:username and /users/:username ( #9485 )
...
Fixes #8189
rack-cors being called before the application router, it does not follow
the redirection, and we need a separate rule for /users/:username.
2018-12-10 21:39:47 +01:00
ed24bb2c3e
Add specs for activitypub collections controller ( #9484 )
...
* Add specs for ActivityPub::CollectionsController#show
* Raise ActiveRecord::RecordNotFound
Raising ActiveRecord::NotFound raises NameError: uninitialized constant
ActiveRecord::NotFound.
2018-12-10 21:39:25 +01:00
6eae8f77af
Add spec for Admin::SuspentionsController#new ( #9483 )
2018-12-10 21:38:21 +01:00
189a6b17fb
Remove RemoteAccountControllerConcern never used ( #9482 )
2018-12-10 21:38:01 +01:00
361818e931
Fix Admin::TagsController#unhide ( #9481 )
2018-12-10 21:37:38 +01:00
ae3d2f446a
Add specs for Admin::InvitesController ( #9471 )
2018-12-10 01:19:28 +09:00
c6b7b98489
Merge pull request #849 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-09 16:38:09 +01:00
4f59d1efd7
Fix directory controller in glitch-soc
2018-12-09 16:08:10 +01:00
480f938511
[Glitch] Fix various things in the directory
...
Port ecd303c097
2018-12-09 16:08:10 +01:00
0b1bc66695
Port directory CSS changes from upstream
...
Port 73be8f38c1
2018-12-09 16:08:10 +01:00
e7f1bfdc2d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb
Moved public.js changes to settings.js.
2018-12-09 16:08:04 +01:00
81bda7d67c
Add setting to not aggregate reblogs ( #9248 )
...
* Add setting to not aggregate reblogs
Fixes #9222
* Handle cases where user is nil in add_to_home and add_to_list
* Add hint for setting_aggregate_reblogs option
* Reword setting_aggregate_reblogs label
2018-12-09 13:03:01 +01:00
6b78e5b5ab
Cache hashtag sample accounts, and exclude ineligible ones ( #9465 )
2018-12-08 01:32:26 +01:00
4638b16822
Make notification time smaller and reduce contrast ( #9464 )
2018-12-08 00:40:11 +01:00
6cf12aa74c
i18n: Update Polish translation ( #9459 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-12-07 21:08:29 +01:00
dfd123d5b3
Remove pending spec ( #9453 )
2018-12-07 16:53:55 +01:00
1c7061fb90
Bump rubocop from 0.61.0 to 0.61.1 ( #9451 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.61.0 to 0.61.1.
- [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.61.0...v0.61.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-07 16:42:50 +01:00
5c7f641565
Escape HTML in profile name preview in profile settings ( #9446 )
...
* fix non-escaped html in the profile settings
* provide a default profile text in case if there's no custom one
* update haml syntax
* simplify default profile name to username
* sanitize user-input html but display emojified icons
2018-12-07 16:42:22 +01:00
d3547fa005
Add specs for ActivityPub::InboxesController ( #9456 )
2018-12-07 16:40:01 +01:00
88b3eed16f
Add specs for Admin::AccountModerationNotesHelper ( #9455 )
2018-12-07 16:39:20 +01:00
57bb62d5cf
Remove pending spec ( #9454 )
...
Since dots are not allowed in username,
this spec is no longer needed.
2018-12-07 16:38:50 +01:00
51cbd045da
Add specs for AccountTagStat model ( #9452 )
2018-12-07 16:37:56 +01:00
ecd303c097
Fix various things in the directory ( #9449 )
...
* Fix missing variable in directory page title
* Order hashtags by number of people instead of alphabetically
* Add icon to OpenGraph preview of directory page
* Prevent line breaks in hashtags and ensure lowercase in the table
2018-12-07 16:37:32 +01:00
c1c0f7c516
Fix tag mb_chars comparison of profile directory ( #9448 )
2018-12-07 04:18:37 +01:00
e3682c9c17
Merge pull request #848 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-06 17:40:43 +01:00
73be8f38c1
Add profile directory ( #9427 )
...
Fix #5578
2018-12-06 17:36:11 +01:00
4167ed375b
Fix mention links in detailed statuses not opening in the WebUI
2018-12-06 15:31:21 +01:00
24822eca73
Revert "Add database statement timeout of 60s ( #9382 )"
...
This reverts commit 58a29db99d
2018-12-06 14:39:04 +01:00
1df392819d
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-06 12:44:38 +01:00
155cf12680
Remove pending spec ( #9442 )
...
`#from_account` isn't defined.
2018-12-06 17:39:15 +09:00
e2910dff12
Add spec for Identity.find_for_oauth ( #9441 )
2018-12-06 17:38:49 +09:00
d5245434ec
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
781c7be08b
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
c73c463478
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
1a22eff1e0
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
9897cf0701
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
e88c6a5c3c
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
a61ce1c947
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
4ad6bac447
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
2b657c175f
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
58a29db99d
Add database statement timeout of 60s ( #9382 )
2018-12-03 01:32:27 +01:00
6ddf0432e7
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
fe9340d95e
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
80462e1b8d
Merge pull request #842 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-02 20:42:10 +01:00
d32d33f408
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-02 20:29:14 +01:00
2df5ef18ae
Bump version to 2.6.5 ( #9413 )
2018-12-02 17:41:38 +01:00
84e5ed43e7
Preload common JSON-LD contexts ( #9412 )
...
Fixes #9411
2018-12-02 16:46:13 +01:00
Yamagishi Kazutoshi