b9e063139d
Add account hashtags to ActivityPub actor JSON ( #9450 )
2018-12-13 05:22:01 +01:00
7e4ce56476
Fix bootsnap cache directory being declared relatively ( #9511 )
...
Resolve #9490
2018-12-13 05:19:52 +01:00
5309e80ecb
Add spec for Settings::ExportsController#create ( #9512 )
2018-12-13 02:53:52 +01:00
513f59726a
Various fixes to scrollable lists and media gallery ( #9501 )
...
* Always use the scrollable class for the ScrollList component
Fixes #9499 as well as empty timelines' scrollbar “blinking”
between loading state and empty state.
* Do not display empty message when the list is known to have more elements
Fixes #9500
* Fix LoadMore usage in account media gallery
(Even though that codepath is probably never actually used…)
* Make account media gallery more consistent with account timeline
Fixes #9498
Display “load more” more consistently, add a loading indicator on first load.
* Fix “load more” button when no data has been fetched
2018-12-12 22:32:44 +01:00
8996de49df
Create Settings::BaseController ( #9507 )
...
Define `Settings::BaseController#set_body_classes` so that sub classes
inherit `Settings::BaseController` don't need to define
`#set_body_classes` agein.
2018-12-12 22:32:13 +01:00
f10f88a29a
i18n: Update Polish translation ( #9509 )
2018-12-13 02:13:20 +09:00
316bc93abd
Remove redundant ( #9503 )
2018-12-12 05:54:34 +01:00
201a9e844a
Use find_or_initialize_by ( #9504 )
2018-12-12 05:54:09 +01:00
5548049e71
Add admin ability to remove an user's header image ( #9495 )
...
* Fix markup in admin/accounts/:id table for avatar
* Add admin ability to remove an user's header image
2018-12-11 19:28:03 +01:00
0686523e18
Add instance-wide setting to disable profile directory ( #9497 )
...
* Add instance-wide setting to disable profile directory
Fixes #9496
When the profile directory is disabled:
- The “discoverable” setting is hidden from users
- The “profile directory” link is not shown on public pages
- /explore returns 404
* Move Setting.profile_directory check to a before_action filter
2018-12-11 19:18:29 +01:00
9b922917cb
Bump letter_opener from 1.6.0 to 1.7.0 ( #9493 )
...
Bumps [letter_opener](https://github.com/ryanb/letter_opener ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/ryanb/letter_opener/releases )
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-11 14:34:02 +09:00
2e37ff3835
Bump json-ld-preloaded from 2.2.3 to 3.0.0 ( #9416 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 2.2.3 to 3.0.0.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/2.2.3...3.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-11 05:40:01 +01:00
e534f72da5
[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
55ebf8a6e8
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
8d3910afdd
Improve e-mail MX validator and add tests ( #9489 )
2018-12-10 22:53:25 +01:00
fe40452a36
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
dfd6445334
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
5507c086e5
Add spec for Admin::SuspentionsController#new ( #9483 )
2018-12-10 21:38:21 +01:00
af123ea5e8
Remove RemoteAccountControllerConcern never used ( #9482 )
2018-12-10 21:38:01 +01:00
a6641d0541
Fix Admin::TagsController#unhide ( #9481 )
2018-12-10 21:37:38 +01:00
582ff3684c
Add specs for Admin::InvitesController ( #9471 )
2018-12-10 01:19:28 +09:00
a2e53af335
Merge pull request #849 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-09 16:38:09 +01:00
7dfd0c7995
Fix directory controller in glitch-soc
2018-12-09 16:08:10 +01:00
3d859a7c2b
[Glitch] Fix various things in the directory
...
Port ac437d6b25
2018-12-09 16:08:10 +01:00
6259051853
Port directory CSS changes from upstream
...
Port fd8ca11f19
2018-12-09 16:08:10 +01:00
b62953b3d2
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
097d866028
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
f551383e4a
Cache hashtag sample accounts, and exclude ineligible ones ( #9465 )
2018-12-08 01:32:26 +01:00
d72487aef6
Make notification time smaller and reduce contrast ( #9464 )
2018-12-08 00:40:11 +01:00
4379a39c05
i18n: Update Polish translation ( #9459 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-12-07 21:08:29 +01:00
246dfe9d47
Remove pending spec ( #9453 )
2018-12-07 16:53:55 +01:00
53c462bf66
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
03289a4d14
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
d61410c306
Add specs for ActivityPub::InboxesController ( #9456 )
2018-12-07 16:40:01 +01:00
f607161253
Add specs for Admin::AccountModerationNotesHelper ( #9455 )
2018-12-07 16:39:20 +01:00
994c20699c
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
26345b7cf2
Add specs for AccountTagStat model ( #9452 )
2018-12-07 16:37:56 +01:00
ac437d6b25
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
f2ca159c3b
Fix tag mb_chars comparison of profile directory ( #9448 )
2018-12-07 04:18:37 +01:00
b34053e888
Merge pull request #848 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-06 17:40:43 +01:00
fd8ca11f19
Add profile directory ( #9427 )
...
Fix #5578
2018-12-06 17:36:11 +01:00
467786f29b
Fix mention links in detailed statuses not opening in the WebUI
2018-12-06 15:31:21 +01:00
516adec7ad
Revert "Add database statement timeout of 60s ( #9382 )"
...
This reverts commit 01861b4f8e
2018-12-06 14:39:04 +01:00
4aca9b4e0f
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-06 12:44:38 +01:00
6d73528424
Remove pending spec ( #9442 )
...
`#from_account` isn't defined.
2018-12-06 17:39:15 +09:00
23607d43da
Add spec for Identity.find_for_oauth ( #9441 )
2018-12-06 17:38:49 +09:00
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
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
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
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
Eugen Rochko