Jonas Franz 6d00c1a7ce Merge branch 'master' into feat/approval-new ...

# Conflicts:
#	models/issue_comment.go
#	models/migrations/migrations.go
#	models/migrations/v64.go
#	models/models.go
#	public/css/index.css

2018-05-13 22:14:34 +02:00

..

auth

Merge branch 'master' into feat/approval-new

2018-05-13 22:14:34 +02:00

avatar

Use assert in legacy unit tests (#867)

2017-02-08 14:29:07 +08:00

base

Symlink icons (#1416) (#3826)

2018-05-01 10:04:36 +03:00

cache

Fix memcache support when value is returned as string always (#2924)

2017-11-16 15:06:34 +08:00

context

Multiple assignees (#3705)

2018-05-09 19:29:04 +03:00

cron

Add branch overiew page (#2108)

2017-10-26 08:49:16 +08:00

generate

Implements generator cli for secrets (#3531)

2018-02-18 20:14:37 +02:00

highlight

No highlighting for .txt files (#1922)

2017-06-09 19:39:16 -05:00

httplib

Add sensitive headers (#3429)

2018-01-31 00:09:16 +02:00

indexer

Global code search support (#3664)

2018-03-16 22:04:33 +08:00

lfs

Fix path cleanup in multiple places (#3871)

2018-05-01 09:46:04 +08:00

log

Fix lint errors (#2547)

2017-09-19 11:08:30 +03:00

mailer

Add support for extra sendmail arguments (#2731)

2017-10-25 22:27:25 +03:00

markup

Fix wiki inter-links with cases and add tests for this case (#3560)

2018-03-05 20:39:12 +02:00

minwinsvc

Fix Git hooks not being executed on Windows when running as a service (#1149)

2017-03-09 09:27:43 +08:00

notification

Notification - Step 1 (#523)

2016-12-31 00:44:54 +08:00

options

Fix typos in models/ and modules/ (#1248)

2017-03-15 08:52:01 +08:00

private

improve protected branch to add whitelist support (#2451)

2017-09-14 16:16:22 +08:00

process

Fix run command race (#1470)

2017-11-13 22:51:45 +08:00

public

Enable caching on assets and avatars (#3376)

2018-02-04 00:37:05 +02:00

search

Global code search support (#3664)

2018-03-16 22:04:33 +08:00

setting

issue-2768: added new option allow_only_external_registration (#3910)

2018-05-13 15:51:16 +08:00

ssh

Configurable SSH key exchange algorithm and MAC suite (#2806)

2017-11-02 23:26:41 +08:00

sync

Fix status table race condition (#1835)

2017-05-31 16:57:17 +08:00

templates

Preview for listing comments

2018-05-11 10:59:20 +02:00

test

API endpoint for testing webhook (#3550)

2018-04-29 14:21:33 +08:00

user

golint fixed for modules/user

2016-11-24 17:37:11 +08:00

util

fix gpg expired bug when time is zero (#3584)

2018-02-26 12:25:45 +02:00

validation

Create new branch from branch selection dropdown (#2130)

2017-10-15 22:59:24 +03:00