From: rinpatch <rinpatch@sdf.org>
Date: Wed, 5 Feb 2020 16:59:21 +0000 (+0000)
Subject: Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=49e80a15377fe460d7ac644601609700fffea632;hp=-c;p=akkoma

Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'

Restarting pleroma from outside application

See merge request pleroma/pleroma!2144
---

49e80a15377fe460d7ac644601609700fffea632
diff --combined lib/pleroma/web/router.ex
index b5c1d85c7,43fee8a0f..078bf138c
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -197,6 -197,7 +197,7 @@@ defmodule Pleroma.Web.Router d
      post("/config", AdminAPIController, :config_update)
      get("/config/descriptions", AdminAPIController, :config_descriptions)
      get("/config/migrate_from_db", AdminAPIController, :migrate_from_db)
+     get("/restart", AdminAPIController, :restart)
  
      get("/moderation_log", AdminAPIController, :list_log)
  
@@@ -527,10 -528,8 +528,10 @@@
      get("/notice/:id", OStatus.OStatusController, :notice)
      get("/notice/:id/embed_player", OStatus.OStatusController, :notice_player)
  
 -    get("/users/:nickname/feed", Feed.FeedController, :feed)
 -    get("/users/:nickname", Feed.FeedController, :feed_redirect)
 +    get("/users/:nickname/feed", Feed.UserController, :feed, as: :user_feed)
 +    get("/users/:nickname", Feed.UserController, :feed_redirect, as: :user_feed)
 +
 +    get("/tags/:tag", Feed.TagController, :feed, as: :tag_feed)
    end
  
    scope "/", Pleroma.Web do
diff --combined mix.exs
index ea6b29f57,8cbea6f75..f6794f126
--- a/mix.exs
+++ b/mix.exs
@@@ -8,7 -8,7 +8,7 @@@ defmodule Pleroma.Mixfile d
        elixir: "~> 1.8",
        elixirc_paths: elixirc_paths(Mix.env()),
        compilers: [:phoenix, :gettext] ++ Mix.compilers(),
-       elixirc_options: [warnings_as_errors: true],
+       elixirc_options: [warnings_as_errors: warnings_as_errors(Mix.env())],
        xref: [exclude: [:eldap]],
        start_permanent: Mix.env() == :prod,
        aliases: aliases(),
@@@ -73,6 -73,11 +73,11 @@@
    defp elixirc_paths(:test), do: ["lib", "test/support"]
    defp elixirc_paths(_), do: ["lib"]
  
+   defp warnings_as_errors(:prod), do: false
+   # Uncomment this if you need testing configurable_from_database logic
+   # defp warnings_as_errors(:dev), do: false
+   defp warnings_as_errors(_), do: true
+ 
    # Specifies OAuth dependencies.
    defp oauth_deps do
      oauth_strategy_packages =
@@@ -101,7 -106,7 +106,7 @@@
        {:phoenix_pubsub, "~> 1.1"},
        {:phoenix_ecto, "~> 4.0"},
        {:ecto_enum, "~> 1.4"},
 -      {:ecto_sql, "~> 3.2"},
 +      {:ecto_sql, "~> 3.3.2"},
        {:postgrex, ">= 0.13.5"},
        {:oban, "~> 0.12.0"},
        {:quantum, "~> 2.3"},
@@@ -166,7 -171,8 +171,8 @@@
        {:captcha,
         git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
         ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
-       {:mox, "~> 0.5", only: :test}
+       {:mox, "~> 0.5", only: :test},
+       {:restarter, path: "./restarter"}
      ] ++ oauth_deps()
    end