rinpatch [Sat, 22 Jun 2019 09:54:16 +0000 (12:54 +0300)]
Support RUM indexes in the config generator
rinpatch [Sat, 22 Jun 2019 09:44:20 +0000 (12:44 +0300)]
Merge branch 'develop' into release-docs
rinpatch [Sat, 22 Jun 2019 09:20:11 +0000 (09:20 +0000)]
Merge branch 'mix_sem_ver_version_fix' into 'develop'
Fixed mix version computed for underscore-containing branches
See merge request pleroma/pleroma!1314
rinpatch [Sat, 22 Jun 2019 09:19:10 +0000 (09:19 +0000)]
Merge branch 'fix/ecto-tasks-release' into 'develop'
Ecto tasks: Resolve relative path using the application directory instead of cwd and load the application before doing anything
See merge request pleroma/pleroma!1322
rinpatch [Sat, 22 Jun 2019 06:55:32 +0000 (06:55 +0000)]
Merge branch 'bugfix/simple-notifications-for-non-create-activities' into 'develop'
notifications: fix notification generation for non-create activities
See merge request pleroma/pleroma!1323
William Pitcock [Sat, 22 Jun 2019 06:44:47 +0000 (06:44 +0000)]
notifications: fix notification generation for non-create activities
in
300d94c62, an Object.normalize() call was introduced. calling Object.normalize()
on an activity with a non-object URI (say, a user) causes Really Bad Things to happen.
so don't do that.
Alex S [Sat, 22 Jun 2019 06:01:30 +0000 (09:01 +0300)]
fix for int and modules
rinpatch [Sat, 22 Jun 2019 05:36:36 +0000 (08:36 +0300)]
Correct dependencies for RUM on alpine and remove installcheck
rinpatch [Sat, 22 Jun 2019 05:31:02 +0000 (08:31 +0300)]
Correct a typo in the apk command
rinpatch [Sat, 22 Jun 2019 05:30:32 +0000 (08:30 +0300)]
Do not exit on fail in the one-liner because it closes ssh connection and fix dependencies for alpine
rinpatch [Sat, 22 Jun 2019 02:20:36 +0000 (05:20 +0300)]
Use uname -m instead of arch for more portability
rinpatch [Sat, 22 Jun 2019 02:00:41 +0000 (05:00 +0300)]
Add a systemd service for OTP releases
rinpatch [Sat, 22 Jun 2019 01:35:17 +0000 (04:35 +0300)]
Executing create is unnecessary after the postgres script is executed
rinpatch [Sat, 22 Jun 2019 01:33:46 +0000 (04:33 +0300)]
Load the application before executing the create task
rinpatch [Sat, 22 Jun 2019 01:17:04 +0000 (04:17 +0300)]
Ecto tasks: Resolve relative path using the application directory
instead of cwd and load the application before doing anything
In OTP releases cwd != app directory and the configuration is read
only if the application is loaded
kaniini [Fri, 21 Jun 2019 23:54:37 +0000 (23:54 +0000)]
Merge branch 'chore/update-bbcode' into 'develop'
mix: update bbcode dependency to v0.1.1
See merge request pleroma/pleroma!1321
rinpatch [Fri, 21 Jun 2019 23:43:14 +0000 (23:43 +0000)]
Merge branch 'fix/fallback-config' into 'develop'
Fallback to Config if Mix.Config does not exist, even if Config does not exist either
See merge request pleroma/pleroma!1320
William Pitcock [Fri, 21 Jun 2019 23:42:50 +0000 (23:42 +0000)]
mix: update bbcode dependency to v0.1.1
rinpatch [Fri, 21 Jun 2019 23:29:49 +0000 (02:29 +0300)]
Fallback to Config if Mix.Config does not exist, even if Config does not
exist either
For some weird reason Code.ensure_loaded?(Config) is false on OTP
releases even though `use Config` from config files works just fine.
rinpatch [Fri, 21 Jun 2019 23:20:55 +0000 (02:20 +0300)]
Execute migration commands as the pleroma user and add a note about the need to uncomment the RUM command
rinpatch [Fri, 21 Jun 2019 23:09:45 +0000 (02:09 +0300)]
Correct the psql command
rinpatch [Fri, 21 Jun 2019 23:07:05 +0000 (02:07 +0300)]
Remove the getting started steps from pleroma.instance gen task
They are not compatible with every platform, different for OTP releases
and may become outdated. We are better off just telling people to refer
to the installation guides for their particular platform
rinpatch [Fri, 21 Jun 2019 23:00:18 +0000 (02:00 +0300)]
Merge branch 'develop' into release-docs
kaniini [Fri, 21 Jun 2019 22:56:54 +0000 (22:56 +0000)]
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
implement anti link spam MRF
See merge request pleroma/pleroma!1307
rinpatch [Fri, 21 Jun 2019 22:43:39 +0000 (22:43 +0000)]
Merge branch 'fix/use-config-when-possible' into 'develop'
use Config in generated config when available
See merge request pleroma/pleroma!1319
kaniini [Fri, 21 Jun 2019 22:31:12 +0000 (22:31 +0000)]
Merge branch 'oauth_secure_redirect' into 'develop'
OAuth security improvements (`redirect_uri` listing enforcement)
See merge request pleroma/pleroma!1302
kaniini [Fri, 21 Jun 2019 22:28:46 +0000 (22:28 +0000)]
Merge branch 'revert-
6f5a0cc1' into 'develop'
Revert "Merge branch 'fix/ogp-title' into 'develop'"
See merge request pleroma/pleroma!1317
William Pitcock [Fri, 21 Jun 2019 22:27:14 +0000 (22:27 +0000)]
change the anti-link-spam MRF implementation to use old_user? instead of the previous name
kaniini [Fri, 21 Jun 2019 22:25:09 +0000 (22:25 +0000)]
Merge branch 'fix-rate-limit-test' into 'develop'
Fix rate limiter tests
See merge request pleroma/pleroma!1316
rinpatch [Fri, 21 Jun 2019 18:56:49 +0000 (21:56 +0300)]
use Config in generated config when available
Mix.Config is deprecated and does not work on OTP releases. However
we can't fully switch to Config because it is not present in
Elixir < 1.9. I tried to evaluate if Config is available at runtime,
but for some weird reason OTP releases crash if I do that.
rinpatch [Fri, 21 Jun 2019 17:27:00 +0000 (17:27 +0000)]
Merge branch 'move-sample-configs' into 'develop'
Move config templates to priv so they can be found in releases
See merge request pleroma/pleroma!1318
rinpatch [Fri, 21 Jun 2019 17:00:12 +0000 (17:00 +0000)]
Apply suggestion to docs/installation/releases_en.md
rinpatch [Fri, 21 Jun 2019 16:59:56 +0000 (16:59 +0000)]
Apply suggestion to docs/installation/releases_en.md
rinpatch [Fri, 21 Jun 2019 16:59:48 +0000 (16:59 +0000)]
Apply suggestion to docs/installation/releases_en.md
rinpatch [Fri, 21 Jun 2019 16:30:25 +0000 (19:30 +0300)]
Move config templates to priv so they can be found in releases
Ivan Tashkinov [Fri, 21 Jun 2019 14:19:29 +0000 (17:19 +0300)]
Fixed branch name substitutions for mix version (to comply to SemVer format).
feld [Fri, 21 Jun 2019 11:36:32 +0000 (11:36 +0000)]
Revert "Merge branch 'fix/ogp-title' into 'develop'"
This reverts merge request !1277
Egor Kislitsyn [Fri, 21 Jun 2019 09:47:16 +0000 (16:47 +0700)]
Fix rate limiter tests
rinpatch [Fri, 21 Jun 2019 03:42:04 +0000 (06:42 +0300)]
Default DB configuration to false and set the default database name to
`pleroma` instead of `pleroma_dev`
rinpatch [Fri, 21 Jun 2019 03:41:13 +0000 (06:41 +0300)]
Merge branch 'develop' into release-docs
rinpatch [Fri, 21 Jun 2019 03:39:03 +0000 (06:39 +0300)]
Do not set ownership group in chown commands
rinpatch [Fri, 21 Jun 2019 03:37:38 +0000 (06:37 +0300)]
Remove a useless echo
rinpatch [Fri, 21 Jun 2019 03:32:34 +0000 (06:32 +0300)]
Change to long adduser options because the short ones only work on busybox
rinpatch [Fri, 21 Jun 2019 03:22:34 +0000 (06:22 +0300)]
Add notes on RUM indexes
rinpatch [Fri, 21 Jun 2019 03:14:02 +0000 (06:14 +0300)]
Add a note about RUM indexes package on Debian/Ubuntu
rinpatch [Fri, 21 Jun 2019 03:04:39 +0000 (06:04 +0300)]
Correct package names for Debian
rinpatch [Fri, 21 Jun 2019 02:57:46 +0000 (05:57 +0300)]
Formatting
rinpatch [Fri, 21 Jun 2019 02:48:13 +0000 (05:48 +0300)]
OTP release install guide sceleton
rinpatch [Fri, 21 Jun 2019 02:46:47 +0000 (05:46 +0300)]
Copy the nginx config to the release directory
rinpatch [Fri, 21 Jun 2019 02:46:21 +0000 (05:46 +0300)]
Fix nginx webroot method config
rinpatch [Thu, 20 Jun 2019 21:25:34 +0000 (21:25 +0000)]
Merge branch 'fix/config-gen-releases' into 'develop'
Refactor mix tasks a bit and make config generator work with releases
See merge request pleroma/pleroma!1312
lain [Thu, 20 Jun 2019 17:43:57 +0000 (17:43 +0000)]
Merge branch 'fix/dynamic-configuration' into 'develop'
Fixes for dynamic configuration
See merge request pleroma/pleroma!1313
Alexander Strizhakov [Thu, 20 Jun 2019 17:43:57 +0000 (17:43 +0000)]
Fixes for dynamic configuration
rinpatch [Thu, 20 Jun 2019 15:27:17 +0000 (18:27 +0300)]
Disable rpc for instance gen
Ivan Tashkinov [Thu, 20 Jun 2019 14:54:16 +0000 (17:54 +0300)]
Fixed mix version computed for underscore-containing branches to be of SemVer format.
rinpatch [Thu, 20 Jun 2019 08:51:16 +0000 (11:51 +0300)]
Merge branch 'develop' into fix/config-gen-releases
rinpatch [Thu, 20 Jun 2019 08:50:26 +0000 (08:50 +0000)]
Merge branch 'feature/release-update-script' into 'develop'
pleroma_ctl: add an update command
Closes #1004 and #988
See merge request pleroma/pleroma!1305
rinpatch [Thu, 20 Jun 2019 08:12:56 +0000 (08:12 +0000)]
Apply suggestion to rel/files/bin/pleroma_ctl
rinpatch [Thu, 20 Jun 2019 08:02:05 +0000 (11:02 +0300)]
Export PLEROMA_BUILD_BRANCH
William Pitcock [Thu, 20 Jun 2019 03:01:03 +0000 (03:01 +0000)]
docs: better description for mrf anti link spam
rinpatch [Thu, 20 Jun 2019 00:59:16 +0000 (03:59 +0300)]
Allow setting upload/static directories in the config generator
rinpatch [Thu, 20 Jun 2019 00:40:00 +0000 (03:40 +0300)]
Remove deprecated dedupe_media from the config template
rinpatch [Wed, 19 Jun 2019 23:34:19 +0000 (02:34 +0300)]
Remove a useless binding from config template call
rinpatch [Wed, 19 Jun 2019 23:20:20 +0000 (02:20 +0300)]
Release Tasks: Ensure the application is loaded before getting the
modules
Needed for non-rpc tasks to work
rinpatch [Wed, 19 Jun 2019 23:05:19 +0000 (02:05 +0300)]
Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functions
instead of aliasing
This seems to be the convention for functions that can be reused between
different mix tasks in all Elixir projects I've seen and it gets rid on
an error message when someone runs mix pleroma.common
Also in this commit by accident:
- Move benchmark task under a proper namespace
- Insert a space after the prompt
rinpatch [Wed, 19 Jun 2019 19:51:38 +0000 (19:51 +0000)]
Merge branch 'user_sign_out_mix_task' into 'develop'
User sign out mix task
See merge request pleroma/pleroma!1309
Ivan Tashkinov [Wed, 19 Jun 2019 19:39:53 +0000 (19:39 +0000)]
Apply suggestion to lib/mix/tasks/pleroma/user.ex
Ivan Tashkinov [Wed, 19 Jun 2019 19:29:36 +0000 (22:29 +0300)]
User sign out mix task.
William Pitcock [Wed, 19 Jun 2019 16:33:49 +0000 (16:33 +0000)]
unbreak polls
William Pitcock [Wed, 19 Jun 2019 15:57:44 +0000 (15:57 +0000)]
implement anti link spam MRF
rinpatch [Wed, 19 Jun 2019 11:59:12 +0000 (14:59 +0300)]
pleroma_ctl: Rename arch to flavour because it also includes the libc
rinpatch [Wed, 19 Jun 2019 11:53:16 +0000 (14:53 +0300)]
pleroma_ctl: add an update command
Closes #988 and #1004
rinpatch [Wed, 19 Jun 2019 11:40:39 +0000 (14:40 +0300)]
Make possible to override the branch name via a env variable
This is useful for the CI builds because they have a detached HEAD or
for emulating a feature that is availible only on a particular branch
(e.g pleroma_ctl downloads CI artifacts only for develop and master)
rinpatch [Wed, 19 Jun 2019 10:33:33 +0000 (10:33 +0000)]
Merge branch 'logger-level-for-migration-tasks' into 'develop'
Logger level for migration tasks
Closes #983
See merge request pleroma/pleroma!1295
Alexander Strizhakov [Wed, 19 Jun 2019 10:33:33 +0000 (10:33 +0000)]
aliases for mix tasks
ecto.migrate
ecto.rollback
rinpatch [Wed, 19 Jun 2019 10:22:23 +0000 (10:22 +0000)]
Merge branch 'begone-the-dot-hack' into 'develop'
Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits
See merge request pleroma/pleroma!1298
lain [Wed, 19 Jun 2019 08:48:41 +0000 (08:48 +0000)]
Merge branch 'fix/rich-media-hashtags-again' into 'develop'
Rich Media: Skip Microformats hashtags
See merge request pleroma/pleroma!1304
lain [Wed, 19 Jun 2019 08:37:34 +0000 (08:37 +0000)]
Merge branch 'update-frontend-
c4fcdc71' into 'develop'
Update bundled pleroma-fe to
c4fcdc71
See merge request pleroma/pleroma!1303
rinpatch [Wed, 19 Jun 2019 00:51:59 +0000 (03:51 +0300)]
Refactor pleroma_ctl copying to a generic function for copying files into the release dir
rinpatch [Tue, 18 Jun 2019 21:31:30 +0000 (00:31 +0300)]
Rich Media: Skip Microformats hashtags
When fixing this problem I incorrectly assumed a.hashtag is
the proper way for detecting hashtags, but it is just something Pleroma and
Mastodon add. Per microformats it should be detected by the presense of rel=tag.
This MR adds a check for rel=tag, but I still left a.hashtag just in case
rinpatch [Tue, 18 Jun 2019 21:04:00 +0000 (00:04 +0300)]
Update bundled pleroma-fe to
c4fcdc71
lain [Tue, 18 Jun 2019 20:47:36 +0000 (20:47 +0000)]
Merge branch 'deps/update-auto-linker' into 'develop'
Deps: Update auto_linker
See merge request pleroma/pleroma!1300
lain [Tue, 18 Jun 2019 20:47:07 +0000 (20:47 +0000)]
Merge branch 'fix/mastoapi-sanitize-display-name' into 'develop'
Mastodon API: Sanitize display names
Closes #1000
See merge request pleroma/pleroma!1299
Ivan Tashkinov [Tue, 18 Jun 2019 14:15:26 +0000 (17:15 +0300)]
Minor edit (comment).
Ivan Tashkinov [Tue, 18 Jun 2019 14:00:49 +0000 (17:00 +0300)]
Added more `redirect_uri` checks to prevent redirect to not explicitly listed URI.
rinpatch [Tue, 18 Jun 2019 13:08:18 +0000 (16:08 +0300)]
Deps: Update auto_linker
rinpatch [Tue, 18 Jun 2019 11:09:15 +0000 (14:09 +0300)]
Mastodon API: Sanitize display names
Closes #1000
rinpatch [Tue, 18 Jun 2019 02:05:05 +0000 (05:05 +0300)]
Add proper error handling for when the post exceeds character limits
rinpatch [Tue, 18 Jun 2019 02:04:41 +0000 (05:04 +0300)]
Mastodon API: Remove the dot hack
Haelwenn [Tue, 18 Jun 2019 01:57:32 +0000 (01:57 +0000)]
Merge branch 'feature/pleroma-ctl-rpc' into 'develop'
pleroma_ctl: Run mix tasks using rpc instead of eval
See merge request pleroma/pleroma!1297
rinpatch [Mon, 17 Jun 2019 21:17:47 +0000 (00:17 +0300)]
pleroma_ctl: Run mix tasks using rpc instead of eval
This patch changes pleroma_ctl to call into a running instance instead of spinning up
a new one for mix task execution. This significantly decreases the time needed
for mix task execution (on my machine for `pleroma_ctl user set rin --no-admin`
the difference is 0.2s vs 4.2s) and allows mix tasks to affect the
instance context, for example, this allows to clear the cache after user
deletion
rinpatch [Mon, 17 Jun 2019 14:16:23 +0000 (14:16 +0000)]
Merge branch 'removing-test-errors' into 'develop'
Removing test errors
See merge request pleroma/pleroma!1296
Haelwenn [Sun, 16 Jun 2019 18:05:00 +0000 (18:05 +0000)]
Merge branch 'fix/sanitize-report-content' into 'develop'
Sanitize HTML in ReportView
Closes #990
See merge request pleroma/pleroma!1293
Alex S [Sun, 16 Jun 2019 11:42:29 +0000 (19:42 +0800)]
capturing errors
Alex S [Sun, 16 Jun 2019 10:49:24 +0000 (18:49 +0800)]
salmon fix
removed some ownership sandbox error
rinpatch [Sun, 16 Jun 2019 10:33:25 +0000 (10:33 +0000)]
Merge branch 'issues/570' into 'develop'
[#570] add user:notification stream
See merge request pleroma/pleroma!1274
Maksim [Sun, 16 Jun 2019 10:33:25 +0000 (10:33 +0000)]
[#570] add user:notification stream
rinpatch [Sun, 16 Jun 2019 10:18:47 +0000 (10:18 +0000)]
Merge branch 'fix/991-version-generation' into 'develop'
version generation
Closes #991
See merge request pleroma/pleroma!1291
rinpatch [Sun, 16 Jun 2019 09:57:58 +0000 (12:57 +0300)]
Fix report content stopping to be nullable
lain [Sun, 16 Jun 2019 10:01:15 +0000 (10:01 +0000)]
Merge branch 'fix-for-new-isntances' into 'develop'
fix for new instances
See merge request pleroma/pleroma!1294