Commit Graph

1521 Commits (b538c5345e1271fcaf413b82ba1ece555dd635a5)

Author SHA1 Message Date
Unknwon b538c5345e
restore: reset original created_unix after insert (#5264) 2018-06-09 17:21:58 +08:00
Unknwon 53c8e4263b
models: skip JSON for fields skipped by XORM
Reduce output JSON size by backup command
2018-06-09 16:06:47 +08:00
Unknwon c08aab90ec
models/mirror: shot push webhook after synced commits (#4528) 2018-06-03 20:32:44 +08:00
Unknwon 775919c129
mirror: show sync feeds on dashboard (#2017) 2018-05-30 21:26:03 +08:00
Unknwon e33d9e77f4
vendor: rename "gogits" to "gogs" 2018-05-27 09:07:15 +08:00
Unknwon aff4208244
*: rename "gogits" to "gogs" 2018-05-27 08:53:48 +08:00
Unknwon 05edcde6c9
routes/user/auth: improve coding style 2018-05-21 14:45:47 +08:00
Unknwon 01ccc2cc96
security: prevent same passcode from being reused
Reported by @cezar97.
2018-05-21 14:24:06 +08:00
Lauris BH eccc8109c1 security: fix path cleanup for repository init and editor (#5207)
Reported by Kacper Szurek https://security.szurek.pl/.
2018-05-08 14:32:49 -04:00
Unknwon f2ecfdc96a
auth: support authentication source config file (#3142) 2018-04-12 09:55:58 -04:00
Unknwon 8b66c433c5
models/pull: fix error on merge pull requests to non-default branch (#5138) 2018-04-09 07:26:38 -04:00
Unknwon 0152e12172
locale: sync from Crowdin 2018-03-30 23:19:20 -04:00
Unknwon a855abf8c0
models: rename RewriteAllPublicKeys -> RewriteAuthorizedKeys 2018-03-30 01:26:36 -04:00
Unknwon 75555585e8
models/pull: fix rebase merging no effect (#5051) 2018-03-21 19:11:36 -04:00
Unknwon 52ee796d6d
repo_branch: fix SQL builder (#5054) 2018-03-20 19:06:13 -04:00
Dennis Chen f0bbcef3a4 api: fix nil pointer dereference on repo/forks (#4633)
Sets BaseRepo value for each resulting fork in GetForks().
Finds correct permissions for parent repository in APIFormat().

The output JSON is a little redundant, perhaps we should offer a
different view of the api.Repository without the Parent attribute?

Signed-off-by: Dennis Chen <barracks510@gmail.com>
2018-03-12 15:03:51 -04:00
m2nlight aa53d0978c models: add ROW_FORMAT=DYNAMIC when creating table for supports mysql 5.6 (#4913)
* Add ROW_FORMAT=DYNAMIC when creating table for supports mysql 5.6 (fix #4894)

* Update models.go

Rename NewEngine2 to NewEngineWithParams

* Rename NewEngine2 to NewEngineWithParams

Please update vendor when https://github.com/go-xorm/xorm/pull/798 closed.

* Update dialect_mysql.go

* Update dialect_mysql.go

* Update models.go
2018-03-09 15:44:07 -05:00
Unknwon 86d249eb16
migrations: remove unused function and fix compile error 2018-03-09 00:33:40 -05:00
Unknwon 1f7983059a
models: move ErrBranchNotExist to errors package 2018-03-08 07:15:55 -05:00
Wendell Sun e4f187cd3d models: bug fix for query protected branches (#5054)
Signed-off-by: Wendell Sun <iwendellsun@gmail.com>
2018-03-06 17:11:31 -05:00
Unknwon dd245fe8bd
pull_request: fix changes not pushed to upstream if between two repositories (#4890) 2017-11-22 14:12:52 -05:00
m2nlight f12c058b78 models: update mySQL charset=utf8mb4 (#4880)
* Add utf8mb4 to connStr for mysql. fix #4131

* Update models.go. charset=utf8mb4 for mysql.

charset=utf8mb4 for mysql.
2017-11-22 13:42:30 -05:00
m2nlight 67d67289c7 models: add utf8mb4 to connStr for mysql (#4878) 2017-11-21 00:25:36 -05:00
Unknwon 0f14b92bce
MISC: minor fixes in webhook 2017-11-18 00:38:46 -05:00
Unknwon 43d6ad5fda
pull: fix after commit ID is not latest commit in the base branch (#4442) 2017-11-18 00:38:06 -05:00
Unknwon 3b8b8a2ee3
pull_request: able to ignore whitespace when check conflict (#4834) 2017-11-16 22:22:38 -05:00
Unknwon 181dc5d75e
editor: remove out of sync branch before checkout again
If a branch was deleted from server, sometimes it is not reflected
on local copy. Therefore, we need to remove the branch with same
name if it is out of sync and then checkout to correct version.
2017-11-16 00:03:35 -05:00
Unknwon 34c2e52bd5
repo/pull: allow rebase before merging (#4805) 2017-11-15 23:28:31 -05:00
mharinder 5cd1fdeb9e
pull: add an option to use rebase for merging pull requests
For DVCS, either merge or rebase works for getting new code in a pull
request in the main branch.

The rebase workflow produces a linear history which is cleaner, and
more bisect-able.

This commit adds a repo-level option to enable the rebase workflow. Once
enabled, "Merge Pull Request" will be replaced by
"Rebase and Merge Pull Request" which does exactly what the user wants.
It's unlikely a project wants a mixed-use of both rebase and merge
workflows, therefore the feature is not implemented as a drop-down
button like what GitHub does
(https://github.com/blog/2243-rebase-and-merge-pull-requests).
2017-11-15 23:28:23 -05:00
Unknwon af3911b833
MISC: update README and migration comment 2017-10-22 19:29:29 -04:00
Athurg Feng 52f3833811 Add Dingtalk webhook support (#4773)
* Add dingtalk webhook into html template

* Add Dingtalk's icon

* Insert dingtalk into repo's webhook page template

* Insert dingtalk into org's webhook page

* Add dingtalk into default webhook config

* Add locale string for add_dingtalk_hook_desc

* Update bindata

* Add dingtalk webhook form validator

* Add dingtalk hook task

* Add dingtalk hook create handler

* Add dingtalk hook edit handler

* Add dingtalk router

* Add dingtalk webhook task skeleton

* Add markdown link formatter

* Add Dingtalk ActionCard create wrapper

* Add support for dingtalk create event payload

* Add support for dingtalk delete event payload

* Add support for dingtalk fork event payload

* Add support for dingtalk push event payload

* Add support for dingtalk issue event payload

* Add support for dingtalk issue comment payload

* Add support for dingtalk pull event payload

* Add support for dingtalk release event payload
2017-09-21 14:32:48 -04:00
Sb ab2c6cb008 models: fix #4692 and typo in comments (#4695) 2017-08-13 02:11:48 -04:00
Unknwon 6bc11c4450
hook: fix email not sent after push (#4430)
Turns out mail service was not initialized at all, also mail must
be sent in sync in hook mode before program exits.
2017-07-27 16:53:02 -04:00
Unknwon 643c85e9c8
routes/home: minor code improve 2017-07-18 22:09:57 -04:00
Unknwon ee9950ec2f
explore: fix total repository number and page number do not match (#4441)
Because in the final repository list we use Distinct to remove
duplicates, but didn't do so when count total number of repositories.
2017-07-18 22:07:40 -04:00
Unknwon dc10594d7b
repo: fix cannot fork repository (#4572)
Should not load attributes if repository not found in HasForkedRepo.
2017-07-18 12:56:23 -04:00
Unknwon e02fac4968
repo: fix panic on pull request submit (#4572) 2017-07-14 18:51:23 -04:00
Unknwon 13cca8a66a
models/comment: remove unused SQL parameter (#4586) 2017-06-27 20:39:59 -04:00
Unknwon 8ed2330d6e
issue_comment: fix pg syntax ambiguous (#4586)
Also handle error related to time parsing.
2017-06-27 20:21:36 -04:00
Andy Hochhaus 261237745f api: fix ListIssueComments API (#4587) 2017-06-27 19:59:41 -04:00
Unknwon 11b1498a6e
api/repo: load attributes when listing user repositories (#4565) 2017-06-21 17:41:18 -04:00
Unknwon 0e6a6bf880
Refactoring: remove sessionRelease()
XORM supports automatic roll back in session Close() already.
2017-06-11 03:06:36 -04:00
Unknwon 23b83cb736
pkg/process: fix potential race condition
Following conditions were not protected:
1. Use and increase next pid
2. Append and remove process from the list
2017-06-11 02:28:08 -04:00
Unknwon e16196124e
setting: disable SSH minimum key size check when not eligible (#4507) 2017-06-11 02:06:26 -04:00
Unknwon ab2197bc75
random: some code simplify 2017-06-11 00:56:31 -04:00
Unknwon a887e475e3
repo: change action visibility when repository visibility changed (#4414) 2017-06-11 00:43:56 -04:00
Unknwon 3efc0d8681
repo: load base repository for loadAttributes 2017-06-08 16:18:04 -04:00
Simon Dann e9a2b72ddb models/repo: modify keyword search to include description for #4287 (#4548)
* Modified repository keyword search to include description for #4287

* Replacing Where with And for #4548
2017-06-06 06:23:42 -04:00
无闻 51d7f1264b api: GitHub compliance (#4549)
* Add undocumented endpoint for /repositories/:id

* GitHub API Compliance
2017-06-05 15:34:11 -04:00
Unknwon 6bb9c442b2
issue: fix updated_unix is not updated for new comments (#4462) 2017-06-02 17:30:15 -04:00