akkoma
5 years agomix: update bbcode dependency to v0.1.1
William Pitcock [Fri, 21 Jun 2019 23:42:50 +0000 (23:42 +0000)]
mix: update bbcode dependency to v0.1.1

5 years agoMerge branch 'feature/mrf-anti-link-spam' into 'develop'
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

5 years agoMerge branch 'fix/use-config-when-possible' into 'develop'
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

5 years agoMerge branch 'oauth_secure_redirect' into 'develop'
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

5 years agoMerge branch 'revert-6f5a0cc1' into 'develop'
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

5 years agochange the anti-link-spam MRF implementation to use old_user? instead of the previous...
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

5 years agoMerge branch 'fix-rate-limit-test' into 'develop'
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

5 years agouse Config in generated config when available
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.

5 years agoMerge branch 'move-sample-configs' into 'develop'
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

5 years agoMove config templates to priv so they can be found in releases
rinpatch [Fri, 21 Jun 2019 16:30:25 +0000 (19:30 +0300)]
Move config templates to priv so they can be found in releases

5 years agoRevert "Merge branch 'fix/ogp-title' into 'develop'"
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

5 years agoFix rate limiter tests
Egor Kislitsyn [Fri, 21 Jun 2019 09:47:16 +0000 (16:47 +0700)]
Fix rate limiter tests

5 years agoMerge branch 'fix/config-gen-releases' into 'develop'
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

5 years agoMerge branch 'fix/dynamic-configuration' into 'develop'
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

5 years agoFixes for dynamic configuration
Alexander Strizhakov [Thu, 20 Jun 2019 17:43:57 +0000 (17:43 +0000)]
Fixes for dynamic configuration

5 years agoDisable rpc for instance gen
rinpatch [Thu, 20 Jun 2019 15:27:17 +0000 (18:27 +0300)]
Disable rpc for instance gen

5 years agoMerge branch 'develop' into fix/config-gen-releases
rinpatch [Thu, 20 Jun 2019 08:51:16 +0000 (11:51 +0300)]
Merge branch 'develop' into fix/config-gen-releases

5 years agoMerge branch 'feature/release-update-script' into 'develop'
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

5 years agoApply suggestion to rel/files/bin/pleroma_ctl
rinpatch [Thu, 20 Jun 2019 08:12:56 +0000 (08:12 +0000)]
Apply suggestion to rel/files/bin/pleroma_ctl

5 years agoExport PLEROMA_BUILD_BRANCH
rinpatch [Thu, 20 Jun 2019 08:02:05 +0000 (11:02 +0300)]
Export PLEROMA_BUILD_BRANCH

5 years agodocs: better description for mrf anti link spam
William Pitcock [Thu, 20 Jun 2019 03:01:03 +0000 (03:01 +0000)]
docs: better description for mrf anti link spam

5 years agoAllow setting upload/static directories in the config generator
rinpatch [Thu, 20 Jun 2019 00:59:16 +0000 (03:59 +0300)]
Allow setting upload/static directories in the config generator

5 years agoRemove deprecated dedupe_media from the config template
rinpatch [Thu, 20 Jun 2019 00:40:00 +0000 (03:40 +0300)]
Remove deprecated dedupe_media from the config template

5 years agoRemove a useless binding from config template call
rinpatch [Wed, 19 Jun 2019 23:34:19 +0000 (02:34 +0300)]
Remove a useless binding from config template call

5 years agoRelease Tasks: Ensure the application is loaded before getting the
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

5 years agoRename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functions
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

5 years agoMerge branch 'user_sign_out_mix_task' into 'develop'
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

5 years agoApply suggestion to lib/mix/tasks/pleroma/user.ex
Ivan Tashkinov [Wed, 19 Jun 2019 19:39:53 +0000 (19:39 +0000)]
Apply suggestion to lib/mix/tasks/pleroma/user.ex

5 years agoUser sign out mix task.
Ivan Tashkinov [Wed, 19 Jun 2019 19:29:36 +0000 (22:29 +0300)]
User sign out mix task.

5 years agounbreak polls
William Pitcock [Wed, 19 Jun 2019 16:33:49 +0000 (16:33 +0000)]
unbreak polls

5 years agoimplement anti link spam MRF
William Pitcock [Wed, 19 Jun 2019 15:57:44 +0000 (15:57 +0000)]
implement anti link spam MRF

