Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new scalar staging url #9601

Merged
merged 1 commit into from
May 1, 2019
Merged

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented May 1, 2019

NB. to release branch

@dbkr dbkr requested a review from a team May 1, 2019 10:45
@@ -6,6 +6,7 @@
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"integrations_widgets_urls": [
"https://scalar-staging.vector.im/api",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the order matter at all? Anyway, looks sane!

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the order does not matter, so should be okay.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope. Thought I would add the new one in the same place as on /app but didn't want to put unnecessary change sin by re-ordering the other ones.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this really work? Last I knew was that these url overrides don't work currently as per #9476

Copy link
Collaborator

@jryans jryans May 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does work in this default file, yes. The issue in #9476 is that we aren't checking alternate files inside the Riot application. (They are only checked at the Electron level, so that's why only update settings apple from an alternate config file at the moment.)

@dbkr dbkr merged commit f98870d into release-v1.1.0 May 1, 2019
@t3chguy t3chguy deleted the dbkr/add_scalar_staging_vector_im branch May 12, 2022 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants