diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-06 20:15:16 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-06 20:15:16 +0700 |
| commit | 4944498133d4a945650201226808b1f09d355014 (patch) | |
| tree | 02e83bac731ca6b391b63d826d8230bdb0fdaed8 /config/dev.exs | |
| parent | bac58b152495c3ebf72e3ad1c3102de075fcc366 (diff) | |
| parent | ccf0b46dd6a0390a06847b4a1c3eedc8d8e6c916 (diff) | |
| download | pleroma-4944498133d4a945650201226808b1f09d355014.tar.gz pleroma-4944498133d4a945650201226808b1f09d355014.zip | |
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
Diffstat (limited to 'config/dev.exs')
| -rw-r--r-- | config/dev.exs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/config/dev.exs b/config/dev.exs index 7b06ad67e..166be721a 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -49,11 +49,10 @@ config :pleroma, Pleroma.Repo, hostname: "localhost", pool_size: 10 -try do +if File.exists?("./config/dev.secret.exs") do import_config "dev.secret.exs" -rescue - _ -> - IO.puts( - "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs" - ) +else + IO.puts( + "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs" + ) end |