Jonas Franz a8dc699e74

Merge branch 'master' into feat/approval-new ...

# Conflicts:
#	models/error.go
#	models/migrations/migrations.go
#	models/models.go
#	public/js/index.js

2018-05-19 18:17:01 +02:00

..

migrations.go

Merge branch 'master' into feat/approval-new

2018-05-19 18:17:01 +02:00

v13.go

…

v14.go

…

v15.go

…

v16.go

…

v17.go

…

v18.go

…

v19.go

…

v20.go

…

v21.go

…

v22.go

…

v23.go

…

v24.go

…

v25.go

…

v26.go

…

v27.go

…

v28.go

…

v29.go

…

v30.go

…

v31.go

…

v32.go

…

v33.go

…

v34.go

…

v35.go

…

v36.go

…

v37.go

…

v38.go

…

v39.go

…

v40.go

…

v41.go

…

v45.go

…

v46.go

…

v47.go

…

v48.go

…

v49.go

…

v50.go

…

v51.go

…

v52.go

…

v53.go

…

v54.go

Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)

2018-01-05 20:56:50 +02:00

v55.go

Writable deploy keys (closes #671) (#3225)

2018-01-07 00:55:53 +02:00

v56.go

Multiple assignees (#3705)

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

v57.go

Add issue closed time column to fix activity closed issues list (#3537)

2018-02-19 10:39:26 +08:00

v58.go

Add label descriptions (#3662)

2018-03-13 10:03:55 +08:00

v59.go

Add protected branch whitelists for merging (#3689)

2018-03-25 13:01:32 +03:00

v60.go

Add repository setting to enable/disable health checks (#3607)

2018-03-27 22:13:20 +08:00

v61.go

Add Size column to attachment (#3734)

2018-03-31 09:10:44 +08:00

v62.go

Do not allow to reuse TOTP passcode (#3878)

2018-05-02 18:02:02 +03:00

v63.go

Added user language setting (#3875)

2018-05-05 08:28:30 +08:00

v64.go

Add create review comment implementation

2018-05-10 16:35:25 +02:00

v65.go

Resolve conflicts

2018-05-19 18:15:09 +02:00

v66.go

Resolve conflicts

2018-05-19 18:15:09 +02:00