aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-04 08:17:24 -05:00
Code
6,163 Commits 17 Branches 214 Tags 784 MiB
9350ba7947
Commit Graph

959 Commits

Author SHA1 Message Date
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
Chri-s
e64aa18dc9 Change protected branch settings title to existing locale entry (#3694) 2018-03-21 20:12:49 +02:00
Alex Ward
4ebdcbc5df Fix style of "In your repositories" when selected (#3699) 
Signed-off-by: Alex Ward <alxwrd@googlemail.com>
 2018-03-20 23:39:14 +02: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
Chri-s
a2a49c93c7 Added checks for protected branches in pull requests (#3544) 
* Added checks for protected branches in pull requests

Signed-off-by: Christian Wulff <NChris@posteo.net>

* Moved check for protected branch into new function CheckUserAllowedToMerge

Signed-off-by: Christian Wulff <NChris@posteo.net>

* Removed merge conflict lines from last commit

Signed-off-by: Christian Wulff <NChris@posteo.net>

* Explicit check for error type in ViewIssue

Signed-off-by: Christian Wulff <NChris@posteo.net>
 2018-03-13 11:46:14 +08: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
Mahmoud Al-Qudsi
171914e9a7 Log attachment blocked events (#3615) 
Include both a log entry and the blocked mime type in the gitea log when
an attachment upload is blocked.

Chosen log level is info; this may need to be dialed down to trace.
 2018-03-05 08:51:10 +08:00
Ethan Koenig
4c9d9c221a Improve wiki test (#3493) 2018-02-13 11:19:49 +02:00
Lauris BH
283e87d814
Fix rendering of wiki page list if wiki repo contains other files (#3454) 
* Fix rendering of wiki page list if wiki repo contains other files

* Improve wiki filename tests
 2018-02-05 16:56:30 +02:00
Lauris BH
ca4f5c37e6
Fix branch deletion for squash or rebase merged pull requests (#3425) 2018-01-30 14:29:39 +02:00
Lauris BH
ca306985d3
Change how merged PR commit info are prepared (#3368) 
* Change how merged PR commits and diff are made

* Update code.gitea.io/git dependency

* Fix typo

* Remove unneeded local variable
 2018-01-19 08:18:51 +02: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
Deyong Zhu
d663cef2a5 Fix branch name escaping in compare url (#3311) 
* Fixes #3303
 2018-01-08 17:17:24 +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
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
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
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
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
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
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
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
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
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
Ethan Koenig
91f3d77ceb Unit tests for wiki routers (#3022) 2017-11-30 17:52:15 +02:00
Duncan Ogilvie
551f3cbe42 Memory usage improvements (#3013) 
* govendor update code.gitea.io/git

Signed-off-by: Duncan Ogilvie <mr.exodia.tpodt@gmail.com>

* Greatly improve memory usage

Signed-off-by: Duncan Ogilvie <mr.exodia.tpodt@gmail.com>
 2017-11-29 09:50:39 +08:00
Ethan Koenig
b7ebaf6d20 Various wiki bug fixes (#2996) 
* Update macaron

* Various wiki bug fixes
 2017-11-28 17:43:51 +08:00
Lauris BH
0d4c63fd70
Fix go-get, src and raw urls to new scheme (#2978) 2017-11-27 02:58:54 +02:00
Ethan Koenig
40c545ddbc Fix files/commits of merged PRs (#2937) 2017-11-25 21:47:19 +08:00
Timur Makarchuk
dbb7715b0b Remove render issue link (#2954) 
* Remove function that does nothing

* Remove unused import
 2017-11-22 08:25:47 +02:00
Lunny Xiao
10b54df2b2 Add dingtalk webhook (#2777) 
* add dingtalk webhook type

* add vendor

* some fixes

* fix name check

* fix name check & improvment
 2017-11-21 06:26:43 +02:00
Michael Kuhn
420fc8efc2 Disable add key button if SSH is disabled (#2873) 2017-11-21 11:49:33 +08:00
Lunny Xiao
cdc4600725
Fix fork repository cycle to self (#2860) 
* fix fork repository cycle to self

* rename testForkRepo to traverseParentRepo
 2017-11-06 12:12:55 +08:00
Ethan Koenig
513375c429 Make URL scheme unambiguous (#2408) 
* Make URL scheme unambiguous

Redirect old routes to new routes

* Fix redirects to new URL scheme, and update template

* Fix branches/_new endpoints, and update integration test
 2017-10-30 10:04:25 +08:00
Ethan Koenig
5866eb2321 Code/repo search (#2582) 
Indexed search of repository contents (for default branch only)
 2017-10-27 09:10:54 +03:00
Lauris BH
eca05b09aa Add commit count caching (#2774) 
* Add commit count caching

* Small refactoring

* Add different key prefix for refs and commits

* Add configuratuion option to allow to change caching time or disable it
 2017-10-26 09:37:33 +08:00
Bwko
3ab580c8d6 Add branch overiew page (#2108) 
* Add branch overiew page

* fix changed method name on sub menu

* remove unused code
 2017-10-26 08:49:16 +08:00
Jonas Franz
f4190f8df8 Render plain text README.txt monospaced (#2721) 
Signed-off-by: Jonas Franz <info@jonasfranz.software>
 2017-10-17 02:17:22 +03:00
Lauris BH
c1b0c9e7c4 Fix PR, milestone and label functionality if issue unit is disabled (#2710) 
* Fix PR, milestone and label functionality if issue unit is disabled or not assigned to user

* Fix multi-actions in PR page

* Change error message

* Fix comment update and delete functionality in PR
 2017-10-16 10:55:43 +03:00
Lunny Xiao
a75d5c72bb Fix plain readme didn't render correctly on repo home page (#2705) 
* fix plain readme didn't render correctly on repo home page

* fix missing render

* remove unused template variables
 2017-10-16 09:04:34 +02:00
Lauris BH
c7f4f07765 Integration test for activity page (#2704) 
* Integration test for activity page

* Small code refactoring for acitvity page

* Move activity stats calculation logic to model
 2017-10-16 00:54:53 +03:00