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

2242 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
kolaente
7a57b6d979
Merge remote-tracking branch 'upstream/master' 2018-03-20 19:42:52 +01:00
Jonas Franz
43fc430c07 Improve release page UI (#3693) 
* Improve release page ui by adding size

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add documentation to a.MustSize()

Signed-off-by: Jonas Franz <info@jonasfranz.software>
 2018-03-19 18:06:00 +02:00
kolaente
c3a58780d4
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
        #	models/migrations/migrations.go
        #	models/migrations/v58.go
 2018-03-18 15:23:59 +01: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
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
kolaente
4f94a01b15
Merge branch 'master' of https://github.com/go-gitea/gitea 2018-03-11 16:17:47 +01:00
Lauris BH
de8a091767 Fix MySQL and PostgreSQL column drop SQL (#3649) 2018-03-09 09:20:57 +08:00
Lunny Xiao
20ed1e949e
Merge branch 'master' into master 2018-03-07 23:57:36 +08:00
Lauris BH
dc4afef07f Fix column removal in MSSQL (#3638) 
* Fix column removal in MSSQL

* Use xorm session in MSSQL drop column operations

* Add transaction as MSSQL alter table is transactional
 2018-03-07 14:44:12 +08:00
Jonas Franz
9a5e628a7e Add Attachment API (#3478) 
* Add Attachment API
* repos/:owner/:repo/releases (add attachments)
* repos/:owner/:repo/releases/:id (add attachments)
* repos/:owner/:repo/releases/:id/attachments
* repos/:owner/:repo/releases/:id/attachments/:attachment_id

Signed-off-by: Jonas Franz <info@jonasfranz.de>

* Add unit tests for new attachment functions
Fix comments

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* fix lint

* Update vendor.json

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* remove version of sdk

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Fix unit tests
Add missing license header

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add CreateReleaseAttachment
Add EditReleaseAttachment
Add DeleteReleaseAttachment

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add filename query parameter for choosing another name for an attachment

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Fix order of imports

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Restricting updatable attachment columns

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* gofmt

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Update go-sdk
Replace Attachments with Assets

Signed-off-by: Jonas Franz <info@jonasfranz.de>

* Update go-sdk

Signed-off-by: Jonas Franz <info@jonasfranz.de>

* Updating go-sdk and regenerating swagger

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add missing file of go-sdk

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Change origin of code.gitea.io/sdk to code.gitea.io/sdk
Update code.gitea.io/sdk

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Update swagger

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Update updateAttachment
 2018-03-06 09:22:16 +08:00
Morgan Bazalgette
b730498f02 Don't write to log NoCommitterAccount (#3621) 
* Don't write to log NoCommitterAccount

It's way too verbose, and the information is also printed to the user
already. Fixes #3602.

* ignore err only if it's a ErrUserNotExist

* Replace with IsErrUserNotExist
 2018-03-04 10:45:01 +08:00
Bo-Yi Wu
78b54b49fa
fix: Add feed for organization (#3594) 
* feat: Add feed for organization

* fix: testing

* fix: testing

* fix: testing

* fix: testing
 2018-03-03 13:21:16 +08:00
Allen Wild
8606d9f5bc Add admin dashboard option to run health checks (#3606) 
There's one for git gc, why not git fsck too?

Also add a couple more trace logs to GitFsck to see progress
 2018-03-02 11:09:43 +02:00
kolaente
5852b7c9f3
Merge branch 'master' into master 2018-02-27 20:06:12 +01:00
kolaente
264f895967 Only check for open dependencies if they are enabled 2018-02-27 19:14:04 +01:00
Wendell Sun
d2d0aea8a1 Fix the protected branch panic issue (#3567) 2018-02-23 18:10:03 +08:00
Wendell Sun
2d1c5c3756 Fix remove team member issue (#3566) 
Put sess.Commit() out of the RemoveOrgUser function

Add an empty line to separate import packages
 2018-02-23 16:42:02 +08:00
Wendell Sun
19bf4ddf80 Fix query protected branch bug (#3563) 
Signed-off-by: Wendell Sun <iwendellsun@gmail.com>
 2018-02-22 20:14:15 -06:00
Bo-Yi Wu
845ba9d153 fix: if Mirrors repo no content is fetched, updated time should not b… (#3551) 
* fix: if Mirrors repo no content is fetched, updated time should not be changed

* fix: sync update time from mirror repo.

* fix: one single session.

* update comment.

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2018-02-22 18:27:09 -06:00
Bo-Yi Wu
04b3e8cbdc
refactor: reduce sql query in retrieveFeeds (#3547) 2018-02-21 18:55:34 +08:00
Ethan Koenig
d27d720f05 Use unique temp dirs in unit tests (#3494) 
* Use unique temp dirs in unit tests

* Remove temp dirs after tests run

* os.RemoveAll -> removeAllWithRetry
 2018-02-21 01:38:52 -06:00
Wendell Sun
2f5c1ba1db Bug fix for repo releases sorted (#3522) 
Signed-off-by: Wendell Sun <iwendellsun@gmail.com>

Use TimeStampNow function
 2018-02-21 09:38:03 +08:00
kolaente
ec0e6934cd
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v57.go
 2018-02-19 08:33:44 +01: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
Lauris BH
58893384e8 Add issue closed time column to fix activity closed issues list (#3537) 
Signed-off-by: Lauris Bukšis-Haberkorns <lauris@nix.lv>
 2018-02-19 10:39:26 +08:00
Lauris BH
3a9c698821
Force remove test repo root path in case previous test is still locking it (#3528) 
Signed-off-by: Lauris Bukšis-Haberkorns <lauris@nix.lv>
 2018-02-18 23:19:40 +02: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
kolaente
bcaea09fe4
FIxed import order 2018-02-12 23:06:49 +01:00
kolaente
bd3cf60ddb
FIxed import order 2018-02-12 22:59:50 +01:00
kolaente
7566292e4e
Updated copyright header 2018-02-12 18:34:41 +01:00
kolaente
9584d3f097
gofmt 2018-02-12 17:36:00 +01:00
kolaente
e322fa36b2
Added migration to update comments table 2018-02-12 17:35:26 +01:00
kolaente
0ea51f8d04
Use xorm engine from pararmeter instead of global one 2018-02-12 17:27:35 +01:00
Konrad
16b1636043
Merge branch 'master' of https://github.com/go-gitea/gitea 2018-02-12 17:20:47 +01:00
Ethan Koenig
6eaeb01ecf Update code.gitea.io/git (#3482) 2018-02-10 20:19:26 +02:00
kolaente
9e29f711b0
Merge branch 'master' into master 2018-02-08 16:57:02 +01:00
Codruț Constantin Gușoi
011f128c89 Fixes missing avatars in offline mode (#3471) 
Signed-off-by: Codruț Constantin Gușoi <codrut.gusoi@gmail.com>
 2018-02-08 16:43:08 +01:00
Ethan Koenig
a89592d4ab Reduce repo indexer disk usage (#3452) 2018-02-05 20:29:17 +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
Ethan Koenig
b16c84de7b Fix synchronization bug in repo indexer (#3455) 2018-02-05 10:39:51 +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
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
Ethan Koenig
46c7fe371d Fix PR merge error (#3421) 2018-01-29 12:18:20 +02:00
Ethan Koenig
3968c1149e Fix SQL type error for webhooks (#3424) 2018-01-29 02:26:01 +02:00
Ethan Koenig
bac6ac033a Fix race condition in repo renaming (#3418) 2018-01-28 14:24:59 +02:00
Ethan Koenig
c55a027da3 Fix empty checkout bug (#3419) 2018-01-28 13:27:42 +02:00
Wendell Sun
b627f1131b Change local copy origin url after repository rename (#3399) 
Fix #3378
 2018-01-27 19:54:26 +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
kolaente
0ce2170031
Added only check if we're about to close an issue when closing an issue in "changeStatus" 2018-01-24 23:50:26 +01:00
Konrad Langenberg
f837429858
Added only check if we're about to close an issue when closing an issue in "changeStatus" 2018-01-24 23:44:20 +01:00
Konrad
647296ce63
Merge branch 'master' of https://github.com/go-gitea/gitea 2018-01-21 16:23:15 +01:00
Antoine GIRARD
1ce3572409 Remove useless check (#3384) 
In #3377, I put check inside all write key function. This one is useless no.
 2018-01-19 21:45:53 +02:00
Sandro Santilli
05ab747054 Force-push to base repo's ref/pull/#/head (#3393) 
* Force-push to base repo's ref/pull/#/head

Fixes force-pushing to pull request branches, otherwise failing with:

[...gitea/models/pull.go:1022 AddTestPullRequestTask()] [E] PushToBaseRepo: Push: exit status 1 - To /path/to/gitea-repositories/org/repo.git
 ! [rejected]        issue-fix -> refs/pull/20/head (non-fast-forward)

* format
 2018-01-19 08:53:45 +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
Ethan Koenig
b0d5bb909b Delete indexer DB entries when (re)creating index (#3385) 
* comment
 2018-01-17 23:51:07 +02:00
Antoine GIRARD
095fb9f2e3 Add integrations tests from git cli (#3377) 
* test: integration add git cli tests

Extracted form for easing review process and debug #3152

* test: integration add git cli big file commit

* fix:  Don't rewrite key if internal server
 2018-01-16 13:07:47 +02:00
Lauris BH
a68bf746a4
Change reserved avatar name to correct - avatars (#3375) 2018-01-16 00:45:13 +02:00
kolaente
18fe48e7be
Change nothing to trigger CI 2018-01-14 21:22:11 +01:00
kolaente
60834bc3a7
Change nothing to trigger CI 2018-01-14 21:22:00 +01:00
kolaente
992e168687
Fixed lint + gofmt 2018-01-14 21:14:42 +01:00
Konrad
fdabcf1a25
Merge branch 'master' of https://github.com/go-gitea/gitea 2018-01-14 21:13:16 +01:00
kolaente
30ae70a4d0
Moved check for open dependencies to "changeStatus" 2018-01-14 19:12:25 +01:00
Ethan Koenig
ccdb94992d Asynchronously populate the repo indexer (#3366) 
* Populate repo indexer in background

* Check if no repos exist

* race cond
 2018-01-14 19:34:41 +02:00
kolaente
f71f2d4e5d
Removed unnessecary errorcheck 2018-01-13 12:48:06 +01:00
kolaente
cf1b573c35
Merge branch 'master' into master 2018-01-13 11:20:57 +01:00
Bo-Yi Wu
7a2a3fbafc refactor(model): update user method. (#3360) 2018-01-13 11:45:16 +02:00
Kim "BKC" Carlbäcker
e5b8b4b5ec Cleanup models.User.HashPassword (#3334) 2018-01-12 00:19:38 +02: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
kolaente
0fcc3b2273
Merge branch 'master' into master 2018-01-09 11:27:21 +01: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
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
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
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
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
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
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
0016a3e1a7
Merge branch 'master' into master 2018-01-03 16:26:09 +01: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
kolaente
661bd7c1c4
gofmt 2018-01-01 14:40:14 +01:00
kolaente
9eedb3fcf8
Fixed check for issue is nil before getting issue details 2018-01-01 14:32:03 +01:00
kolaente
436ea162bb
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	public/js/index.js
 2018-01-01 14:20:42 +01:00
Sandro Santilli
8cd987af0c Add repo-sync-releases admin command (#3254) 
* Add repo-sync-releases admin command

Will help recovering corrupted database, see #3247

* Load repos in chunks of 10, exit with error if unable to get a list, scan private repos, fix typo

* Fix debug output about num releases

* Introduce RepositoryListDefaultPageSize constant, set to 64

Use it from the new admin command

* Use RepositoryListDefaultPageSize in more places

* Document RepositoryListDefaultPageSize
 2017-12-31 16:45:46 +02:00
Ethan Koenig
c64924682e Fix race condition in team functions (#3268) 2017-12-30 21:08:08 -06:00
Morgan Bazalgette
edce41ae65 go back to using CFB for AES decryption/encryption for 2FA (#3274) 2017-12-31 04:19:42 +02:00
Ethan Koenig
3850bad4c0 Remove unused consts/vars (#3270) 2017-12-30 19:10:48 -06:00
kolaente
fdb106dfa5
typo 2017-12-29 22:35:23 +01:00
kolaente
57a4f8607d
typo 2017-12-29 22:35:13 +01:00
kolaente
c534699884
Fixed Lint suggestions 2017-12-29 22:31:50 +01:00
kolaente
2a249c4e64
gofmt 2017-12-29 22:30:58 +01:00
kolaente
108edf9938
Modified tests to work again with modified functions 2017-12-29 22:29:14 +01:00
kolaente
1064acc400
Logging error 2017-12-29 15:33:19 +01:00
kolaente
70589e6c96
Added Custom error types for issue dependencies 2017-12-29 15:30:43 +01:00
kolaente
d29ca0c9f3
Fixed comment 2017-12-29 14:51:26 +01:00
kolaente
200f88d2ed
Small fixes to xorm-stuff 2017-12-29 14:44:13 +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
Lunny Xiao
f5155b9913 Small improve on deleting attachements (#3145) 
* Small improve on deleting attachements

* improve the sequence of deletion
 2017-12-24 23:04:22 +02:00
Antoine GIRARD
cc7b8e3379 Add more bench (#3161) 
* Improve makefile + Add benchs

* Apply recommendations of @ethantkoenig
 2017-12-24 02:33:34 +02:00
Ethan Koenig
515cdaa85d Fix ignored errors when checking if organization, team member (#3177) 2017-12-21 09:43:26 +02:00
Ethan Koenig
e67b4055f9 Fix repo-transfer-and-team-repo-count bug (#3241) 2017-12-19 23:37:56 -06:00
kolaente
08763cf7d5
typo 2017-12-19 19:26:08 +01:00
kolaente
e6aeeac369
typo 2017-12-19 19:25:57 +01:00
kolaente
1608248166
Fixed deleting a dependency when it going from the blocking one 2017-12-19 19:23:27 +01:00
kolaente
69769ec6fd
gofmt 2017-12-19 19:14:26 +01:00
kolaente
8354f2be75
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/v51.go
 2017-12-19 19:08:23 +01: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
6abfa48c0e Remove unnecessary updates to issue indexer (#3212) 2017-12-17 13:53:02 +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
c06cc740de
Reorder migrations, skip errors if running migration again (#3160) 
* Reorder migrations, skip errors if running migration again

* Rename migration file names to match migration version

* Add note about ingored error
 2017-12-13 16:52:18 +02:00
Lunny Xiao
859b9ad7ea fix org owner cannot be removed if there is not in owner team (#3164) 2017-12-13 00:26:31 +02:00
Kim "BKC" Carlbäcker
4b5197beb4 Fix Uninitialized variable in ParsePatch (#3156) 2017-12-12 02:32:36 +02:00
Lunny Xiao
956354885a simple usage of x (#3144) 2017-12-11 09:16:23 +02: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
Ethan Koenig
defc97afc2 Fixtures for public_key table (#3140) 2017-12-11 09:50:29 +08:00
Ethan Koenig
d1efe2078a Fix integration tests (#3141) 2017-12-11 08:52:05 +08:00
Lunny Xiao
41d6afe0e7 Fix compile failed without gcc (#3130) 
* fix comile failed without gcc

* add sqlite tag for unit test
 2017-12-10 16:08:19 +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
kolaente
f02fd333c7
Fixed import order 2017-12-07 10:23:49 +01:00
Ethan Koenig
5e4427e4e7 Fix repo indexer and submodule bug (#3107) 2017-12-07 15:18:04 +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
Konrad
13f0e17159
Fixed using xorm session 2017-12-06 17:22:19 +01:00
kolaente
01f9e6332e
Modified import order 2017-12-06 17:17:37 +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
Lauris BH
f1d8dda5b4
Tests for reactions (#3083) 
* Unit tests for reactions

* Fix import order

Signed-off-by: Lauris Bukšis-Haberkorns <lauris@nix.lv>
 2017-12-05 22:57:01 +02:00
kolaente
66433a9549
gofmt 2017-12-04 19:31:45 +01:00
kolaente
25427aee25
Using "sess" instead of "x" when removing a depencency 2017-12-04 19:23:37 +01:00
kolaente
8bcb624b10
Added missing license header 2017-12-04 19:21:38 +01: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
9dd0cb18a7
Fixed misspell 2017-12-03 18:07:48 +01:00
kolaente
d0baadc9c3
gofmt 2017-12-03 18:04:22 +01:00