Merge changes from upstream #195
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
Firefox users will experience a flash of unstyled content on loading various pages, this patch will fix this issue using Filament Groups loadCSS library to asynchronously load the CSS responsible for the FOUC. Will fix gogs#1698. Signed-off-by: Sondre Nilsen <[email protected]>
Signed-off-by: Shunsuke Mie <[email protected]>
* Fix pull request compare link * Integration test
Tests indicate that line length alone does not make browsers slow, so increase the default threshold after which diffs get surpressed for line length from 500 to a more reasonable 5000 characters. Fixes: go-gitea/gitea#1826
* Fix some mistakes * Fixes * Not correct -> incorrect or invalid * Update according to comments
* Fix user profile activity feed * gofmt, and avoid overlapping database connections
* Display all organization from user settings * fix Tab selection * Update locale_en-US.ini * Add a condition for display Create organization button * Remove french translation * Remove unnecessary admin flag
* Display draft releases * Include ctx.User in user cache * Integration test
* Fix 404 for external tracking issues * Fix 404 for new/upload file
* Remove annoying difference in button heights. Why was that even there? See before & after: http://imgur.com/a/yKdUR * (2/2) Remove annoying difference in button heights
* fix: error from mktemp command in MacOS. * [ci skip] udpate temp name. Signed-off-by: Bo-Yi Wu <[email protected]>
Run unused test
Fix misspelled variables
* Center-aligned login topbar * Center-align OpenID login
…ule (gogs#1366) * Include formatting check to the `make check` rule ... and give it its own standalone target too (make fmt-check) Show diff on fmt-check failure Do not allow running "fmt-check" with incompatible go version Also simplify the `fmt` rule * Forbid running "make fmt" with Go version != 1.7 or 1.8 * Ignore bindata.go for spelling and formatting checks also remove duplicated variable assignment for GOFILES * Run `make fmt`
Update code.gitea.io/git
…1648) * Send mails as HTML as default. Setting for send as plain text. * Add new option SendAsPlainText. remove EnableHTMLAlternative * Send HTML mails as default * Add html check if html2text should be performed * Send only multipart or plain. Add deprication warning for ENABLE_HTML_ALTERNATIVE * Still use ENABLE_HTML_ALTERNATIVE for backward compatibility * Changed to not ignore html2text errors
A missing / to provide a correct endpoint
…orking Add integration test for repository forking
Bug fixes for org member API
Require token before checking membership/ownership
* Delete public key tmp file after calculating fingerprint Signed-off-by: Magnus Lindvall <[email protected]> * Move line Signed-off-by: Magnus Lindvall <[email protected]> * Remove defer statement Signed-off-by: Magnus Lindvall <[email protected]> * Readd defer statement and move remove Signed-off-by: Magnus Lindvall <[email protected]> * Delete space Signed-off-by: Magnus Lindvall <[email protected]>
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 patch for #182 and fix for #183