peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,498 Commits 12 Branches 32 Tags 139 MiB
2f136fcedc
Commit Graph

1650 Commits

Author SHA1 Message Date
kolaente
2f136fcedc
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	public/js/index.js
 2018-04-13 15:11:47 +02:00
Lunny Xiao
bec69f702b
Add topic support (#3711) 
* add topic models and unit tests

* fix comments

* fix comment

* add the UI to show or add topics for a repo

* show topics on repositories list

* fix test

* don't show manage topics link when no permission

* use green basic as topic label

* fix topic label color

* remove trace content

* remove debug function
 2018-04-11 10:51:44 +08:00
kolaente
7b26e2c92e
merge into master 2018-04-10 15:46:43 +02:00
Bwko
8ee45eb614 Add EnableTimetracking option to app settings (#3719) 2018-04-09 23:15:32 +08:00
kolaente
a25e1dd0cf
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v59.go
#	modules/auth/repo_form.go
 2018-04-03 11:16:37 +02:00
Lunny Xiao
d877bf7e15
Add config option to enable or disable log executed SQL (#3726) 
* add config option to enable or disable log executed SQL

* rename ShowSQL to LogSQL
 2018-03-30 22:49:46 +08:00
Allen Wild
15c6bb500b Add repository setting to enable/disable health checks (#3607) 
New Feature:
  * Repository struct field for IsFsckEnabled (default true of course)
  * Admin Settings section on repo options page, accessible only by
    admin users

Possible Enhancements:
  * There's no way to force running health checks on all repos
    regardless of their IsFsckEnabled setting. This would be useful if
    there were an admin API or dashboard button to run fsck immediately.

Issue: https://github.com/go-gitea/gitea/issues/1712
Signed-off-by: Allen Wild <allenwild93@gmail.com>
 2018-03-27 22:13:20 +08:00
Chri-s
9350ba7947 Add protected branch whitelists for merging (#3689) 
* Add database migrations for merge whitelist

* Add merge whitelist settings for protected branches

* Add checks for merge whitelists
 2018-03-25 13:01:32 +03:00
kolaente
2950021ddf
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v58.go
 2018-03-18 15:23:32 +01:00
Lunny Xiao
9e5d0a09eb
Global code search support (#3664) 
* add global code search on explore

* fix bug when no anyone public repos

* change the icon

* fix typo and add UnitTypeCode check for login non-admin user

* fix ui description when no match
 2018-03-16 22:04:33 +08:00
Lauris BH
7b2b900e13 Refactor and simplify redirect to url (#3674) 2018-03-15 22:13:34 +01:00
Lauris BH
c0d41b1b77 Add label descriptions (#3662) 
* Add label descriptions

* Add default descriptions to label template
 2018-03-13 10:03:55 +08:00
Lunny Xiao
20ed1e949e
Merge branch 'master' into master 2018-03-07 23:57:36 +08:00
Chaz Reid
69ea5e4385 Fix wiki inter-links with cases and add tests for this case (#3560) 2018-03-05 20:39:12 +02:00
kolaente
5852b7c9f3
Merge branch 'master' into master 2018-02-27 20:06:12 +01:00
kolaente
138a80b7fa Grammar 2018-02-27 19:01:15 +01:00
Morgan Bazalgette
535445c32e Rework special link parsing in the post-processing of markup (#3354) 
* Get rid of autolink

* autolink in markdown

* Replace email addresses with mailto links

* better handling of links

* Remove autolink.js from footer

* Refactor entire html.go

* fix some bugs

* Make tests green, move what we can to html_internal_test, various other changes to processor logic

* Make markdown tests work again

This is just a description to allow me to force push in order to restart
the drone build.

* Fix failing markdown tests in routers/api/v1/misc

* Add license headers, log errors, future-proof <body>

* fix formatting
 2018-02-27 09:09:18 +02:00
Lunny Xiao
769ab1e424 fix gpg expired bug when time is zero (#3584) 2018-02-26 12:25:45 +02:00
kolaente
7d1df8b38b
Merge branch 'master' into master 2018-02-20 19:27:22 +01:00
Ethan Koenig
7b104f0cd0 Populate URL field of API commits (#3546) 
* Populate URL field of API commits

* fix orgmode_test
 2018-02-20 20:50:42 +08:00
kolaente
32db1b36f5
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v57.go
 2018-02-19 08:33:31 +01:00
Codruț Constantin Gușoi
96c268c0fc Implements generator cli for secrets (#3531) 
Signed-off-by: Codruț Constantin Gușoi <codrut.gusoi@gmail.com>
 2018-02-18 20:14:37 +02:00
Konrad
64e61d6aa5 Merge branch 'master' of https://github.com/go-gitea/gitea 2018-02-15 20:03:44 +01:00
Piotr Orzechowski
b104ab3ca1 Add option to enable or disable swagger endpoints (#3502) 2018-02-14 06:46:00 +02:00
Konrad
16b1636043
Merge branch 'master' of https://github.com/go-gitea/gitea 2018-02-12 17:20:47 +01:00
Jonas Franz
2cb4649acf Escape search query (#3486) 
Signed-off-by: Jonas Franz <info@jonasfranz.de>
 2018-02-11 15:42:28 +02:00
kolaente
9e29f711b0
Merge branch 'master' into master 2018-02-08 16:57:02 +01:00
Ethan Koenig
a89592d4ab Reduce repo indexer disk usage (#3452) 2018-02-05 20:29:17 +02:00
Morgan Bazalgette
17655cdf1b Enable caching on assets and avatars (#3376) 
* Enable caching on assets and avatars

Fixes #3323

* Only set avatar in user BeforeUpdate when there is no avatar set

* add error checking after stat

* gofmt

* Change cache time for avatars to an hour
 2018-02-04 00:37:05 +02:00
Christian Köberl
e9e2a9cdcc Allow square brackets in external issue patterns (#3408) 
* Allow square brackets in external issue patterns

* Added false test cases for checklist elements
 2018-02-03 11:51:02 +02:00
kolaente
cdb5d6593a
Merge branch 'master' into master 2018-01-31 19:32:50 +01:00
Antoine GIRARD
b3fd94c13d Add sensitive headers (#3429) 
* Add HeaderWithSensitiveCase methods to respect casing

* Update webhook.go
 2018-01-31 00:09:16 +02:00
Lauris BH
aef30071c9
Fix go-get content type (#3426) 2018-01-29 19:50:04 +02:00
Lauris BH
28b81899d0
Add doctype to go-get=1 reponse (#3423) 2018-01-29 03:12:04 +02:00
Antoine GIRARD
9e842c8a72 Fix SSH auth lfs locks (#3152) 
* Fix SSH auth LFS locks

* Activate SSH/lock test

* Remove debug

* Follow @lunny recommendation for AfterLoad method
 2018-01-27 18:48:15 +02:00
Lauris BH
a0c397df08
Recognize more characters in crossreferenced repo name (#3413) 2018-01-27 14:33:32 +02:00
kolaente
cd734a3b31
Merge branch 'master' into master 2018-01-24 12:02:03 +01:00
Morgan Bazalgette
d644e88107 HTML escape all lines of the search result (#3402) 
Fixes #3383.
 2018-01-22 23:28:16 +02:00
Sandro Santilli
00d08473b8 Use GiteaServer as the user agent for http requests (#3404) 
Otherwise we're still presenting ourselves as GogsServer...
 2018-01-22 22:37:14 +02:00
kolaente
dd5cfbf656
Simplified "CanCreateIssueDependencies" 2018-01-14 20:20:18 +01:00
kolaente
d5b1c33f73
Merge branch 'master' into master 2018-01-11 21:09:56 +01:00
Lauris BH
be1330ec89 Remove hardcoded paths to fix randomly failing tests (#3347) 
* Remove hardcoded paths to fix randomly failing tests

* Use correct function for merge path
 2018-01-11 00:46:59 +01:00
Morgan Bazalgette
65861900cd Handle refactor (#3339) 
* Replace all ctx.Handle with ctx.ServerError or ctx.NotFound

* Change Handle(403) to NotFound, avoid using macaron's NotFound
 2018-01-10 23:34:17 +02:00
kolaente
4d15f28e04
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v56.go
 2018-01-08 19:08:13 +01:00
Sandro Santilli
6a6439c5c2 Enable Libravatar by default in new installations (#3287) 
Pre-existing installs still have it default to off.
This is consistent with OpenID setting.
 2018-01-07 11:41:09 +02:00
kolaente
eb295f40c0
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v55.go
 2018-01-07 00:05:43 +01:00
Vlad Temian
e78786ef39 Writable deploy keys (closes #671) (#3225) 
* Add is_writable checkbox to deploy keys interface

* Add writable key option to deploy key form

* Add support for writable ssh keys in the interface

* Rename IsWritable to ReadOnly

* Test: create read-only and read-write deploy keys via api

* Add DeployKey access mode migration

* Update gitea sdk via govendor

* Fix deploykey migration

* Add unittests for writable deploy keys

* Move template text to locale

* Remove implicit column update

* Remove duplicate locales

* Replace ReadOnly field with IsReadOnly method

* Fix deploy_keys related integration test

* Rename v54 migration with v55

* Fix migration hell
 2018-01-07 00:55:53 +02:00
kolaente
37dc550bc8
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	docs/content/doc/advanced/config-cheat-sheet.en-us.md
#	models/migrations/migrations.go
#	models/migrations/v54.go
#	routers/repo/pull.go
 2018-01-06 22:41:44 +01:00
Lauris BH
8ac1501ad7
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 
* Pull request options migration and UI in settings

* Add ignore whitespace functionality

* Fix settings if pull requests are disabled

* Fix migration transaction

* Merge with Rebase functionality

* UI changes and related functionality for pull request merging button

* Implement squash functionality

* Fix rebase merging

* Fix pull request merge tests

* Add squash and rebase tests

* Fix API method to reuse default message functions

* Some refactoring and small fixes

* Remove more hardcoded values from tests

* Remove unneeded check from API method

* Fix variable name and comment typo

* Fix reset commit count after PR merge
 2018-01-05 20:56:50 +02:00
kolaente
97140246f1
Renamed "CanUseDependencies" to "CanCreateDependencies" to be more precise 2017-12-29 14:46:07 +01:00