diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-05-01 12:29:33 +0700 |
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-05-01 12:29:33 +0700 |
| commit | bdfa3a6fa87f95e93aa853ec4961645215f31221 (patch) | |
| tree | 467b9dd762c9878541e34f2b38a1c58e387c8f2c /lib/pleroma/repo.ex | |
| parent | 97b35e00b049c8f908484163b5ffdbcb55db7867 (diff) | |
| parent | 77690b9d03facf74483e3379f72b5b51c9f1bd4e (diff) | |
| download | pleroma-bdfa3a6fa87f95e93aa853ec4961645215f31221.tar.gz | |
Merging with develop
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
Diffstat (limited to 'lib/pleroma/repo.ex')
| -rw-r--r-- | lib/pleroma/repo.ex | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/repo.ex b/lib/pleroma/repo.ex index e6a51b19e..aa5d427ae 100644 --- a/lib/pleroma/repo.ex +++ b/lib/pleroma/repo.ex @@ -3,7 +3,14 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Repo do - use Ecto.Repo, otp_app: :pleroma + use Ecto.Repo, + otp_app: :pleroma, + adapter: Ecto.Adapters.Postgres, + migration_timestamps: [type: :naive_datetime_usec] + + defmodule Instrumenter do + use Prometheus.EctoInstrumenter + end @doc """ Dynamically loads the repository url from the |