-
Notifications
You must be signed in to change notification settings - Fork 13.8k
refactor: Remove settings dependency on startup #34199
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
Merged
Merged
Changes from 11 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
9bc1aa7
chore: move pushConfig to startup
sampaiodiego 3252623
chore: move functions from /app/lib/server/startup
sampaiodiego efae5e7
chore: configure federation
sampaiodiego 48b371e
chore: configureIRC
sampaiodiego 9adcb6d
chore: configureAssets
sampaiodiego d7160e1
chore: configureCDN
sampaiodiego 63fef6e
refactor: configureCORS
sampaiodiego 16f6291
fix setInlineScriptsAllowed
sampaiodiego 63d373c
fix CORS
sampaiodiego 92a25c9
Merge branch 'develop' into remove-settings-deps-on-startup
sampaiodiego 9d2994f
Merge branch 'develop' into remove-settings-deps-on-startup
sampaiodiego fd2fd41
Merge branch 'develop' into remove-settings-deps-on-startup
sampaiodiego bb266e9
move everything to "configuration" folder
sampaiodiego d909cdf
inject settings
sampaiodiego 7fb0bc5
lint
sampaiodiego 6a07136
Merge branch 'develop' into remove-settings-deps-on-startup
sampaiodiego c40fca2
configureLogLevel
sampaiodiego 63d779b
remove import
sampaiodiego 7958104
Merge branch 'develop' into remove-settings-deps-on-startup
sampaiodiego 1b770c3
Merge branch 'develop' into remove-settings-deps-on-startup
kodiakhq[bot] fbdb1e7
Merge branch 'develop' into remove-settings-deps-on-startup
kodiakhq[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| import './generateKeys'; | ||
| import './settings'; | ||
| import './registerCallbacks'; |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1 @@ | ||
| import './irc'; | ||
| import './methods/resetIrcConnection'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,2 @@ | ||
| import './rateLimiter'; | ||
| import './robots'; | ||
| import './settingsOnLoadCdnPrefix'; | ||
| import './settingsOnLoadDirectReply'; | ||
| import './settingsOnLoadSMTP'; |
35 changes: 0 additions & 35 deletions
35
apps/meteor/app/lib/server/startup/settingsOnLoadCdnPrefix.js
This file was deleted.
Oops, something went wrong.
43 changes: 0 additions & 43 deletions
43
apps/meteor/app/lib/server/startup/settingsOnLoadDirectReply.ts
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
35 changes: 0 additions & 35 deletions
35
apps/meteor/app/lib/server/startup/settingsOnLoadSiteUrl.ts
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| import { RocketChatAssets } from '../../app/assets/server'; | ||
| import type { ICachedSettings } from '../../app/settings/server/CachedSettings'; | ||
|
|
||
| export async function configureAssets(settings: ICachedSettings): Promise<void> { | ||
| settings.watchByRegex(/^Assets_/, (key, value) => RocketChatAssets.processAsset(key, value)); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.