delta/gitlab/gitlab-ce.git/spec, branch bugfix/upgrade-ruby-parser gitlab.com: gitlab-org/gitlab-ce.git Merge branch '25426-group-dashboard-ui' into 'master' 2017-06-08T18:12:04+00:00 Douwe Maan douwe@gitlab.com 2017-06-08T18:12:04+00:00 4b1c49171dcdac5ba78a81bad94776644d9dbed5 Resolve "Group dashboard UI" Closes #25426 See merge request !11098 
Resolve "Group dashboard UI"

Closes #25426

See merge request !11098
 Merge branch 'ce#31853-projects-shared-groups' into 'master' 2017-06-08T18:04:04+00:00 Annabel Dunstone Gray annabel.dunstone@gmail.com 2017-06-08T18:04:04+00:00 aa7e051357d230c17f9a900589eca59bd6d6fdb0 31853 Remove duplication for sharing projects with groups in project settings Closes #31853 See merge request !11951 
31853 Remove duplication for sharing projects with groups in project settings

Closes #31853

See merge request !11951
 Merge branch 'unicorn-test-boot-timeout' into 'master' 2017-06-08T17:39:23+00:00 Douwe Maan douwe@gitlab.com 2017-06-08T17:39:23+00:00 7bd5b8c1c709163547ec865484b341211158ebf1 Increase unicorn test boot timeout to 5 minutes See merge request !12022 
Increase unicorn test boot timeout to 5 minutes

See merge request !12022
 Merge branch 'dm-blob-file-type' into 'master' 2017-06-08T17:15:16+00:00 Grzegorz Bizon grzegorz@gitlab.com 2017-06-08T17:15:16+00:00 6cbe38675dcd0547d9127373851471008e624e2b Add Blob#file_type convenience method See merge request !11982 
Add Blob#file_type convenience method

See merge request !11982
 Increase unicorn test boot timeout to 5 minutes 2017-06-08T16:35:55+00:00 Jacob Vosmaer jacob@gitlab.com 2017-06-08T16:35:55+00:00 ef3adb65797a5479ea9c7cbbdf6039c3ea21641c 






Merge branch 'dm-diff-file-diffable' into 'master'
2017-06-08T16:14:56+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-06-08T16:14:56+00:00

e9002222a0fc65e4e3328c7c536e43516986eb40

Move diffable? method from Repository to Diff::File

See merge request !11980




Move diffable? method from Repository to Diff::File

See merge request !11980






Merge branch 'master' into 25426-group-dashboard-ui
2017-06-08T15:15:27+00:00

Alfredo Sumaran
alfredo@gitlab.com

2017-06-08T15:15:27+00:00

b55bd9ef95734a6805b11a8a8322149e885425a6












Add Blob#file_type convenience method
2017-06-08T15:07:17+00:00

Douwe Maan
douwe@selenight.nl

2017-06-06T21:26:31+00:00

369d681eec8177f03bf3b4f694e03098447dae09












Use Diff::File blob methods from diff highlighter
2017-06-08T14:39:54+00:00

Douwe Maan
douwe@selenight.nl

2017-06-06T21:21:29+00:00

e6e29f9220a676f86ad035ae6430888deab4e8c5












Move diffable? method from Repository to Diff::File
2017-06-08T14:32:57+00:00

Douwe Maan
douwe@selenight.nl

2017-06-06T21:24:32+00:00

ffbbd4112eb5a0a927925e70644128bf25145414