delta/gitlab/gitlab-ce.git/lib, branch ch-test gitlab.com: gitlab-org/gitlab-ce.git [Multiple issue assignee]: reslving some conflicts 2017-05-04T14:22:24+00:00 Valery Sizov valery@gitlab.com 2017-05-04T14:22:24+00:00 b0a9a7cf5ee670ae07c4a9751d9c6e8bed1063b7 






Backport of multiple_assignees_feature [ci skip]
2017-05-04T14:11:53+00:00

Valery Sizov
valery@gitlab.com

2017-05-04T12:11:15+00:00

387c4b2c21a44360386a9b8ce6849e7f1b8a3de9












Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into 'master'

2017-05-04T08:26:42+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-05-04T08:26:42+00:00

eddeecf65de0c37b495e5e857f2dd3a5f0b3ca9d


Handle incoming emails from aliases correctly

See merge request !11079





Handle incoming emails from aliases correctly

See merge request !11079






Merge branch '31647-fix-snippet-content_html' into 'master'

2017-05-04T07:32:45+00:00

Rémy Coutable
remy@rymai.me

2017-05-04T07:32:45+00:00

8983ade27df200f7f9376d61de17f329d9d27a33


Fix caching large snippet HTML content on MySQL databases

Closes #31647

See merge request !11024





Fix caching large snippet HTML content on MySQL databases

Closes #31647

See merge request !11024






Merge branch '31544-size-of-project-from-api' into 'master'

2017-05-04T07:16:08+00:00

Rémy Coutable
remy@rymai.me

2017-05-04T07:16:08+00:00

12c34c1cbbaeb107b826a52b784e0dc10f5a53ba


Resolve "Size of project from API"

Closes #31544

See merge request !11013





Resolve "Size of project from API"

Closes #31544

See merge request !11013






Merge branch '31671-merge-request-message-contains-carriage-returns' into 'master'

2017-05-03T22:25:50+00:00

Douwe Maan
douwe@gitlab.com

2017-05-03T22:25:50+00:00

4faa65d8381f3e1e45bdf3a9bc9785b588891b66


removes the possibility of commit messages having carriage returns

Closes #31671

See merge request !11077





removes the possibility of commit messages having carriage returns

Closes #31671

See merge request !11077






removes the possibility of commit messages having carriage returns
2017-05-03T20:25:57+00:00

Tiago Botelho
tiagonbotelho@hotmail.com

2017-05-03T17:37:34+00:00

268ec199da09f3d2c3e93b1f3546f2c3c89c48d0












Merge branch 'dm-blob-external-storage' into 'master'

2017-05-03T19:54:30+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-05-03T19:54:30+00:00

c1e2da9293bb036280c05ee6b99952b067bdc316


Refactor Blob support of external storage in preparation of job artifact blobs

See merge request !11048





Refactor Blob support of external storage in preparation of job artifact blobs

See merge request !11048






Handle incoming emails from aliases correctly
2017-05-03T19:51:10+00:00

Sean McGivern
sean@gitlab.com

2017-05-03T18:58:56+00:00

eb490365b589b8ace384bac617975a9031d9011c

These set the 'actual' destination email in one of the Delivered-To lines, so
check those too.





These set the 'actual' destination email in one of the Delivered-To lines, so
check those too.







Fix project tree saver and fork spec failures
2017-05-03T16:36:01+00:00

James Lopez
james@gitlab.com

2017-05-03T16:36:01+00:00

cf3990cfbfe878f8b4f867042ee0967f947718ee