-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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 install pages out of main macaron routes #13195
Merged
techknowlogick
merged 6 commits into
go-gitea:master
from
zeripath:install-before-routes
Oct 19, 2020
Merged
Move install pages out of main macaron routes #13195
techknowlogick
merged 6 commits into
go-gitea:master
from
zeripath:install-before-routes
Oct 19, 2020
Conversation
This file contains 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
Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
changed the title
Move install pages out of main macaron loop
Move install pages out of main macaron routes
Oct 18, 2020
Codecov Report
@@ Coverage Diff @@
## master #13195 +/- ##
==========================================
- Coverage 42.01% 41.97% -0.05%
==========================================
Files 683 683
Lines 75215 75279 +64
==========================================
- Hits 31605 31599 -6
- Misses 38443 38515 +72
+ Partials 5167 5165 -2
Continue to review full report at Codecov.
|
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Oct 18, 2020
Replaces #12696 |
lafriks
reviewed
Oct 18, 2020
Co-authored-by: Lauris BH <lauris@nix.lv>
lafriks
approved these changes
Oct 18, 2020
GiteaBot
added
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
and removed
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
labels
Oct 18, 2020
silverwind
reviewed
Oct 19, 2020
Signed-off-by: Andrew Thornton <art27@cantab.net>
silverwind
approved these changes
Oct 19, 2020
GiteaBot
added
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
and removed
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
labels
Oct 19, 2020
🚀 |
ivanvc
added a commit
to ivanvc/gitea
that referenced
this pull request
Oct 21, 2020
…ments-in-pull-request-label-style * origin/master: (27 commits) [skip ci] Updated translations via Crowdin add more clarification to the issue-template.md (go-gitea#13235) go-version constraints ignore pre-releases (go-gitea#13234) [skip ci] Updated translations via Crowdin Update some JS dependencies (go-gitea#13222) Return the full rejection message and errors in flash errors (go-gitea#13221) Update heatmap fixtures to restore tests (go-gitea#13224) [skip ci] Updated translations via Crowdin Add review request api (go-gitea#11355) [skip ci] Updated translations via Crowdin When the git ref is unable to be found return broken pr (go-gitea#13218) Various arc-green fixes (go-gitea#13214) Show stale label for stale code comment which is marked as resolved (go-gitea#13213) Move install pages out of main macaron routes (go-gitea#13195) Use CSS Variables for fonts, remove postcss-loader (go-gitea#13204) [skip ci] Updated translations via Crowdin Align `SSH_AUTHORIZED_KEYS_BACKUP` var with the value in `app.ini` (go-gitea#13212) Fix size and clickable area on file table back link (go-gitea#13205) [skip ci] Updated translations via Crowdin Fix error in diff html rendering (go-gitea#13191) ...
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Oct 24, 2020
Unfortunately there was an error in go-gitea#13195 which set the --port option before the settings were read. This PR fixes this by moving applying this option to after the the settings are read However, on looking further into this code I believe that the setPort code was slightly odd. Firstly, it may make sense to run the install page on a different temporary port to the full system and this should be possible with a --install-port option. Secondy, if the --port option is provided we should apply it to both otherwise there will be unusual behaviour on graceful restart Thirdly, the documentation for --port says that the setting is temporary - it should therefore not save its result to the configuration (This however, does mean that authorized_keys and internal links may not be correct. - I think we need to discuss this option further.) Fix go-gitea#13277 Signed-off-by: Andrew Thornton <art27@cantab.net>
Merged
techknowlogick
added a commit
that referenced
this pull request
Oct 30, 2020
* Fix --port setting Unfortunately there was an error in #13195 which set the --port option before the settings were read. This PR fixes this by moving applying this option to after the the settings are read However, on looking further into this code I believe that the setPort code was slightly odd. Firstly, it may make sense to run the install page on a different temporary port to the full system and this should be possible with a --install-port option. Secondy, if the --port option is provided we should apply it to both otherwise there will be unusual behaviour on graceful restart Thirdly, the documentation for --port says that the setting is temporary - it should therefore not save its result to the configuration (This however, does mean that authorized_keys and internal links may not be correct. - I think we need to discuss this option further.) Fix #13277 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update cmd/web.go * Apply suggestions from code review Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
type/enhancement
An improvement of existing functionality
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.
Currently Gitea will simply try to run normally after the install page has completed. This unfortunately doesn't quite work with duplicate log entries and other problems.
This PR moves the install pages out of the main routes page and if installation is required starts a specific router for that before the main router.
It also fixes initial login for administrator user.
And starts the PProf server before the global init so that can be examined too.
Signed-off-by: Andrew Thornton art27@cantab.net