Merge changes from upstream #184
Merged
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
Actualy the "-U --no-cache" effectivly is treated as --no-cache was never specified: / # apk -U --no-cache add sed fetch http://dl-cdn.alpinelinux.org/alpine/v3.5/main/x86_64/APKINDEX.tar.gz fetch http://dl-cdn.alpinelinux.org/alpine/v3.5/main/x86_64/APKINDEX.tar.gz fetch http://dl-cdn.alpinelinux.org/alpine/v3.5/community/x86_64/APKINDEX.tar.gz fetch http://dl-cdn.alpinelinux.org/alpine/v3.5/community/x86_64/APKINDEX.tar.gz (1/1) Installing sed (4.2.2-r0) Executing busybox-1.25.1-r0.trigger OK: 4 MiB in 12 packages / # ls -la /var/cache/apk/ total 1004 drwxr-xr-x 1 root root 70 May 8 11:08 . drwxr-xr-x 1 root root 29 Mar 3 11:20 .. -rw-r--r-- 1 root root 732807 May 5 07:11 APKINDEX.c51f8f92.tar.gz -rw-r--r-- 1 root root 293014 May 1 12:37 APKINDEX.d09172fd.tar.gz So removing the "-U" fix this behavior.
…ate database when init integration test (gogs#1693)
* markup: microoptimise for many short filenames in directory Move strings.ToLower() after the early-return length check. This is a safe operation in all cases and should slightly improve directory listing performance when a directory contains many thousands of files with short filenames. * markup: expand test cases for IsReadmeFile()
* Nitpicking
Signed-off-by: Guyzmo <[email protected]>
…n) (gogs#1705) when the user has no such permission.
* Forgot password should use ResetPwdCodeLives, not ActiveCodeLives * Improve documentation for different send mail functions related to password reset * Improve documentation in conf/app.ini regarding xxx_CODE_LIVE_MINUTES settings
changes introduced to repo format by : go-gitea/gitea#1687 go-gitea/go-sdk#58 go-gitea/gitea#1668 go-gitea/go-sdk#56
* Fix bad grammar and wordiness * Update locale_en-US.ini * Update locale_en-US.ini * Update locale_en-US.ini * Update locale_en-US.ini * Update locale_en-US.ini * Update locale_en-US.ini * Update locale_en-US.ini
when merge pull request
* Correct grammar in APIEmpty doc * Generate swagger.v1.json
* add units to team * fix lint * finish team setting backend * finished permission controll on routes * fix import blank line * add unit check on ssh/http pull and push and fix test failed * fix fixtures data * remove unused code
* Add swagger comment for MirrorSync * Generate swagger.v1.json
* Add button to admin ui * Update according to review * Update locale_fr-FR.ini * Rollback to locale french file
* Update HighlightJS to 9.11.0 * Fix YAML files highlighting
* Scrollbars on overflow of horizontal nav * Update _base.less * Add fade out on right side of overflowing nav * Update _base.less
* Added comment's hashtag to url for mail notifications. Signed-off-by: Jonas <[email protected]> * Added comment's hashtag to url for mail notifications. Added explanation to return statement. Signed-off-by: Jonas <[email protected]> * Added comment's hashtag to url for mail notifications. Added explanation to return statement + documentation. Signed-off-by: Jonas <[email protected]> * Added comment's hashtag to url for mail notifications. Signed-off-by: Jonas Franz <[email protected]> * Replacing in-line link generation with HTMLURL. (+gofmt) Signed-off-by: Jonas Franz <[email protected]> * Replaced action-based model with nil-based model. (+gofmt) Signed-off-by: Jonas Franz <[email protected]> * Replaced mailIssueActionToParticipants with mailIssueCommentToParticipants. Signed-off-by: Jonas Franz <[email protected]> * Updating comment for mailIssueCommentToParticipants Signed-off-by: Jonas Franz <[email protected]>
* Fix activity feed Preserve actions after user/repo name change * Add missing comment * Fix migration, and remove fields completely * Tests
* Fix 500 for GET /teams/:id endpoints * Integration test for GET /team/:id * Clean up integration test
It used to be unclear what the difference between the two are.
* Fix invalid reference in feeds template * Comment for GetActAvatar * Add integration test
…epos More fixes for dashboard search
* Replace Gogs by Gitea * Fix missing changes * Create Gitea webhook and put Gogs webhook apart.
gogs#1814) * xxx_active_code_live setting in printed in hours and minutes instead of just hours * Update app.ini description of xxx_code_lives settings
this makes calcFingerprint use SSH.KeyTestpath instead of os temp dir.
* Update code.gitea.io/git * Update function calls * govendor fetch
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Includes fix for #182