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

6258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kolaente
0fcc3b2273
Merge branch 'master' into master 2018-01-09 11:27:21 +01:00
Michael Lustfield
e7295f27a9 Add MTecknology to MAINTAINERS list (#3335) 2018-01-09 07:27:26 +02:00
Richard Schneeman
f737d37804 Add CodeTriage link to README (#3299) 2018-01-09 00:01:08 +01:00
Michael Lustfield
3ee8be3849 General documentation cleanup (#3317) 
* Clean up spelling, grammar, perspective, whitespace, language, markup, etc.
 2018-01-08 23:48:42 +01:00
Kim "BKC" Carlbäcker
923c0105f4 Update gitea version on docs/install-from-binary (#3333) 
* Update gitea version on docs/install-from-binary

* Update all versions
 2018-01-09 00:48:05 +02:00
Morgan Bazalgette
674cfb7cac Change EncodePasswd to HashPassword (#3329) 
* Change EncodePasswd to HashPassword

* Create test+benchmark for HashPassword
 2018-01-08 23:28:18 +01:00
kolaente
1f8ef921e2
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v56.go
 2018-01-08 19:08:41 +01: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
f2b841d0ec Add some instructions about running integration tests (#3319) 
* Add some instructions about running integration tests

* Add missing newline escape

* Suggest running a clean build
 2018-01-08 18:29:52 +02:00
Deyong Zhu
d663cef2a5 Fix branch name escaping in compare url (#3311) 
* Fixes #3303
 2018-01-08 17:17:24 +02:00
Ethan Koenig
f48680888c Remove IsOwner, NumTeams from OrgUser (#3269) 2018-01-08 09:48:37 +02:00
Antoine GIRARD
cb868b7851 Add missing indexer doc in configuration (#3324) 
* Add missing indexer doc in configuration

* Unify MAX_FILE_SIZE to 1024 * 1024
 2018-01-08 07:03:52 +02:00
Sandro Santilli
44053532bb Serve .patch for pull requests (#3305) 
* Serve .patch for pull requests

Closes #3259
Updates "git" module, for GetFormatPatch

* Handle io.Copy error
 2018-01-07 15:10:20 +02:00
Alberto González Palomo
18bb0f8f13 Ensure docs makefile downloads theme if failed before. (#3322) 
The makefile did not download the theme if the directory "themes/gitea"
is there, even if empty.
On a fresh Ubuntu install, curl is not included, so the theme rule fails
just after creating the empty directory. When you try again after
installing curl, the rule is not triggered.

This could also happen if the download fails for other reasons.

This change makes the theme rule depend on the file "theme.toml"
which will be there only after unpacking a successfully downloaded
theme archive.

Signed-off-by: Alberto González Palomo <bugs@sentido-labs.com>
 2018-01-07 14:11:17 +02:00
GiteaBot
9d8260b3d6 [skip ci] Updated translations via Crowdin 2018-01-07 09:42:08 +00: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
GiteaBot
87f67fd392 [skip ci] Updated translations via Crowdin 2018-01-07 09:14:19 +00:00
Lunny Xiao
835b890329 fix bug when a user delete but assigned on issue (#3318) 2018-01-07 11:13:10 +02:00
kolaente
171715b21d
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v55.go
 2018-01-07 00:06:10 +01: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
GiteaBot
4002328179 [skip ci] Updated translations via Crowdin 2018-01-06 22:56:53 +00: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
86be828148
Added more specific locale 2018-01-06 23:04:43 +01:00
kolaente
8bc0947cbd
Added more specific locale 2018-01-06 23:02:04 +01:00
Konrad
f4cb1c7340
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 23:01:44 +01: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
Michael Lustfield
70b6c07590 Add defaults to config cheatsheet, and minor language cleanup. (#3290) 
* Add defaults to config cheatsheet, and clean up document.

* Updates and touchups, per review.
 2018-01-06 22:15:14 +02:00
GiteaBot
52d93f7c31 [skip ci] Updated translations via Crowdin 2018-01-06 19:53:48 +00:00
Morgan Bazalgette
6032682fc1 Add myself to MAINTAINERS (#3313) 2018-01-06 21:52:57 +02:00
Morgan Bazalgette
8ef1711055 Make the space for repo actions wider on repo header (#3312) 2018-01-06 19:20:13 +02:00
GiteaBot
2d31986236 [skip ci] Updated translations via Crowdin 2018-01-06 11:29:31 +00:00
Lunny Xiao
bf78c95d80
add external tool docs (#3301) 2018-01-06 05:28:31 -06:00
GiteaBot
15b8720c5d [skip ci] Updated translations via Crowdin 2018-01-05 18:57:58 +00: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
Sandro Santilli
a192f3052e Serve pull request .diff files (#3293) 
* Serve pull request .diff files

Closes #3259

* Add test for pull request redirection and .diff access

* Typo

* There's no need to test for pr.BaseRepo being nil after calling GetBaseRepo
 2018-01-05 12:56:52 +02:00
kolaente
8735bc2f82
Merge branch 'master' into master 2018-01-04 13:16:19 +01:00
Ethan Koenig
ce7ae17b81 Fix swagger docs (#3300) 2018-01-04 14:31:40 +08:00
Alberto González Palomo
30fb81c71e Use issue number/index instead of id for API URL. (#3298) 
Using the API calls, the issue objects retrieved by
/repos/{owner}/{repo}/issues
contains the wrong value in the "url" field:
it uses the "id" value instead of the "number" value.

For instance, in a new repo in try.gitea.io with just one issue:
[{
  "id": 896,
  "url": "https://try.gitea.io/api/v1/repos/AlbertoGP/uno/issues/896",
  "number": 1,
   ...
}]

The given URL does not work, but if you replace the "896" by "1" it
does.
 2018-01-03 19:41:33 -06:00
modmew8
9f8349af06 Fixed asterisk based tasklist items, fixed requirement for one char after last blank to be a valid task. (#3296) 
Signed-off-by: modmew8 <modmew8@gmail.com>
 2018-01-03 21:45:21 +02:00
kolaente
cd470779e8
Merge branch 'master' into master 2018-01-03 17:17:08 +01:00
Elouan Martinet
5057c6b43f Fix guide link for webhooks in repository settings (#3291) (#3292) 
Signed-off-by: Elouan Martinet <exa@elou.world>
 2018-01-03 23:50:09 +08:00
kolaente
0016a3e1a7
Merge branch 'master' into master 2018-01-03 16:26:09 +01:00
GiteaBot
daf08aeacd [skip ci] Updated translations via Crowdin 2018-01-03 08:35:03 +00:00
modmew8
d996da6bab Added progressbar for issues (#1146). (#3171) 
* Added progressbar for issues (#1146).

* Updated the generated index.css.

Signed-off-by: modmew8 <modmew8@gmail.com>

* Removed stored progress percentage and changed it to css calc. Also added the issue task progress to the user/dashboard/issues.

Signed-off-by: modmew8 <modmew8@gmail.com>

* Removed unnecessary blanks.

Signed-off-by: modmew8 <modmew8@gmail.com>

* Formatted the files correctly, fmt-check terminates now without errors.

Signed-off-by: modmew8 <modmew8@gmail.com>

* Removed variables, made computing the tasks on demand with precompiled regexp.

Signed-off-by: modmew8 <modmew8@gmail.com>
 2018-01-03 02:34:13 -06:00
techknowlogick
22a7a7ec9b Update standard copyright header for new year (#3289) 2018-01-02 20:03:24 -06:00
kolaente
96d6db42d9
Fixed an issue where it would make a request to get all issues even if not on the issue page or dependencies were disabled 2018-01-02 13:51:53 +01:00
kolaente
12c0093e40
Merge branch 'master' into master 2018-01-02 13:24:14 +01:00
GiteaBot
de9e36e90e [skip ci] Updated translations via Crowdin 2018-01-02 12:14:47 +00:00
Bo-Yi Wu
732d31f750 refactor: ignore LGTM from author of pull request. (#3283) 2018-01-02 06:13:49 -06:00
GiteaBot
274241c044 [skip ci] Updated translations via Crowdin 2018-01-02 10:33:40 +00:00