5 years agopleroma_ctl: Rename arch to flavour because it also includes the libc
rinpatch [Wed, 19 Jun 2019 11:59:12 +0000 (14:59 +0300)]
pleroma_ctl: Rename arch to flavour because it also includes the libc

5 years agopleroma_ctl: add an update command
rinpatch [Wed, 19 Jun 2019 11:53:16 +0000 (14:53 +0300)]
pleroma_ctl: add an update command

Closes #988 and #1004

5 years agoMake possible to override the branch name via a env variable
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)

5 years agoMerge branch 'logger-level-for-migration-tasks' into 'develop'
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

5 years agoaliases for mix tasks
Alexander Strizhakov [Wed, 19 Jun 2019 10:33:33 +0000 (10:33 +0000)]
aliases for mix tasks

ecto.migrate
ecto.rollback

5 years agoMerge branch 'begone-the-dot-hack' into 'develop'
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

5 years agoMerge branch 'fix/rich-media-hashtags-again' into 'develop'
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

5 years agoMerge branch 'update-frontend-c4fcdc71' into 'develop'
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

5 years agoRefactor pleroma_ctl copying to a generic function for copying files into the release dir
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

5 years agoRich Media: Skip Microformats hashtags
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

5 years agoUpdate bundled pleroma-fe to c4fcdc71
rinpatch [Tue, 18 Jun 2019 21:04:00 +0000 (00:04 +0300)]
Update bundled pleroma-fe to c4fcdc71

5 years agoMerge branch 'deps/update-auto-linker' into 'develop'
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

5 years agoMerge branch 'fix/mastoapi-sanitize-display-name' into 'develop'
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

5 years agoMinor edit (comment).
Ivan Tashkinov [Tue, 18 Jun 2019 14:15:26 +0000 (17:15 +0300)]
Minor edit (comment).

5 years agoAdded more `redirect_uri` checks to prevent redirect to not explicitly listed URI.
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.

5 years agoDeps: Update auto_linker
rinpatch [Tue, 18 Jun 2019 13:08:18 +0000 (16:08 +0300)]
Deps: Update auto_linker

5 years agoMastodon API: Sanitize display names
rinpatch [Tue, 18 Jun 2019 11:09:15 +0000 (14:09 +0300)]
Mastodon API: Sanitize display names

Closes #1000

5 years agoAdd proper error handling for when the post exceeds character limits
rinpatch [Tue, 18 Jun 2019 02:05:05 +0000 (05:05 +0300)]
Add proper error handling for when the post exceeds character limits

5 years agoMastodon API: Remove the dot hack
rinpatch [Tue, 18 Jun 2019 02:04:41 +0000 (05:04 +0300)]
Mastodon API: Remove the dot hack

5 years agoMerge branch 'feature/pleroma-ctl-rpc' into 'develop'
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

5 years agopleroma_ctl: Run mix tasks using rpc instead of eval
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

5 years agoMerge branch 'removing-test-errors' into 'develop'
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

5 years agoMerge branch 'fix/sanitize-report-content' into 'develop'
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

5 years agocapturing errors
Alex S [Sun, 16 Jun 2019 11:42:29 +0000 (19:42 +0800)]
capturing errors

5 years agosalmon fix
Alex S [Sun, 16 Jun 2019 10:49:24 +0000 (18:49 +0800)]
salmon fix

removed some ownership sandbox error

5 years agoMerge branch 'issues/570' into 'develop'
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

