summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Restore graceful restart on SIGHUP (#10224)zeripath2020-02-111-2/+2
| | | | Co-authored-by: Lauris BH <lauris@nix.lv>
* [skip ci] Updated translations via CrowdinGiteaBot2020-02-1025-0/+25
|
* Fix commit between two commits calculation if there is only last commit (#10225)Lauris BH2020-02-111-1/+1
|
* [skip ci] Updated translations via CrowdinGiteaBot2020-02-101-0/+2
|
* Improve 404 error message (#10214)guillep2k2020-02-102-0/+3
|
* Changelog 1.11.0 (#10204) (#10211)John Olheiser2020-02-103-56/+82
| | | | | Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
* Only show conflicted files if not merged (#10197)zeripath2020-02-092-2/+2
| | | | | | | | | * 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>
* Only check for conflicts/merging if the PR has not been merged in the ↵zeripath2020-02-106-73/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* [API] let admin check org membership on other users (#10201)65432020-02-091-1/+1
| | | | | | | | * fix * fix lint on master Co-authored-by: zeripath <art27@cantab.net>
* [skip ci] Updated translations via CrowdinGiteaBot2020-02-091-0/+2
|
* Fix followers and following tabs in profile (#10202)Lauris BH2020-02-096-87/+41
|
* [API] Fix inconsistent label color format (#10129)65432020-02-099-42/+158
| | | | | | | | | | | | | | | | * update and use labelColorPattern * add TestCases * fix lint * # optional for templates * fix typo * some more * fix lint of **master**
* Fix invalid repo urls after change username (#10150)mavenbline2020-02-081-1/+11
| | | | | | | | | * 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>
* Allow emoji on popup label (#10166)jaqra2020-02-081-1/+2
| | | | | | | | | | | | * 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>
* Improve make PR (force build and help message) (#10178)Antoine GIRARD2020-02-082-2/+4
| | | | | | | | | | | | | | * 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>
* move clipboard.js to npm/webpack (#10183)silverwind2020-02-0810-49/+64
| | | | | | | | - 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>
* modules/log: remove noop written variables (#10182)Lars Lehtonen2020-02-071-8/+0
| | | | Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
* Fix code-expansion arc-green theme bug (#10180)65432020-02-071-0/+3
| | | | | | | | | | * fix code-expansion theme bug * working solution without important * no new color * the midle
* [skip ci] Updated translations via CrowdinGiteaBot2020-02-072-2/+0
|
* Reorganize frontend files and tooling (#10168)silverwind2020-02-0712-11/+21
| | | | | | | | | | | | - 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>
* Tweak locale to respect singular conflicting file message in P… (#10177)James Lakin2020-02-073-3/+4
| | | | Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
* Fix commit view (#10169)John Olheiser2020-02-071-1/+1
| | | | | | | Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: zeripath <art27@cantab.net>
* Prevent double waitgroup decrement (#10170)zeripath2020-02-071-3/+7
| | | | * Prevent double waitgroup decrement
* Fix topics dropdown (#10167)John Olheiser2020-02-071-1/+1
| | | | | | Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* make: improve make pr (#10165)Antoine GIRARD2020-02-061-3/+3
|
* Allow emoji on review head comments (#10159)guillep2k2020-02-061-1/+1
| | | | Co-authored-by: techknowlogick <matti@mdranta.net>
* Fix issue/pull link (#10158)guillep2k2020-02-061-1/+1
|
* update JS dependencies (#10155)silverwind2020-02-052-4628/+3357
| | | | result of `make npm-update`. no real notable changes, the breaking change in styleline is Node.js 10 which we already require.
* [skip ci] Updated translations via CrowdinGiteaBot2020-02-051-0/+2
|
* Fix push-create SSH bugs (#10145)John Olheiser2020-02-053-1/+33
| | | | | | | | | | | | | | * Attempt to fix push-create SSH bugs Signed-off-by: jolheiser <john.olheiser@gmail.com> * Fix binding Signed-off-by: jolheiser <john.olheiser@gmail.com> * Invalid ctx Signed-off-by: jolheiser <john.olheiser@gmail.com>
* [skip ci] Updated translations via CrowdinGiteaBot2020-02-042-0/+4
|
* Ensure DeleteUser is not allowed to Delete Orgs and visa versa (#10134)65432020-02-044-6/+13
| | | | | | | | | | | | | | * add check to DeleteUser * add check to DeleteOrganization * add Test * remove redundancy (deleteOrg is only used in DeleteOrganization) * Update models/org.go Co-authored-by: zeripath <art27@cantab.net>
* [API] expose RepoOwner on Issue responce (#10126)65432020-02-043-0/+6
| | | | | | * add RepoOwner on issue api responce * CI.restart()
* Show if a PR has conflicting files on the PR lists (#10130)James Lakin2020-02-044-8/+23
| | | | Co-authored-by: Lauris BH <lauris@nix.lv>
* Show download count info in release list (#10124)Lauris BH2020-02-0323-40/+1207
| | | | | | * Show download count info in release list * Use go-humanize
* Prevent DeleteUser API abuse (#10125)65432020-02-032-1/+7
| | | | | | * fix & co * word suggestions from @jolheiser
* [skip ci] Updated translations via CrowdinGiteaBot2020-02-031-0/+4
|
* Move PushUpdateAddDeleteTags to repository module from models (#10106)Lunny Xiao2020-02-038-166/+176
| | | | | | * Move PushUpdateAddDeleteTags to repository module from models * Fix deadlock on sqlite
* working part of #9998 (#10114)65432020-02-031-2/+6
| | | | Co-authored-by: zeripath <art27@cantab.net>
* Add Unique Queue infrastructure and move TestPullRequests to this (#9856)zeripath2020-02-0229-500/+1934
| | | | | | | | | | | | | | | | | | | | | * Upgrade levelqueue to version 0.2.0 This adds functionality for Unique Queues * Add UniqueQueue interface and functions to create them * Add UniqueQueue implementations * Move TestPullRequests over to use UniqueQueue * Reduce code duplication * Add bytefifos * Ensure invalid types are logged * Fix close race in PersistableChannelQueue Shutdown
* Update aria-fixed semantic-dropdown to fomantic master (#10096)zeripath2020-02-021-43/+38
| | | | Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Improve push update options (#10105)Lunny Xiao2020-02-025-152/+192
| | | | | | | | | | | | | | * Improve push update options * fix test * More refactor and fix lint * fix lint * Fix lint Co-authored-by: Lauris BH <lauris@nix.lv>
* Add warning when using relative path to app.ini (#10104)guillep2k2020-02-021-0/+1
| | | | Co-authored-by: Lauris BH <lauris@nix.lv>
* Check if go exists before generating the GOPATH (#10100)zeripath2020-02-011-2/+6
| | | | | | | | * Check if go exists before generating the GOPATH * Move export PATH into Go protected section Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Implement "embedded" command to extract static resources (#9982)guillep2k2020-02-028-6/+568
| | | | | | | | | | | | | | | | | | | | | | | * draft * Implement extract command * Fix nits and force args on extract * Add !bindata stub, support Windows, fmt * fix vendored flag * Remove leading slash for matching * Add docs * Fix typos * Add embedded view command Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* Fix broken FlushAll (#10101)zeripath2020-02-011-4/+4
| | | | | | | | | | * go function contexting is not what you expect * Apply suggestions from code review Co-Authored-By: Lauris BH <lauris@nix.lv> Co-authored-by: Lauris BH <lauris@nix.lv>
* Use a file as make evidence for fomantic instead of a directory (#10032)guillep2k2020-02-012-4/+11
| | | | | | | | | | | | | | | * Use evidence file as dependency instead of dir * fix eol * Update .gitignore Co-Authored-By: silverwind <me@silverwind.io> * Use FOMANTIC_SOURCES to establish dependencies as per @silverwind Co-authored-by: silverwind <me@silverwind.io>
* Cache last commit to accelerate the repository directory page visit (#10069)Lunny Xiao2020-02-0110-23/+273
| | | | | | | | | | | | | | | * Cache last commit to accelerate the repository directory page visit * Default use default cache configuration * add tests for last commit cache * Simplify last commit cache * Revert Enabled back * Change the last commit cache default ttl to 8760h * Fix test
* remove VERSIONS file (#10070)silverwind2020-02-011-63/+0
| | | | | It serves no clear purpose and is not used anywhere to my knowledge. Also, it's name to version mapping doesn't work with bundling.
* Accept punctuation after simple+cross repository issue references (#10091)guillep2k2020-02-012-13/+97
| | | | | | | | | | * Support references ending in , . and ; * Accept :;, in simple refs; fix 2+ consecutive refs * Include cross-repository references * Add ?!, fix spacing problem