summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix #732: Add LFS objects to base repository on merging (#7082)zeripath2019-06-227-292/+648
| | | | On merge we walk the merge history and ensure that all lfs objects pointed to in the history are added to the base repository. This switches from relying on having git-lfs installed on the server, (and in fact .gitattributes being correctly installed.)
* Dark theme markdown fixes (#7260)Cherrg2019-06-213-4/+39
| | | | | | | | | | | | | | | | | | | | | * fix colors in dark theme - tables inside rendered markdown Signed-off-by: Michael Gnehr <michael@gnehr.de> * fix colors in dark theme - simpleMDE rendered preview Signed-off-by: Michael Gnehr <michael@gnehr.de> * Update public/less/themes/arc-green.less remove scroll bar color, to add this globally on additional PR Co-Authored-By: Lauris BH <lauris@nix.lv> Signed-off-by: Michael Gnehr <michael@gnehr.de> * add missing class name Signed-off-by: Michael Gnehr <michael@gnehr.de>
* Fix Submodule dection in subdir (#7275)mrsdizzie2019-06-211-1/+7
| | | | | | Include the directory in name when looking for matching Submodule from .gitmodules file Fixes #7262
* Alpine 3.10 (#7256)techknowlogick2019-06-202-7/+7
|
* add .fa margin like .octicon (#7258)Antoine GIRARD2019-06-202-2/+2
|
* Only check and config git on web subcommand but not others (#7236)Lunny Xiao2019-06-194-25/+35
| | | | | | * only check and config git on web subcommand but not others * add Init in git tests
* add 'npm' and 'npm-update' make targets and lockfile (#7246)silverwind2019-06-187-36/+4913
| | | | | | | | | | | | | | | | | | * add 'npm' and 'npm-update' make targets and lockfile - `make npm` installs and updates node_modules, triggered automatically on `make css` and `make js` as it completes reasonably fast and ensures consistent modules. - `make npm-update` updates all dependencies to their latest version, regenerates `node_modules` from scratch and updates `package-lock.json`. It uses npm modules `updates` written by yours truly to find the latest version of each dependency. * add suggested make dependencies * remove package-lock.json during npm-update * regenerate package-lock.json
* update go-git to v4.12.0 - fixes #7248 (#7249)techknowlogick2019-06-19270-14428/+71043
|
* fix hljs unintenionally highlighting commit links (#7244)silverwind2019-06-182-4/+5
| | | | | | * fix hljs unintenionally highlighting commit links * fix unit tests
* add self to MAINTAINERS (#7245)silverwind2019-06-181-0/+1
|
* Fix migration panic when Head.User is not exist (#7226)Lunny Xiao2019-06-181-7/+26
| | | | | | * fix migration panic when Head.User is not exist * fix test
* Update css (#7240)zeripath2019-06-181-16/+16
| | | Remove -o-tab-size selectors from tab-sze-1 css
* Fix relref link in docs (#7233)Antoine GIRARD2019-06-171-1/+1
|
* Add docs for `INTERNAL_TOKEN_URI` (#7234)techknowlogick2019-06-171-0/+2
|
* Changelog 1.8.3 (#7230) (#7231)John Olheiser2019-06-171-0/+10
| | | | | | | | | * Changelog 1.8.3 Signed-off-by: jolheiser <john.olheiser@gmail.com> * Suggestion Co-Authored-By: zeripath <art27@cantab.net>
* Add CLI commands to manage LDAP authentication source (#6681)ngourdon2019-06-174-1/+1802
| | | | | | | | | | | | | | | | | | * add CLI commands to manage LDAP authentication source * delete Gogs copyright * remove unused return value of func parseLoginSource * fix comment Co-Authored-By: ngourdon <31291059+ngourdon@users.noreply.github.com> * remove config flag already present in global flags * remove config flag from ldap commands in docs * remove config flag handling
* [skip ci] Updated translations via CrowdinGiteaBot2019-06-1729-0/+41
|
* Use certmanager provided TLSConfig for LetsEncrypt (#7229)zeripath2019-06-171-6/+3
|
* show lfs config on admin panel (#7220)Lunny Xiao2019-06-163-0/+22
|
* Add missing description of label on API (#7159)Lunny Xiao2019-06-164-11/+32
| | | | | | | | * add missing description of label on API * fix comment head * fix swagger
* Use go method to calculate ssh key fingerprint (#7128)Antoine GIRARD2019-06-162-21/+92
| | | | | | | | | | | | * Use go method to calculate key fingerprint * add gitea copyright * use native go method only for built-in server * refactor and add tests * add gitea copyright
* Add LastLogin to the User API (#7196)zeripath2019-06-154-0/+19
|
* setting: don't require same running user for internal SSH (like win ↵Antoine GIRARD2019-06-161-1/+1
| | | | platform) (#7215)
* Only warn on errors in deleting LFS orphaned files during repo deletion (#7213)zeripath2019-06-152-5/+2
|
* fix duplicated file on pull request conflicted files (#7211)Lunny Xiao2019-06-151-1/+11
|
* Allow colon between fixing word and issue (#7207)zeripath2019-06-152-1/+27
| | | | | | * Allow colon between fixing word and issue * update test
* UI: Fix overflow issues in repo (#7190)silverwind2019-06-146-18/+36
| | | | | | | | | | | - Fix layout overflow in repo file list. - Fix invisible status icon in file view and commit list. In file view, the icon was moved to the left because I could not figure out a proper fix because of HTML tables. - Added title attribute to commit messages. - Fixed two CSS linter warnings in existing CSS. - Fixed CI variable check in 'make css'. Fixes: https://github.com/go-gitea/gitea/issues/7180
* fix drone build bug (#7192)Cherrg2019-06-133-1/+4
|
* API error cleanup (#7186)John Olheiser2019-06-127-25/+16
|
* Add error for fork already existing (#7185)John Olheiser2019-06-123-4/+22
|
* Add golangci (#6418)kolaente2019-06-12147-774/+1046
|
* Fix database lock when use random repository fallback image (#7166)Lunny Xiao2019-06-111-11/+10
| | | | | | * fix database lock when use random repository fallback image * remove unused function
* Fixes diff on merged pull requests (#7171)Mario Lubenka2019-06-113-13/+13
|
* Various fixes for issue mail notifications (#7165)silverwind2019-06-113-19/+41
| | | | | | | | | - Send individual mails for actions and comments - Send mail for new issues/prs without a comment - Use correct sender for reopen/close actions - Hopefully fixed all bugs related to missing mails Fixes: https://github.com/go-gitea/gitea/issues/7124 Fixes: https://github.com/go-gitea/gitea/issues/5977
* fix pusher name via ssh push (#7167)Lunny Xiao2019-06-111-1/+1
|
* Revert "make modules/structs as a spereate go mod (#7127)" (#7175)Lunny Xiao2019-06-102-4/+0
| | | This reverts commit 835b53fc259c82f38945a3e107a4eb51478967d5.
* make modules/structs as a spereate go mod (#7127)Lunny Xiao2019-06-102-0/+4
|
* if milestone id is zero don't get it from database (#7169)Lunny Xiao2019-06-101-6/+8
|
* Move PushUpdate dependency from models to repofiles (#6763)Lunny Xiao2019-06-107-21/+98
| | | | | | * remove push_update * move models.PushUpdate to repofiles.PushUpdate
* [skip ci] Updated translations via CrowdinGiteaBot2019-06-102-1/+21
|
* archived repos can be starred and watched (#7163)Lanre Adelowo2019-06-101-1/+1
|
* Fixes #2738 - Adds the /git/tags API endpoint (#7138)Richard Mahn2019-06-0816-85/+551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #2738 - /git/tags API * proper URLs * Adds function comments * Updates swagger * Removes newline from tag message * Removes trailing newline from commit message * Adds integration test * Removed debugging * Adds tests * Fixes bug where multiple tags of same commit show wrong tag name * Fix formatting * Removes unused varaible * Fix to annotated tag function names and response * Update modules/git/repo_tag.go Co-Authored-By: Lauris BH <lauris@nix.lv> * Uses TagPrefix * Changes per review, better error handling for getting tag and commit IDs * Fix to getting commit ID * Fix to getting commit ID * Fix to getting commit ID * Fix to getting commit ID
* Add command to convert mysql database from utf8 to utf8mb4 (#7144)Lunny Xiao2019-06-083-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add command to convert mysql database from utf8 to utf8mb4 * Update cmd/convert.go Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com> * Update cmd/convert.go Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com> * Update cmd/convert.go Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com> * Update models/convert.go Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com> * Update models/convert.go Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com> * Update cmd/convert.go Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com> * Update cmd/convert.go Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com>
* fix GCArgs load from ini (#7156)Lunny Xiao2019-06-081-1/+1
|
* [skip ci] Updated translations via CrowdinGiteaBot2019-06-071-0/+5
|
* Compare branches, commits and tags with each other (#6991)Mario Lubenka2019-06-0717-527/+584
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
* Detect noreply email address as user (#7133)zeripath2019-06-061-0/+13
|
* [skip ci] Updated translations via CrowdinGiteaBot2019-06-062-4/+10
|
* Add state param to milestone listing API (#7131)Lanre Adelowo2019-06-068-16/+77
| | | | | | | | | | | | | | | | * Support state params * update tests * fix tests * add state=all support * update tests * update swagger * update swagger
* [skip ci] Updated translations via CrowdinGiteaBot2019-06-058-34/+66
|