From: lambda <pleromagit@rogerbraun.net>
Date: Mon, 10 Dec 2018 18:33:36 +0000 (+0000)
Subject: Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=bda25b999b5176c73380bff9a1ce6be51cba4820;p=akkoma

Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'

# Conflicts:
#   lib/mix/tasks/pleroma/uploads.ex
---

bda25b999b5176c73380bff9a1ce6be51cba4820
diff --cc lib/mix/tasks/pleroma/uploads.ex
index 6ffc941c9,c6b840130..63299b2ae
--- a/lib/mix/tasks/pleroma/uploads.ex
+++ b/lib/mix/tasks/pleroma/uploads.ex
@@@ -6,17 -5,12 +5,19 @@@ defmodule Mix.Tasks.Pleroma.Uploads d
    require Logger
  
    @log_every 50
 -  @shortdoc "Migrate uploads from local to remote storage"
 -  @doc """
++
 +  @shortdoc "Migrates uploads from local to remote storage"
 +  @moduledoc """
+    Manages uploads
++
     ## Migrate uploads from local to remote storage
 +       mix pleroma.uploads migrate_local TARGET_UPLOADER [OPTIONS...]
 +   Options:
 +   - `--delete` - delete local uploads after migrating them to the target uploader
 +
  
 +   A list of avalible uploaders can be seen in config.exs
    """
- 
    def run(["migrate_local", target_uploader | args]) do
      delete? = Enum.member?(args, "--delete")
      Common.start_pleroma()