aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-03-05 06:07:21 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-03-13 04:26:56 +0100
commit4b73ca638ec8194e96b7d8199022f519b3499109 (patch)
treedaaf1e4d8f000ee49a5af1908cfd07e59aef4f0e
parent23960309a0677eac1cca93cbff59b31bd7e19961 (diff)
downloadpleroma-4b73ca638ec8194e96b7d8199022f519b3499109.tar.gz
[Credo][CI] Add readability as it’s fixed
-rw-r--r--.credo.exs4
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--lib/mix/tasks/pleroma/uploads.ex1
-rw-r--r--lib/pleroma/uploaders/uploader.ex1
-rw-r--r--lib/pleroma/web/nodeinfo/nodeinfo.ex1
5 files changed, 4 insertions, 5 deletions
diff --git a/.credo.exs b/.credo.exs
index 620b4abdd..46d45d015 100644
--- a/.credo.exs
+++ b/.credo.exs
@@ -81,7 +81,9 @@
{Credo.Check.Readability.ParenthesesOnZeroArityDefs},
{Credo.Check.Readability.ParenthesesInCondition},
{Credo.Check.Readability.PredicateFunctionNames},
- {Credo.Check.Readability.PreferImplicitTry},
+ # lanodan: I think PreferImplicitTry should be consistency, and the behaviour seems
+ # inconsistent, see: https://github.com/rrrene/credo/issues/224
+ {Credo.Check.Readability.PreferImplicitTry, false},
{Credo.Check.Readability.RedundantBlankLines},
{Credo.Check.Readability.StringSigils},
{Credo.Check.Readability.TrailingBlankLine},
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5b463000..0d7f92c9e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,4 +42,4 @@ unit-testing:
analysis:
stage: analysis
script:
- - mix credo list --only=warnings,todo,fixme,consistency
+ - mix credo list --only=warnings,todo,fixme,consistency,readability
diff --git a/lib/mix/tasks/pleroma/uploads.ex b/lib/mix/tasks/pleroma/uploads.ex
index 9ca123a9b..106fcf443 100644
--- a/lib/mix/tasks/pleroma/uploads.ex
+++ b/lib/mix/tasks/pleroma/uploads.ex
@@ -20,7 +20,6 @@ defmodule Mix.Tasks.Pleroma.Uploads do
Options:
- `--delete` - delete local uploads after migrating them to the target uploader
-
A list of available uploaders can be seen in config.exs
"""
def run(["migrate_local", target_uploader | args]) do
diff --git a/lib/pleroma/uploaders/uploader.ex b/lib/pleroma/uploaders/uploader.ex
index ce83cbbbc..bf15389fc 100644
--- a/lib/pleroma/uploaders/uploader.ex
+++ b/lib/pleroma/uploaders/uploader.ex
@@ -29,7 +29,6 @@ defmodule Pleroma.Uploaders.Uploader do
* `{:error, String.t}` error information if the file failed to be saved to the backend.
* `:wait_callback` will wait for an http post request at `/api/pleroma/upload_callback/:upload_path` and call the uploader's `http_callback/3` method.
-
"""
@type file_spec :: {:file | :url, String.t()}
@callback put_file(Pleroma.Upload.t()) ::
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo.ex b/lib/pleroma/web/nodeinfo/nodeinfo.ex
deleted file mode 100644
index 8b1378917..000000000
--- a/lib/pleroma/web/nodeinfo/nodeinfo.ex
+++ /dev/null
@@ -1 +0,0 @@
-