Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 8163897e775b251514efdf5198dbd9cadd5a4aa5,3f299a941690e2a93d0e5013ecec9c53e9f90e8f..766da6c93d23d40aa0d3f6b6c2a43606e3ac5672
--- 1/lib/pleroma/web/twitter_api/twitter_api_controller.ex
--- 2/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@@ -83,10 -83,20 +83,24 @@@ defmodule Pleroma.Web.TwitterAPI.Contro
      |> send_resp(200, response)
    end
  
-   def help_test(conn, _) do
++  def help_test(conn, _params) do
 +    conn |> json_reply(200, Poison.encode!("ok"))
 +  end
 +
+   def config(conn, _params) do
+     response = %{
+       site: %{
+         name: Pleroma.Web.base_url,
+         server: Pleroma.Web.base_url,
+         textlimit: -1
+       }
+     }
+     |> Poison.encode!
+ 
+     conn
+     |> json_reply(200, response)
+   end
+ 
    defp json_reply(conn, status, json) do
      conn
      |> put_resp_content_type("application/json")

diff --cc test/web/twitter_api/twitter_api_controller_test.exs
Simple merge