]>
source.dussan.org Git - gitea.git/log
silverwind [Sun, 23 Feb 2020 04:32:15 +0000 (05:32 +0100)]
Various dark theme fixes (#10416)
- beatify simplemde, remove header hover effect (does not play well with
border colors), remove double border separators
- fix colored outline buttons
- fix disabled style
- fix positive messages
- fix markdown header border and quote block
- adjust footer color
- adjust file icons and release list timeline
6543 [Sat, 22 Feb 2020 22:45:20 +0000 (23:45 +0100)]
update integration README (#10400)
John Olheiser [Sat, 22 Feb 2020 14:06:07 +0000 (08:06 -0600)]
Fix profile page CSS (#10406)
* Fix profile page
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Remove redundant CSS
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Fix .username and change em to rem
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
zeripath [Sat, 22 Feb 2020 13:08:48 +0000 (13:08 +0000)]
Handle push rejection message in Merge & Web Editor (#10373)
* Handle push rejection message in Merge
* placate golangci-lint
* Fix sanitize, adjust message handling
* oops
* Oops
* Handle push-rejection in webeditor CRUD too
* Apply suggestions from code review
Co-authored-by: Lauris BH <lauris@nix.lv>
silverwind [Sat, 22 Feb 2020 09:15:11 +0000 (10:15 +0100)]
Add frontend/backend make targets, fix source release (#10325)
* Add frontend/backend make targets, fix source release
- Add 'make backend' and 'make frontend' make targets which are used to
build go and js/css/svg files respectively.
- The 'backend' target can be invoked without requiring Node.js to be
present on the system if pre-built frontend assets are present like
in the release source tarballs.
- Fix source releases missing 'dist' folders inside 'node_modules' which
were erronously excluded from tar.
- Store VERSION in file VERSION for the release tarballs and prefer that
file over git-derived version.
* fix release task
* fix typo
* fix another typo
zeripath [Fri, 21 Feb 2020 23:04:20 +0000 (23:04 +0000)]
Render READMEs in docs/ .gitea or .github from root (#10361)
* Render READMEs in docs/ .gitea or .github from root
GiteaBot [Fri, 21 Feb 2020 18:19:29 +0000 (18:19 +0000)]
[skip ci] Updated translations via Crowdin
zeripath [Fri, 21 Feb 2020 18:18:13 +0000 (18:18 +0000)]
Prevent panic on merge to PR (#10403)
If you attempt to merge to a branch which on a PR there will be a nil pointer error in the pull request checker.
This panic is uncaught and will bring down the gitea server.
This PR adds protection to prevent this.
guillep2k [Fri, 21 Feb 2020 13:08:04 +0000 (10:08 -0300)]
Ensure only own addresses are updated (#10397)
John Olheiser [Thu, 20 Feb 2020 23:44:13 +0000 (17:44 -0600)]
Fixes (#10386)
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: techknowlogick <matti@mdranta.net>
silverwind [Thu, 20 Feb 2020 22:36:47 +0000 (23:36 +0100)]
fix input[type=file] on dark theme (#10382)
GiteaBot [Thu, 20 Feb 2020 21:04:58 +0000 (21:04 +0000)]
[skip ci] Updated translations via Crowdin
techknowlogick [Thu, 20 Feb 2020 21:03:34 +0000 (16:03 -0500)]
update crypto vendors (#10385)
Lauris BH [Thu, 20 Feb 2020 19:53:55 +0000 (21:53 +0200)]
Add detected file language to code search (#10256)
Move langauge detection to separate module to be more reusable
Add option to disable vendored file exclusion from file search
Allways show all language stats for search
Lunny Xiao [Thu, 20 Feb 2020 07:46:46 +0000 (15:46 +0800)]
Fix wrong num closed issues on repository when close issue via commit (#10364)
Co-authored-by: Lauris BH <lauris@nix.lv>
silverwind [Wed, 19 Feb 2020 22:16:30 +0000 (23:16 +0100)]
optimize public/img/loading.png (#10372)
Andres Mazzo [Wed, 19 Feb 2020 21:48:33 +0000 (18:48 -0300)]
fix typo of english content page (#10370)
Lauris BH [Wed, 19 Feb 2020 20:59:55 +0000 (22:59 +0200)]
Change loading animation frame order (#10358)
Lunny Xiao [Wed, 19 Feb 2020 15:46:14 +0000 (23:46 +0800)]
Fix test (#10363)
silverwind [Wed, 19 Feb 2020 03:10:25 +0000 (04:10 +0100)]
remove release-dirs make target (#10350)
- only `mkdir`the dist dirs when they are absent
- add the dist dirs as prereqs so targets like `make release-sources`
can run standalone
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
John Olheiser [Wed, 19 Feb 2020 01:23:45 +0000 (19:23 -0600)]
Re-order GPG signing docs and fix code blocks (#10349)
* Move chunk and format
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* word
Signed-off-by: jolheiser <john.olheiser@gmail.com>
zeripath [Wed, 19 Feb 2020 00:36:19 +0000 (00:36 +0000)]
Reading pull attachments should depend on read UnitTypePullRequests (#10346)
* Make pull attachments depend on read UnitTypePullRequests
Fixes #10336
* Fix test
zeripath [Tue, 18 Feb 2020 23:07:00 +0000 (23:07 +0000)]
Set max-width on review-box comment box (#10348)
Bagas Sanjaya [Tue, 18 Feb 2020 21:51:24 +0000 (04:51 +0700)]
[Docs] Database Preparation (#9826)
* Database Preparation
* Apply suggestions from @guillep2k
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
* Repeat strong password notice on PostgreSQL
* Add prerequisite note
* Use utf8mb4 instead of utf8
* Use utf8mb4 if complete character coverage wanted
* utf8mb4 recommended
* Reword utf8mb4 recommendation
* Set InnoDB global variables may be needed
* Reorder step number
* Whoops, bump year date
* Remove `SET GLOBAL`s and step number reorder
It is assumed that such global variables value are already as default on MySQL 5.7 and later, so those are redundant.
* Syntax edit on MySQL GRANT PRIVILEGEs
* DB engine uniformity intro edit
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
zeripath [Tue, 18 Feb 2020 20:46:21 +0000 (20:46 +0000)]
Revert "Do docker releases for pushes to release branches (#10330)" (#10345)
This reverts commit
69f80fd9f69c08b2320523adc99c9257df52108d .
zeripath [Tue, 18 Feb 2020 19:34:08 +0000 (19:34 +0000)]
Prevent nil pointer in GetPullRequestCommitStatusState (#10342)
Ensure that pr.HeadRepo is loaded before using it in GetPullRequestCommitStatusState.
Fixes error on merging with successful commit merge statuses.
John Olheiser [Tue, 18 Feb 2020 18:58:16 +0000 (12:58 -0600)]
Fix status check enable (#10341)
Signed-off-by: jolheiser <john.olheiser@gmail.com>
zeripath [Tue, 18 Feb 2020 10:24:09 +0000 (10:24 +0000)]
Do docker releases for pushes to release branches (#10330)
Co-authored-by: Lauris BH <lauris@nix.lv>
Lunny Xiao [Tue, 18 Feb 2020 08:52:57 +0000 (16:52 +0800)]
Fix notification (#10331)
GiteaBot [Tue, 18 Feb 2020 06:11:13 +0000 (06:11 +0000)]
[skip ci] Updated translations via Crowdin
John Olheiser [Tue, 18 Feb 2020 06:07:58 +0000 (00:07 -0600)]
Fix JS and Vue (#10328)
Signed-off-by: jolheiser <john.olheiser@gmail.com>
GiteaBot [Tue, 18 Feb 2020 03:17:09 +0000 (03:17 +0000)]
[skip ci] Updated translations via Crowdin
Mike Gerber [Tue, 18 Feb 2020 03:14:11 +0000 (04:14 +0100)]
Fix cron.repo_health_check schedule example in config cheat sheet (#10324)
Fixes #10274.
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Lunny Xiao [Tue, 18 Feb 2020 00:42:13 +0000 (08:42 +0800)]
Fix migration information update bug when linked github account (#10310)
* Fix bug on upgrade migrated reactions
* Fix migration information update bug when linked github account
Co-authored-by: zeripath <art27@cantab.net>
John Olheiser [Mon, 17 Feb 2020 23:11:59 +0000 (17:11 -0600)]
Inject SVG sprite via ajax (#10320)
* AJAX SVG
* Fix PWA
* Remove unused PWA assets
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-Authored-by: silverwind <me@silverwind.io>
zeripath [Mon, 17 Feb 2020 21:43:20 +0000 (21:43 +0000)]
Create Changelog for v1.11.1 release (#10286) (#10321)
* Create Changelog
* Update CHANGELOG.md
* Include
Co-authored-by: techknowlogick <matti@mdranta.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
zeripath [Mon, 17 Feb 2020 20:22:36 +0000 (20:22 +0000)]
Set the initial commit status to Success otherwise it will always be Pending (#10317)
The commit status code has a bug whereby setting the initial status to Pending means you can never have the status of Success - it should be set to Success.
zeripath [Mon, 17 Feb 2020 17:45:55 +0000 (17:45 +0000)]
Truncate long commit message header (#10301)
* Truncate long commit message header
* Fix overflow in view commit table
* Use @media less
* Further improvements
* Fix the commit message on small screens
* adjust width of minimal table
mrsdizzie [Mon, 17 Feb 2020 05:46:51 +0000 (00:46 -0500)]
Don't manually replace whitespace during render (#10291)
* Don't manually replace whitespace during render
For historical reasons Gitea manually alters the urlPrefix and replaces
a whitespace with a +. This Works for URLs, but we're also passing
urlPrefix to git calls and adding the + is breaking the tree path.
Goldmark will automatically convert a white space to the proper %20, so
we should leave the string as is which lets us pass it to git unmodified
and then let Goldmark fix it.
Also fixed separate bug in URLJoin I noticed while testing where it will
silently discard sections of a path that have # in them (possibly
others). We should just escape it first.
Fixes 10156
* Escape elems as well
* Revert "Escape elems as well"
This reverts commit
8bf49596fee6fac4d9da256cd1e90a0ec0183671 .
* restart ci
* remove changes to URLJoin
* restart ci
Co-authored-by: techknowlogick <matti@mdranta.net>
GiteaBot [Sun, 16 Feb 2020 21:43:17 +0000 (21:43 +0000)]
[skip ci] Updated translations via Crowdin
zeripath [Sun, 16 Feb 2020 21:38:24 +0000 (21:38 +0000)]
v1.10.4 Changelog (#10294) (#10306)
* v1.10.4 Changelog
* Add backport identifier for #10261
* Update CHANGELOG.md entry for #9884
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Antoine GIRARD [Sun, 16 Feb 2020 20:46:29 +0000 (21:46 +0100)]
fix: set explicit POSTGRES_PASSWORD for pgsql on drone CI (#10302)
Antoine GIRARD [Sun, 16 Feb 2020 20:44:52 +0000 (21:44 +0100)]
ui: better mobile review-box sizing (#10297)
Antoine GIRARD [Sun, 16 Feb 2020 17:53:02 +0000 (18:53 +0100)]
make: add release-sources (#10295)
* make: add release-sources
* make: release-sources exclude .git and make_evidence
Antoine GIRARD [Sun, 16 Feb 2020 16:30:09 +0000 (17:30 +0100)]
make/pr: enforce vendor for run (#10296)
techknowlogick [Sun, 16 Feb 2020 07:56:49 +0000 (02:56 -0500)]
Blacklist manifest.json & milestones user (#10292)
Fix #10290
zeripath [Sun, 16 Feb 2020 00:29:43 +0000 (00:29 +0000)]
Notification: queue ui.go notification-service (#10281)
Co-authored-by: Lauris BH <lauris@nix.lv>
Gary Kim [Sat, 15 Feb 2020 23:00:40 +0000 (07:00 +0800)]
Update static resources documentation (#10270)
Signed-off-by: Gary Kim <gary@garykim.dev>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: zeripath <art27@cantab.net>
GiteaBot [Sat, 15 Feb 2020 18:47:31 +0000 (18:47 +0000)]
[skip ci] Updated translations via Crowdin
zeripath [Sat, 15 Feb 2020 18:44:58 +0000 (18:44 +0000)]
Fix Workerpool deadlock (#10283)
* Prevent deadlock on boost
* Force a boost in testchannelqueue
guillep2k [Sat, 15 Feb 2020 10:51:25 +0000 (07:51 -0300)]
Divide GetIssueStats query in smaller chunks (#10176)
* Divide GetIssueStats query in smaller chunks
* Skip chunking if count is low enough
* Fix lint
* Define maxQueryParameters
* Remove absMaxQueryParameters because of lint
* Restart CI
* Restart CI
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
guillep2k [Sat, 15 Feb 2020 08:59:43 +0000 (05:59 -0300)]
Move fixture generation to contrib and add test (#10277)
* Add fixture gen tool and fix "access" test
* Close file before exiting
* Add missing repo_unit for repo id: 5
* Fix count on TestAPIOrgRepos
* Generate access fixture from contrib and add test
* Remove old access fixture generation
* Fix lint
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
guillep2k [Sat, 15 Feb 2020 04:29:06 +0000 (01:29 -0300)]
Fix "access" fixtures and tests (#10247)
* Add fixture gen tool and fix "access" test
* Close file before exiting
* Add missing repo_unit for repo id: 5
* Fix count on TestAPIOrgRepos
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
GiteaBot [Fri, 14 Feb 2020 12:44:14 +0000 (12:44 +0000)]
[skip ci] Updated translations via Crowdin
Lauris BH [Fri, 14 Feb 2020 12:42:30 +0000 (14:42 +0200)]
Index code and stats only for non-empty repositories (#10251)
Fix test and switch to unique queue
Fix MySQL support when deleting old statistics
GiteaBot [Fri, 14 Feb 2020 03:09:58 +0000 (03:09 +0000)]
[skip ci] Updated translations via Crowdin
John Olheiser [Fri, 14 Feb 2020 03:07:10 +0000 (21:07 -0600)]
Update discord link (#10263)
Lunny Xiao [Thu, 13 Feb 2020 06:06:17 +0000 (14:06 +0800)]
Issue search support elasticsearch (#9428)
* Issue search support elasticsearch
* Fix lint
* Add indexer name on app.ini
* add a warnning on SearchIssuesByKeyword
* improve code
Lunny Xiao [Thu, 13 Feb 2020 05:22:15 +0000 (13:22 +0800)]
Fix reply on code review (#10227)
Co-authored-by: zeripath <art27@cantab.net>
David Svantesson [Wed, 12 Feb 2020 23:19:35 +0000 (00:19 +0100)]
Add API branch protection endpoint (#9311)
* add API branch protection endpoint
* lint
* Change to use team names instead of ids.
* Status codes.
* fix
* Fix
* Add new branch protection options (BlockOnRejectedReviews, DismissStaleApprovals, RequireSignedCommits)
* Do xorm query directly
* fix xorm GetUserNamesByIDs
* Add some tests
* Improved GetTeamNamesByID
* http status created for CreateBranchProtection
* Correct status code in integration test
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
GiteaBot [Wed, 12 Feb 2020 19:33:28 +0000 (19:33 +0000)]
[skip ci] Updated translations via Crowdin
techknowlogick [Wed, 12 Feb 2020 19:30:48 +0000 (14:30 -0500)]
Add note about which version embedded tool is implemented (#10255)
Lunny Xiao [Wed, 12 Feb 2020 10:12:27 +0000 (18:12 +0800)]
Fix queue pop error and stat empty repository error (#10248)
* Fix queue pop error and stat empty repository error
* Fix error
Lunny Xiao [Wed, 12 Feb 2020 08:48:28 +0000 (16:48 +0800)]
Add feishu webhook support (#10229)
Add feishu webhook support
silverwind [Wed, 12 Feb 2020 03:38:32 +0000 (04:38 +0100)]
fix margin on attached segments with headers (#10235)
Fixes: https://github.com/go-gitea/gitea/issues/10210
Co-authored-by: techknowlogick <matti@mdranta.net>
GiteaBot [Wed, 12 Feb 2020 01:54:51 +0000 (01:54 +0000)]
[skip ci] Updated translations via Crowdin
John Olheiser [Wed, 12 Feb 2020 01:53:18 +0000 (19:53 -0600)]
SVG Octicon fixes (#10237)
* SVG fixes
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Colorize span->svg only
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* @silverwind suggestions
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Alphabetical
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Convert suburl and staticPrefix to window.config
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* De-structure
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
jaqra [Wed, 12 Feb 2020 00:07:07 +0000 (03:07 +0300)]
fix label menu text on miletone issues (#10242)
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
zeripath [Tue, 11 Feb 2020 23:21:20 +0000 (23:21 +0000)]
Stop hanging issue indexer initialisation from preventing shutdown (#10243)
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
jaqra [Tue, 11 Feb 2020 21:25:41 +0000 (00:25 +0300)]
fix filter label emoji width (#10241)
James Lakin [Tue, 11 Feb 2020 20:40:47 +0000 (20:40 +0000)]
Fix issue sidebar menus having an infinite height (#10239)
* Revert "Limit label list height on edit issue page"
* Fix issue sidebar menus having an infinite height
silverwind [Tue, 11 Feb 2020 19:42:03 +0000 (20:42 +0100)]
add TAGS variable prereq on make targets that use it (#10219)
Write out TAGS to .make_evidence/tags and compare it to the previous
invocation. If they differ, insert the evidence file into the prereqs
of targets that use TAGS. I made it .PHONY so it always builds.
I did not include the prereq on release tasks, asssuming the will always
do a clean build.
Fixes: https://github.com/go-gitea/gitea/issues/10196
Co-authored-by: techknowlogick <matti@mdranta.net>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
6543 [Tue, 11 Feb 2020 18:58:23 +0000 (19:58 +0100)]
update vendor keybase/go-crypto (#10234)
John Olheiser [Tue, 11 Feb 2020 17:02:41 +0000 (11:02 -0600)]
Add Octicon SVG spritemap (#10107)
* Add octicon SVG sprite
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Static prefix
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* SVG for all repo icons
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* make vendor
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Swap out octicons
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Move octicons to top of less imports
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Fix JS
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Definitely not a search/replace
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Missed regex
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Move to more generic calls and webpack
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* make svg -> make webpack
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Remove svg-sprite
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Update tests
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Missed a test
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Remove svg from makefile
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Suggestions
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Attempt to fix test
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Update tests
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Revert timetracking test
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Swap .octicon for .svg in less
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Add aria-hidden
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Replace mega-octicon
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Fix webpack globbing on Windows
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Revert
Co-Authored-By: silverwind <me@silverwind.io>
* Fix octions from upstream
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Fix Vue and missed JS function
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Add JS helper and PWA
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Preload SVG
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <matti@mdranta.net>
GiteaBot [Tue, 11 Feb 2020 15:44:26 +0000 (15:44 +0000)]
[skip ci] Updated translations via Crowdin
jaqra [Tue, 11 Feb 2020 15:41:48 +0000 (18:41 +0300)]
Limit label list height on edit issue page (#10216)
Lauris BH [Tue, 11 Feb 2020 09:34:17 +0000 (11:34 +0200)]
Language statistics bar for repositories (#8037)
* Implementation for calculating language statistics
Impement saving code language statistics to database
Implement rendering langauge stats
Add primary laguage to show in repository list
Implement repository stats indexer queue
Add indexer test
Refactor to use queue module
* Do not timeout for queues
zeripath [Tue, 11 Feb 2020 05:29:45 +0000 (05:29 +0000)]
Restore graceful restart on SIGHUP (#10224)
Co-authored-by: Lauris BH <lauris@nix.lv>
GiteaBot [Mon, 10 Feb 2020 23:07:55 +0000 (23:07 +0000)]
[skip ci] Updated translations via Crowdin
Lauris BH [Mon, 10 Feb 2020 23:04:43 +0000 (01:04 +0200)]
Fix commit between two commits calculation if there is only last commit (#10225)
GiteaBot [Mon, 10 Feb 2020 19:26:08 +0000 (19:26 +0000)]
[skip ci] Updated translations via Crowdin
guillep2k [Mon, 10 Feb 2020 19:23:35 +0000 (16:23 -0300)]
Improve 404 error message (#10214)
John Olheiser [Mon, 10 Feb 2020 16:16:31 +0000 (10:16 -0600)]
Changelog 1.11.0 (#10204) (#10211)
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
zeripath [Mon, 10 Feb 2020 02:53:41 +0000 (02:53 +0000)]
Only show conflicted files if not merged (#10197)
* Only show conflicted files if not merged
* try again
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Co-authored-by: techknowlogick <matti@mdranta.net>
zeripath [Sun, 9 Feb 2020 23:09:31 +0000 (23:09 +0000)]
Only check for conflicts/merging if the PR has not been merged in the interim (#10132)
* Only check for merging if the PR has not been merged in the interim
* fixup! Only check for merging if the PR has not been merged in the interim
* Try to fix test failure
* Use PR2 not PR1 in tests as PR1 merges automatically
* return already merged error
* enforce locking
* enforce locking - fix-test
* enforce locking - fix-testx2
* enforce locking - fix-testx3
* move pullrequest checking to after merge
This might improve the chance that the race does not affect us but does not prevent it.
* Remove minor race with getting merge commit id
* fixup
* move check pr after merge
* Remove unnecessary prepareTestEnv - onGiteaRun does this for us
* Add information about when merging occuring
* fix fmt
* More logging
* Attempt to fix mysql
* Try MySQL fix again
* try again
* Try again?!
* Try again?!
* Sigh
* remove the count - perhaps that will help
* next remove the update id
* next remove the update id - make it updated_unix instead
* On failure to merge ensure that the pr is rechecked for conflict errors
* On failure to merge ensure that the pr is rechecked for conflict errors
* Update models/pull.go
* Update models/pull.go
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
* Apply suggestions from code review
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
6543 [Sun, 9 Feb 2020 21:54:53 +0000 (22:54 +0100)]
[API] let admin check org membership on other users (#10201)
* fix
* fix lint on master
Co-authored-by: zeripath <art27@cantab.net>
GiteaBot [Sun, 9 Feb 2020 20:20:33 +0000 (20:20 +0000)]
[skip ci] Updated translations via Crowdin
Lauris BH [Sun, 9 Feb 2020 20:18:01 +0000 (22:18 +0200)]
Fix followers and following tabs in profile (#10202)
6543 [Sun, 9 Feb 2020 14:33:03 +0000 (15:33 +0100)]
[API] Fix inconsistent label color format (#10129)
* update and use labelColorPattern
* add TestCases
* fix lint
* # optional for templates
* fix typo
* some more
* fix lint of **master**
mavenbline [Sat, 8 Feb 2020 14:59:40 +0000 (17:59 +0300)]
Fix invalid repo urls after change username (#10150)
* Fix invalid repo urls after change username
* Update user.go
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
jaqra [Sat, 8 Feb 2020 11:48:17 +0000 (14:48 +0300)]
Allow emoji on popup label (#10166)
* allow emoji on popup label
* Make emojify work
* Remove unnecessary class
Co-Authored-By: silverwind <me@silverwind.io>
Co-authored-by: silverwind <me@silverwind.io>
Antoine GIRARD [Sat, 8 Feb 2020 00:14:43 +0000 (01:14 +0100)]
Improve make PR (force build and help message) (#10178)
* Force build of assets
* Add make pr to make help
* apply @jolheiser suggestion
Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com>
* Run clean-all before make pr
Co-authored-by: John Olheiser <42128690+jolheiser@users.noreply.github.com>
silverwind [Fri, 7 Feb 2020 23:03:42 +0000 (00:03 +0100)]
move clipboard.js to npm/webpack (#10183)
- created lazy-loaded webpack chunk for clipboard.js
- upgraded clipboard.js from 1.5.9 to 2.0.4
- parallelize initialization of all lazy-loaded features
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Lars Lehtonen [Fri, 7 Feb 2020 20:35:30 +0000 (12:35 -0800)]
modules/log: remove noop written variables (#10182)
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
6543 [Fri, 7 Feb 2020 19:19:50 +0000 (20:19 +0100)]
Fix code-expansion arc-green theme bug (#10180)
* fix code-expansion theme bug
* working solution without important
* no new color
* the midle
GiteaBot [Fri, 7 Feb 2020 17:11:26 +0000 (17:11 +0000)]
[skip ci] Updated translations via Crowdin
silverwind [Fri, 7 Feb 2020 17:09:30 +0000 (18:09 +0100)]
Reorganize frontend files and tooling (#10168)
- move "vendor" files to js/vendor and less/vendor
- move swagger to js/standalone (meant for standalone pages)
- move gitgraph to features and streamline its loading
- add linting configs to webpack dependencies in make
- set ignored files for eslint/stylelint directly in their configs
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
James Lakin [Fri, 7 Feb 2020 16:38:18 +0000 (16:38 +0000)]
Tweak locale to respect singular conflicting file message in P… (#10177)
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
John Olheiser [Fri, 7 Feb 2020 10:38:50 +0000 (04:38 -0600)]
Fix commit view (#10169)
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
zeripath [Fri, 7 Feb 2020 09:08:09 +0000 (09:08 +0000)]
Prevent double waitgroup decrement (#10170)
* Prevent double waitgroup decrement