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

Conversation

@dbkr
Copy link
Member

dbkr commented May 1, 2019

NB. to release branch

@dbkr dbkr requested a review from vector-im/riot-web May 1, 2019
@jryans
jryans approved these changes May 1, 2019
@@ -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",

This comment has been minimized.

Copy link
@jryans

jryans May 1, 2019

Member

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

This comment has been minimized.

Copy link
@jryans

jryans May 1, 2019

Member

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

This comment has been minimized.

Copy link
@dbkr

dbkr May 1, 2019

Author Member

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.

This comment has been minimized.

Copy link
@Ryonez

Ryonez May 7, 2019

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

This comment has been minimized.

Copy link
@jryans

jryans May 8, 2019

Member

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
4 checks passed
4 checks passed
buildkite/riot-web Build #216 passed (4 minutes, 54 seconds)
Details
buildkite/riot-web/eslint-lint Passed (1 minute, 11 seconds)
Details
buildkite/riot-web/karma-tests Passed (3 minutes, 13 seconds)
Details
buildkite/riot-web/pipeline Passed (3 seconds)
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.