kaniini
ddd04d1c52
Merge branch 'chore/update-bbcode' into 'develop'
...
mix: update bbcode dependency to v0.1.1
See merge request pleroma/pleroma!1321
2019-06-21 23:54:37 +00:00
rinpatch
cf94b813e5
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
2019-06-21 23:43:14 +00:00
William Pitcock
481932309f
mix: update bbcode dependency to v0.1.1
2019-06-21 23:42:50 +00:00
rinpatch
f4009b6706
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.
2019-06-22 02:29:49 +03:00
rinpatch
23608149bc
Execute migration commands as the pleroma user and add a note about the need to uncomment the RUM command
2019-06-22 02:21:02 +03:00
rinpatch
d1d648b0ec
Correct the psql command
2019-06-22 02:09:45 +03:00
rinpatch
ee4e7c6570
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
2019-06-22 02:07:05 +03:00
rinpatch
452d5d3231
Merge branch 'develop' into release-docs
2019-06-22 02:00:18 +03:00
kaniini
55742d978d
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
...
implement anti link spam MRF
See merge request pleroma/pleroma!1307
2019-06-21 22:56:54 +00:00
rinpatch
89fa14f558
Merge branch 'fix/use-config-when-possible' into 'develop'
...
use Config in generated config when available
See merge request pleroma/pleroma!1319
2019-06-21 22:43:39 +00:00
kaniini
e3534f5b3c
Merge branch 'oauth_secure_redirect' into 'develop'
...
OAuth security improvements (`redirect_uri` listing enforcement)
See merge request pleroma/pleroma!1302
2019-06-21 22:31:12 +00:00
kaniini
720412bf24
Merge branch 'revert-6f5a0cc1' into 'develop'
...
Revert "Merge branch 'fix/ogp-title' into 'develop'"
See merge request pleroma/pleroma!1317
2019-06-21 22:28:46 +00:00
William Pitcock
127a5a7d65
change the anti-link-spam MRF implementation to use old_user? instead of the previous name
2019-06-21 22:27:14 +00:00
kaniini
4d69d066c4
Merge branch 'fix-rate-limit-test' into 'develop'
...
Fix rate limiter tests
See merge request pleroma/pleroma!1316
2019-06-21 22:25:09 +00:00
rinpatch
960d6b54e8
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.
2019-06-21 22:01:59 +03:00
rinpatch
6906db512d
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
2019-06-21 17:27:00 +00:00
rinpatch
743bd64883
Apply suggestion to docs/installation/releases_en.md
2019-06-21 17:00:12 +00:00
rinpatch
de77d7621a
Apply suggestion to docs/installation/releases_en.md
2019-06-21 16:59:56 +00:00
rinpatch
8b170b96c7
Apply suggestion to docs/installation/releases_en.md
2019-06-21 16:59:48 +00:00
rinpatch
e76115989a
Move config templates to priv so they can be found in releases
2019-06-21 19:54:04 +03:00
Ivan Tashkinov
259ffe0062
Fixed branch name substitutions for mix version (to comply to SemVer format).
2019-06-21 17:19:29 +03:00
feld
b6af80f769
Revert "Merge branch 'fix/ogp-title' into 'develop'"
...
This reverts merge request !1277
2019-06-21 11:36:32 +00:00
Egor Kislitsyn
fc6e661672
Fix rate limiter tests
2019-06-21 16:47:16 +07:00
rinpatch
89fead9250
Default DB configuration to false and set the default database name to
...
`pleroma` instead of `pleroma_dev`
2019-06-21 06:42:04 +03:00
rinpatch
d55358f370
Merge branch 'develop' into release-docs
2019-06-21 06:41:13 +03:00
rinpatch
4bec121798
Do not set ownership group in chown commands
2019-06-21 06:39:03 +03:00
rinpatch
e824025c52
Remove a useless echo
2019-06-21 06:37:38 +03:00
rinpatch
16e9304cec
Change to long adduser options because the short ones only work on busybox
2019-06-21 06:32:34 +03:00
rinpatch
4669a56aa3
Add notes on RUM indexes
2019-06-21 06:22:34 +03:00
rinpatch
f9515a3611
Add a note about RUM indexes package on Debian/Ubuntu
2019-06-21 06:14:02 +03:00
rinpatch
d3d98beaad
Correct package names for Debian
2019-06-21 06:04:39 +03:00
rinpatch
267f6bedd8
Formatting
2019-06-21 05:57:46 +03:00
rinpatch
dd23888774
OTP release install guide sceleton
2019-06-21 05:48:13 +03:00
rinpatch
7e35bdbd3c
Copy the nginx config to the release directory
2019-06-21 05:46:47 +03:00
rinpatch
ddf5e6254a
Fix nginx webroot method config
2019-06-21 05:46:21 +03:00
rinpatch
2437f51284
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
2019-06-20 21:25:34 +00:00
lain
3b48876cf0
Merge branch 'fix/dynamic-configuration' into 'develop'
...
Fixes for dynamic configuration
See merge request pleroma/pleroma!1313
2019-06-20 17:43:57 +00:00
Alexander Strizhakov
32320c1ee9
Fixes for dynamic configuration
2019-06-20 17:43:57 +00:00
rinpatch
e3e8a7dc0e
Disable rpc for instance gen
2019-06-20 18:28:56 +03:00
Ivan Tashkinov
f07003e218
Fixed mix version computed for underscore-containing branches to be of SemVer format.
2019-06-20 17:54:16 +03:00
rinpatch
45c67550f5
Merge branch 'develop' into fix/config-gen-releases
2019-06-20 11:51:16 +03:00
rinpatch
ba584364e9
Merge branch 'feature/release-update-script' into 'develop'
...
pleroma_ctl: add an update command
Closes #1004 and #988
See merge request pleroma/pleroma!1305
2019-06-20 08:50:26 +00:00
rinpatch
0e31d195af
Apply suggestion to rel/files/bin/pleroma_ctl
2019-06-20 08:12:56 +00:00
rinpatch
4974988f03
Export PLEROMA_BUILD_BRANCH
2019-06-20 11:02:05 +03:00
William Pitcock
630ac6a921
docs: better description for mrf anti link spam
2019-06-20 03:01:03 +00:00
rinpatch
69070e641d
Allow setting upload/static directories in the config generator
2019-06-20 03:59:16 +03:00
rinpatch
144e2e3e0b
Remove deprecated dedupe_media from the config template
2019-06-20 03:40:00 +03:00
rinpatch
fe3a830b80
Remove a useless binding from config template call
2019-06-20 02:34:19 +03:00
rinpatch
f8c64dd4c0
Release Tasks: Ensure the application is loaded before getting the
...
modules
Needed for non-rpc tasks to work
2019-06-20 02:21:48 +03:00
rinpatch
8c7a382027
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
2019-06-20 02:08:02 +03:00
