Prepare for ubuntu22 murdering openssl #120
2 changed files with 16 additions and 4 deletions
|
@ -50,6 +50,21 @@ pipeline:
|
||||||
- mix local.rebar --force
|
- mix local.rebar --force
|
||||||
- mix format --check-formatted
|
- mix format --check-formatted
|
||||||
|
|
||||||
|
build:
|
||||||
|
image: akkoma/ci-base:latest
|
||||||
|
<<: *on-pr-open
|
||||||
|
environment:
|
||||||
|
MIX_ENV: test
|
||||||
|
POSTGRES_DB: pleroma_test
|
||||||
|
POSTGRES_USER: postgres
|
||||||
|
POSTGRES_PASSWORD: postgres
|
||||||
|
DB_HOST: postgres
|
||||||
|
commands:
|
||||||
|
- mix local.hex --force
|
||||||
|
- mix local.rebar --force
|
||||||
|
- mix deps.get
|
||||||
|
- mix compile
|
||||||
|
|
||||||
test:
|
test:
|
||||||
image: akkoma/ci-base:latest
|
image: akkoma/ci-base:latest
|
||||||
<<: *on-pr-open
|
<<: *on-pr-open
|
||||||
|
|
|
@ -663,8 +663,6 @@ def force_password_reset(user), do: update_password_reset_pending(user, true)
|
||||||
# Used to auto-register LDAP accounts which won't have a password hash stored locally
|
# Used to auto-register LDAP accounts which won't have a password hash stored locally
|
||||||
def register_changeset_ldap(struct, params = %{password: password})
|
def register_changeset_ldap(struct, params = %{password: password})
|
||||||
when is_nil(password) do
|
when is_nil(password) do
|
||||||
params = Map.put_new(params, :accepts_chat_messages, true)
|
|
||||||
|
|
||||||
params =
|
params =
|
||||||
if Map.has_key?(params, :email) do
|
if Map.has_key?(params, :email) do
|
||||||
Map.put_new(params, :email, params[:email])
|
Map.put_new(params, :email, params[:email])
|
||||||
|
@ -676,8 +674,7 @@ def register_changeset_ldap(struct, params = %{password: password})
|
||||||
|> cast(params, [
|
|> cast(params, [
|
||||||
:name,
|
:name,
|
||||||
:nickname,
|
:nickname,
|
||||||
:email,
|
:email
|
||||||
:accepts_chat_messages
|
|
||||||
])
|
])
|
||||||
|> validate_required([:name, :nickname])
|
|> validate_required([:name, :nickname])
|
||||||
|> unique_constraint(:nickname)
|
|> unique_constraint(:nickname)
|
||||||
|
|
Loading…
Reference in a new issue