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

1787 Commits

Author SHA1 Message Date
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
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
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
b7ed097a8f
Fixed localization 2018-01-01 14:39:33 +01:00
kolaente
df638db68e
Removed unused import 2017-12-29 22:21:21 +01:00
kolaente
8931ced50e
Fixed error messages 2017-12-29 15:47:05 +01:00
kolaente
f48d6cdecd
Error messages moved to locale file 2017-12-29 15:43:12 +01:00
kolaente
5dc9c22972
Renamed "c" to "ctx" for consistency 2017-12-29 15:41:08 +01:00
kolaente
2058f4e5c5
Fixed error message 2017-12-29 15:37:19 +01:00
kolaente
5e20447c66
Replaced c with ctx for consistency 2017-12-29 15:36:18 +01:00
kolaente
70589e6c96
Added Custom error types for issue dependencies 2017-12-29 15:30:43 +01:00
kolaente
1f0bac04c7
Fixed using strconvert 2017-12-29 14:50:07 +01:00
kolaente
2c8103fc12
Fixed import order 2017-12-29 14:48:45 +01:00
kolaente
97140246f1
Renamed "CanUseDependencies" to "CanCreateDependencies" to be more precise 2017-12-29 14:46:07 +01:00
Konrad
ed4a47dcc8
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-12-29 14:27:23 +01:00
Ethan Koenig
4c9341f689 Fix bugs in issue dashboard stats (#3073) 2017-12-26 01:25:16 +02:00
Ethan Koenig
515cdaa85d Fix ignored errors when checking if organization, team member (#3177) 2017-12-21 09:43:26 +02:00
Lunny Xiao
529482135c
Support default private when creating or migrating repository (#3239) 
* support default private when creating or migrating repository

* fix fmt

* use string constants on repository default private in app.ini

* fix fmt
 2017-12-20 06:59:56 -06:00
kolaente
172b1f054a
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/v51.go
 2017-12-19 19:07:30 +01:00
Ethan Koenig
0e384c6376 Check ignored errors for issue and milestone count (#3213) 2017-12-18 16:06:51 +02:00
Ethan Koenig
befa7445d2 Unit tests for routers/repo/issue_label (#3198) 2017-12-15 23:11:02 +02:00
Lunny Xiao
f94c1b3943
Improvements for supporting UI Location (#3146) 
* improvements for supporting UI Location

* improved the comment
 2017-12-14 07:45:31 +08:00
Lauris BH
d3c5911ffc Fix wiki page list not rendering after updatedunix changes (#3175) 2017-12-13 21:46:56 +08:00
harry
03ec35ed79 Mention completion for issue editor. (#3136) 
* new issue mention

* Mention completion on new issue and view issue page.

* Code format.

* Require tribute in pull request page.
 2017-12-11 14:03:04 +08:00
Lunny Xiao
f2e20c81b6 Refactor struct's time to remove unnecessary memory usage (#3142) 
* refactor struct's time to remove unnecessary memory usage

* use AsTimePtr simple code

* fix tests

* fix time compare

* fix template on gpg

* use AddDuration instead of Add
 2017-12-11 06:37:04 +02:00
Antoine GIRARD
ef78309b65 Improve LFS tests + fix lfs url refs + keep path upper/lowercase in db. (#3092) 
* Add failing test

* Fix urls

* Improve url in tests

* improve testing

* Remove debug code

* Add deps

* LFS corner-case : Search on lower but store with case

* Temporary comment of blocking action

* fix hooks

* Use temporary repo for git client test

* Use userPassword in place of hard-coded password
 2017-12-08 20:21:37 +08:00
Ethan Koenig
596308f213 Fix missing branch in release bug (#3108) 2017-12-08 13:22:02 +08:00
Ethan Koenig
68179dc676 Remove unnecessary function call (#3109) 2017-12-08 09:02:34 +08:00
Sasha Varlamov
311c83ad17 Allow adding collaborators with (fullname) (#3103) 
* Allow adding collaborators with (fullname)

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

* Refactor username suffix to utils pkg

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>
 2017-12-07 15:00:09 +08:00
Sasha Varlamov
7ec6cddd27 Add 'mark all read' option to notifications (#3097) 
* Add 'mark all read' option to notifications

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

* Fix exported comment

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

* Format method comments

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

* Fix exported comment

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

Format method comments

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

Tests for reactions (#3083)

* Unit tests for reactions

* Fix import order

Signed-off-by: Lauris Bukšis-Haberkorns <lauris@nix.lv>

Fix reaction possition when there is attachments (#3099)

Refactor notifications swap function

* Accept change to drop beforeupdate call

* Update purge notifications error message for consistency

* Drop unnecessary check for mark all as read button

* Remove debugging comment
 2017-12-07 13:52:57 +08:00
Konrad
e98f92d676
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-12-06 18:51:18 +01:00
Vlad Temian
469ab99e9a Delete a user's public key via admin api (closes #3014) (#3059) 
* Delete a user's public key via admin api

* Test admin ssh endpoint for creating a new ssh key

* Adapt public ssh key test to also test the delete operation

* Test that deleting a missing key will result in a 404

* Test that a normal user can't delete another user's ssh key

* Make DeletePublicKey return err

* Update swagger doc
 2017-12-06 12:27:10 +02:00
kolaente
fae44666ec
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v50.go
 2017-12-04 10:48:37 +01:00
Ethan Koenig
c0a7899416 Sort repos in issues dashboard sidebar (#3072) 
* Sort repos in issues dashboard sidebar

* Sort repos by name
 2017-12-04 12:39:01 +08:00
Ethan Koenig
3c1b1ca78e Fix error message sanitiziation (#3082) 2017-12-04 03:48:03 +02:00
Lauris BH
5dc37b187c
Add reactions to issues/PR and comments (#2856) 2017-12-04 01:14:26 +02:00
kolaente
1fded52044
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	public/js/index.js
 2017-12-02 18:29:32 +01:00
Lunny Xiao
b3d5ba6f90 Fix missing password length check when change password (#3039) 
* fix missing password length check when change password

* add tests for change password
 2017-12-02 19:11:22 +02:00
Lunny Xiao
35cc5b0402
Remove GetRepositoryByRef and add GetRepositoryByOwnerAndName (#3043) 
* remove GetRepositoryByRef and add GetRepositoryByOwnerAndName

* fix tests

* fix tests bug

* some improvements
 2017-12-02 15:34:39 +08:00
Piotr Orzechowski
57edc3155f Default log level to Info without hardcoding it in installer (#3041) 2017-12-01 15:41:27 +08:00
Lunny Xiao
13e59c8b7a remove unused variable (#3038) 2017-11-30 20:44:25 +02:00
Ethan Koenig
91f3d77ceb Unit tests for wiki routers (#3022) 2017-11-30 17:52:15 +02:00
kolaente
6eea6c686f
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v49.go
#	models/models.go
 2017-11-29 20:55:20 +01:00
Sandro Santilli
67b0d2175d Set OpenID support on by default when installing new instance (#3010) 2017-11-29 14:47:42 +02:00