delta/gitlab/gitlab-ce.git/spec, branch convdev-docs gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'deprecate-gitaly-path' into 'master' 2017-06-15T14:57:14+00:00 Sean McGivern sean@mcgivern.me.uk 2017-06-15T14:57:14+00:00 0b408219ed5992a9c85dc86a452bf1ef5faf0fd2 Stop using deprecated `path` field on Gitaly messages See merge request !12112 
Stop using deprecated `path` field on Gitaly messages

See merge request !12112
 #13336 - display multiple messages in both the UI and git output 2017-06-15T13:47:33+00:00 Mike Ricketts rickettm@uk.ibm.com 2017-06-15T13:47:33+00:00 03b2ac659e43f39a4c6e646d0dbb5bd0a973cc38 






Merge branch 'docs/gb/document-new-migrations-testing-technique' into 'master'
2017-06-15T13:28:42+00:00

Rémy Coutable
remy@rymai.me

2017-06-15T13:28:42+00:00

039c375372f76050c48d6e5c39bb8322c8bf7dc5

Document a new migrations testing technique

Closes #33565

See merge request !12181




Document a new migrations testing technique

Closes #33565

See merge request !12181






Merge branch '23998-blame-age-map' into 'master'
2017-06-15T13:21:00+00:00

Annabel Dunstone Gray
annabel.dunstone@gmail.com

2017-06-15T13:21:00+00:00

4be80bcc5926e40d10bbfd149719d495ebff9d4c

Add age color mapping to blame view

Closes #23998

See merge request !7198




Add age color mapping to blame view

Closes #23998

See merge request !7198






Document a new migrations testing technique
2017-06-15T11:05:56+00:00

Grzegorz Bizon
grzesiek.bizon@gmail.com

2017-06-15T08:59:13+00:00

347ec38cbf16138d8fb426ce5ff4a6d78aff887c












Merge branch 'sh-fix-spec-helper-ee-consistency' into 'master'
2017-06-15T09:39:30+00:00

Rémy Coutable
remy@rymai.me

2017-06-15T09:39:30+00:00

b5a14e7404fc794a1959db1e4983ca7421c42791

Make spec/spec_helper consistent with EE by including a :routing type

See merge request !12178




Make spec/spec_helper consistent with EE by including a :routing type

See merge request !12178






Merge branch 'fix-manual-actions' into 'master'
2017-06-15T09:36:02+00:00

Grzegorz Bizon
grzegorz@gitlab.com

2017-06-15T09:36:02+00:00

4ac74fe6e809c21e7166157bd326962acd4de14d

Do not show manual actions that cannot be run

Closes #32380

See merge request !12121




Do not show manual actions that cannot be run

Closes #32380

See merge request !12121






Merge branch 'instrument-merge-request-diff-load-commits' into 'master'
2017-06-15T08:27:50+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-06-15T08:27:50+00:00

44e5f57b1ea0e43cb27c9ac080839949ab8485d1

Instrument MergeRequestDiff#load_commits

See merge request !12162




Instrument MergeRequestDiff#load_commits

See merge request !12162






Merge branch 'dm-fix-parser-cache' into 'master'
2017-06-15T08:19:13+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-06-15T08:19:13+00:00

d348702b4f3b746565cc2ff1206479e639bae543

Don't return nil for missing objects from parser cache

See merge request !12168




Don't return nil for missing objects from parser cache

See merge request !12168






Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'
2017-06-15T07:46:43+00:00

Phil Hughes
me@iamphill.com

2017-06-15T07:46:43+00:00

d32de821960332c4e53e2f9dc696d15b7bfe3d7a

Fix note highlight being lost after real time update

Closes #33483

See merge request !12098




Fix note highlight being lost after real time update

Closes #33483

See merge request !12098