potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'fixes' into 'main'

Browse source 
ci: fix Gitlab CI exunit run by separating mix compile and tz_world.update

See merge request framasoft/mobilizon!1445
This commit is contained in:
Thomas Citharel 2023-09-01 10:51:35 +00:00
parent 89b57a5ec1 84f62cd043
commit 7c019e59c6
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -132,7 +132,9 @@ exunit:
variables: variables:
MIX_ENV: test MIX_ENV: test
before_script: before_script:
- mix deps.get && mix tz_world.update - mix deps.get
- mix compile
- mix tz_world.update
- mix ecto.create - mix ecto.create
- mix ecto.migrate - mix ecto.migrate
script: script:

8
js/src/views/Admin/GroupProfiles.vue
View file

@ -129,11 +129,11 @@ const PROFILES_PER_PAGE = 10;
const { restrictions } = useRestrictions(); const { restrictions } = useRestrictions();
const preferredUsername = ref(""); const preferredUsername = useRouteQuery("preferredUsername", "");
const name = ref(""); const name = useRouteQuery("name", "");
const domain = ref(""); const domain = useRouteQuery("domain", "");
const local = useRouteQuery("local", true, booleanTransformer); const local = useRouteQuery("local", domain.value === "", booleanTransformer);
const suspended = useRouteQuery("suspended", false, booleanTransformer); const suspended = useRouteQuery("suspended", false, booleanTransformer);
const page = useRouteQuery("page", 1, integerTransformer); const page = useRouteQuery("page", 1, integerTransformer);

2
js/src/views/Admin/ProfilesView.vue
View file

@ -119,7 +119,7 @@ const preferredUsername = useRouteQuery("preferredUsername", "");
const name = useRouteQuery("name", ""); const name = useRouteQuery("name", "");
const domain = useRouteQuery("domain", ""); const domain = useRouteQuery("domain", "");
const local = useRouteQuery("local", true, booleanTransformer); const local = useRouteQuery("local", domain.value === "", booleanTransformer);
const suspended = useRouteQuery("suspended", false, booleanTransformer); const suspended = useRouteQuery("suspended", false, booleanTransformer);
const page = useRouteQuery("page", 1, integerTransformer); const page = useRouteQuery("page", 1, integerTransformer);