Skip to content

Commit d25eb84

Browse files
committed
Remove unused variable and fix test
1 parent d7ab376 commit d25eb84

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

.k8s_ci.Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ RUN set -xe; \
5858
# Remove context from previous build; copy current context; run playbook
5959
WORKDIR /tmp/ansible
6060
RUN rm -rf *
61-
6261
RUN git clone --depth 1 --branch $GALAXY_PLAYBOOK_BRANCH $GALAXY_PLAYBOOK_REPO galaxy-docker
6362
WORKDIR /tmp/ansible/galaxy-docker
6463
RUN ansible-galaxy install -r requirements.yml -p roles --force-with-deps

client/src/components/Register/RegisterForm.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ interface Props {
3232
enableOidc?: boolean;
3333
mailingJoinAddr?: string;
3434
oidcIdps?: OIDCConfig;
35-
preferOIDCLogin?: boolean;
35+
preferOidcLogin?: boolean;
3636
redirect?: string;
3737
registrationWarningMessage?: string;
3838
serverMailConfigured?: boolean;
@@ -59,7 +59,7 @@ const labelSubscribe = ref(localize("Stay in the loop and join the galaxy-announ
5959
const idpsWithRegistration = computed(() => (props.oidcIdps ? getOIDCIdpsWithRegistration(props.oidcIdps) : {}));
6060
6161
const oidcPreferred = computed(() => {
62-
return props.enableOidc && props.preferOIDCLogin;
62+
return props.enableOidc && props.preferOidcLogin;
6363
});
6464
6565
/** This decides if all register options should be displayed in column style

client/src/components/User/ExternalIdentities/ExternalIdentities.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ export default {
121121
doomedItem: null,
122122
errorMessage: null,
123123
enable_oidc: galaxy.config.enable_oidc,
124-
cilogonOrOIDC: null,
125124
userEmail: galaxy.user.get("email"),
126125
};
127126
},

client/src/entry/analysis/modules/Register.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ describe("Register", () => {
6161
expect(props.sessionCsrfToken).toBe("session_csrf_token");
6262
expect(props.enableOidc).toBe(true);
6363
expect(props.mailingJoinAddr).toBe("mailing_join_addr");
64-
expect(props.preferOIDCLogin).toBe(true);
64+
expect(props.preferOidcLogin).toBe(true);
6565
expect(props.serverMailConfigured).toBe(true);
6666
expect(props.registrationWarningMessage).toBe("registration_warning_message");
6767
expect(props.termsUrl).toBe("terms_url");

0 commit comments

Comments
 (0)