5 years ago[#570] add user:notification stream
Maksim [Sun, 16 Jun 2019 10:33:25 +0000 (10:33 +0000)]
[#570] add user:notification stream

5 years agoMerge branch 'fix/991-version-generation' into 'develop'
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

5 years agoFix report content stopping to be nullable
rinpatch [Sun, 16 Jun 2019 09:57:58 +0000 (12:57 +0300)]
Fix report content stopping to be nullable

5 years agoMerge branch 'fix-for-new-isntances' into 'develop'
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

5 years agofix for new instances
Alexander Strizhakov [Sun, 16 Jun 2019 10:01:15 +0000 (10:01 +0000)]
fix for new instances

5 years agono print version to the shell
Alex S [Sun, 16 Jun 2019 03:48:15 +0000 (11:48 +0800)]
no print version to the shell

5 years agoCredo fixes
rinpatch [Sat, 15 Jun 2019 22:35:45 +0000 (01:35 +0300)]
Credo fixes

5 years agoSanitize HTML in ReportView
rinpatch [Sat, 15 Jun 2019 22:30:32 +0000 (01:30 +0300)]
Sanitize HTML in ReportView

Closes #990

5 years agoAdd tests for report view
rinpatch [Sat, 15 Jun 2019 22:30:14 +0000 (01:30 +0300)]
Add tests for report view

5 years agoMerge branch 'bugfix/980-polls-double-vote' into 'develop'
lain [Sat, 15 Jun 2019 15:13:48 +0000 (15:13 +0000)]
Merge branch 'bugfix/980-polls-double-vote' into 'develop'

MastodonAPI Controller: Band-Aid double vote problem.

See merge request pleroma/pleroma!1275

5 years agoMerge branch 'update/phoenix-and-plug' into 'develop'
lain [Sat, 15 Jun 2019 15:09:14 +0000 (15:09 +0000)]
Merge branch 'update/phoenix-and-plug' into 'develop'

Update Phoenix

See merge request pleroma/pleroma!1290

5 years agoMerge branch '963_oob_oauth_redirect_fix' into 'develop'
kaniini [Sat, 15 Jun 2019 13:45:50 +0000 (13:45 +0000)]
Merge branch '963_oob_oauth_redirect_fix' into 'develop'

[#963] No redirect on OOB OAuth authorize request with existing authorization

See merge request pleroma/pleroma!1276

5 years agoOEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in...
Mark Felder [Sat, 15 Jun 2019 12:04:01 +0000 (07:04 -0500)]
OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f
and this leftover artifact breaks compiling now.

5 years agoUpdate Phoenix to 1.4.8
Mark Felder [Sat, 15 Jun 2019 12:03:26 +0000 (07:03 -0500)]
Update Phoenix to 1.4.8

5 years agoMerge branch 'feature/add-chat-token-to-masto-api' into 'develop'
rinpatch [Sat, 15 Jun 2019 09:56:01 +0000 (09:56 +0000)]
Merge branch 'feature/add-chat-token-to-masto-api' into 'develop'

Mastodon API: Return the token needed for the chat.

See merge request pleroma/pleroma!1292

5 years agoApply suggestion to CHANGELOG.md
lain [Sat, 15 Jun 2019 09:27:27 +0000 (09:27 +0000)]
Apply suggestion to CHANGELOG.md

5 years agoDocumentation: Document chat token response.
lain [Sat, 15 Jun 2019 09:11:45 +0000 (11:11 +0200)]
Documentation: Document chat token response.

5 years agoChangelog: Document chat token.
lain [Sat, 15 Jun 2019 09:02:05 +0000 (11:02 +0200)]
Changelog: Document chat token.

5 years agoMastodon API: Return the token needed for the chat.
lain [Sat, 15 Jun 2019 08:59:35 +0000 (10:59 +0200)]
Mastodon API: Return the token needed for the chat.

5 years agobugfix
Alex S [Sat, 15 Jun 2019 08:36:13 +0000 (16:36 +0800)]
bugfix

5 years agolittle fix
Alex S [Sat, 15 Jun 2019 08:24:49 +0000 (16:24 +0800)]
little fix

5 years agoversion generation
Alex S [Sat, 15 Jun 2019 04:02:21 +0000 (12:02 +0800)]
version generation

5 years agoMerge branch 'feature/add-background-image-to-mastoapi' into 'develop'
rinpatch [Fri, 14 Jun 2019 16:49:28 +0000 (16:49 +0000)]
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'

AccountView: Add user background.

See merge request pleroma/pleroma!1280

5 years agoMerge branch 'feature/905-dynamic-configuration-in-sql' into 'develop'
kaniini [Fri, 14 Jun 2019 15:45:05 +0000 (15:45 +0000)]
Merge branch 'feature/905-dynamic-configuration-in-sql' into 'develop'

Feature/905 dynamic configuration in sql

Closes #905

See merge request pleroma/pleroma!1195

5 years agoit is changed in compile time
Alexander Strizhakov [Fri, 14 Jun 2019 15:45:05 +0000 (15:45 +0000)]
it is changed in compile time

we can't change module attributes and endpoint settings in runtime

5 years agoMerge branch 'fix-rate-limit-test' into 'develop'
rinpatch [Fri, 14 Jun 2019 14:50:19 +0000 (14:50 +0000)]
Merge branch 'fix-rate-limit-test' into 'develop'

Fix rate limit test

See merge request pleroma/pleroma!1289

5 years agoFix rate limit test
Egor Kislitsyn [Fri, 14 Jun 2019 12:24:31 +0000 (19:24 +0700)]
Fix rate limit test

5 years agoMerge branch 'fix/hashtag-rich-media' into 'develop'
lain [Fri, 14 Jun 2019 11:52:04 +0000 (11:52 +0000)]
Merge branch 'fix/hashtag-rich-media' into 'develop'

Fix hashtags being picked up by rich media parser

Closes #989

See merge request pleroma/pleroma!1288

5 years agoMerge branch 'issues/948-account-search' into 'develop'
lain [Fri, 14 Jun 2019 11:39:57 +0000 (11:39 +0000)]
Merge branch 'issues/948-account-search' into 'develop'

[#948] /api/v1/account_search added optional parameters (limit, offset, following)

See merge request pleroma/pleroma!1270

5 years ago[#948] /api/v1/account_search added optional parameters (limit, offset, following)
Maksim [Fri, 14 Jun 2019 11:39:57 +0000 (11:39 +0000)]
[#948] /api/v1/account_search added optional parameters (limit, offset, following)

5 years agoFix hashtags being picked up by rich media parser
rinpatch [Fri, 14 Jun 2019 11:34:42 +0000 (14:34 +0300)]
Fix hashtags being picked up by rich media parser

Closes #989

5 years agoMerge branch 'patch-2' into 'develop'
lain [Fri, 14 Jun 2019 09:42:04 +0000 (09:42 +0000)]
Merge branch 'patch-2' into 'develop'

Add copyright info to containment.ex

See merge request pleroma/pleroma!1286

5 years agoAdd copyright info to containment.ex
Egor [Fri, 14 Jun 2019 09:26:36 +0000 (09:26 +0000)]
Add copyright info to containment.ex

5 years agoMerge branch '986-document-how-to-disable-rate-limiting' into 'develop'
lain [Fri, 14 Jun 2019 09:26:26 +0000 (09:26 +0000)]
Merge branch '986-document-how-to-disable-rate-limiting' into 'develop'

Resolve "Document how to disable rate limiting"

Closes #986

See merge request pleroma/pleroma!1285

5 years agoMastodon API: Document changes.
lain [Fri, 14 Jun 2019 09:24:09 +0000 (11:24 +0200)]
Mastodon API: Document changes.

5 years agoMastodonAPI: Add a way to update the background image.
lain [Fri, 14 Jun 2019 09:19:22 +0000 (11:19 +0200)]
MastodonAPI: Add a way to update the background image.

5 years agoImprove rate limiter documentation
Egor Kislitsyn [Fri, 14 Jun 2019 08:02:10 +0000 (15:02 +0700)]
Improve rate limiter documentation

Documents how to disable rate limiting

5 years agoMerge branch 'feature/ci-release-build' into 'develop'
lain [Fri, 14 Jun 2019 06:56:27 +0000 (06:56 +0000)]
Merge branch 'feature/ci-release-build' into 'develop'

CI: build otp releases for master and develop branches

See merge request pleroma/pleroma!1279

5 years agoMerge branch 'release-move-out-application-dir' into 'develop'
lain [Fri, 14 Jun 2019 06:40:04 +0000 (06:40 +0000)]
Merge branch 'release-move-out-application-dir' into 'develop'

Set instance static/uploads to be outside of application directory in release config

See merge request pleroma/pleroma!1283

5 years agoSet instance static/uploads to be outside of application directory in release config
rinpatch [Thu, 13 Jun 2019 22:38:32 +0000 (01:38 +0300)]
Set instance static/uploads to be outside of application directory in release config

In case of releases the application directory changes with each version
so the contents will not be accessible

5 years agoremove the feature branch from only
rinpatch [Thu, 13 Jun 2019 19:31:15 +0000 (22:31 +0300)]
remove the feature branch from only

5 years agoMerge branch 'fix/pleroma-ctl-shellcheck' into 'develop'
rinpatch [Thu, 13 Jun 2019 19:25:48 +0000 (19:25 +0000)]
Merge branch 'fix/pleroma-ctl-shellcheck' into 'develop'

pleroma_ctl: fix == instead of = and double quote the path to prevent globing

See merge request pleroma/pleroma!1282

5 years agopleroma_ctl: fix == instead of = and double quote the path to prevent globing
rinpatch [Thu, 13 Jun 2019 19:16:57 +0000 (22:16 +0300)]
pleroma_ctl: fix == instead of = and double quote the path to prevent globing