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

Move config-getting to VectorBasePlatform #10181

Merged
merged 4 commits into from Jun 27, 2019

Conversation

@t3chguy
Copy link
Collaborator

t3chguy commented Jun 26, 2019

  • in Electron get config via IPC from main process which has access to the "local" config.json override file and can make people happy :D
  • Remove bunch of duplicated code,
  • and move comments around to put them in the right place

image

Fixes #9476

Signed-off-by: Michael Telatynski 7t3chguy@gmail.com

in Electron get config via IPC from main process
which has access to the "local" config.json override file
and can make people happy :D

Remove bunch of duplicated code,
and move comments around to put them in the right place

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy t3chguy requested a review from vector-im/riot-web Jun 26, 2019
t3chguy added 2 commits Jun 26, 2019
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
cleanup
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@bwindels bwindels requested review from bwindels and removed request for vector-im/riot-web Jun 27, 2019
Copy link
Contributor

bwindels left a comment

lgtm, apart from one question. Thanks!

src/vector/getconfig.js Outdated Show resolved Hide resolved
@t3chguy t3chguy requested a review from bwindels Jun 27, 2019
Copy link
Contributor

bwindels left a comment

thanks, good to merge!

@t3chguy t3chguy merged commit 2111db7 into develop Jun 27, 2019
4 checks passed
4 checks passed
buildkite/riot-web/pr Build #533 passed (4 minutes, 39 seconds)
Details
buildkite/riot-web/pr/eslint-lint Passed (1 minute, 14 seconds)
Details
buildkite/riot-web/pr/karma-tests Passed (2 minutes, 52 seconds)
Details
buildkite/riot-web/pr/pipeline Passed (5 seconds)
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.