delta/gitlab/gitlab-ce.git, branch bugfix/upgrade-ruby-parser gitlab.com: gitlab-org/gitlab-ce.git ruby 2.4 support: upgrade ruby_parser to 3.9 2017-06-09T18:10:41+00:00 http://jneen.net/ jneen@jneen.net 2017-06-09T18:10:17+00:00 2b97aa75e40932b38358c70976e19377032a8962 






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 'artifacts-keyboard-shortcuts' into 'master'
2017-06-08T18:06:23+00:00

Filipa Lacerda
filipa@gitlab.com

2017-06-08T18:06:23+00:00

7b6df851209f5845be6a2b2d3a3865510ca540aa

Enabled keyboard shortcuts on artifacts pages

Closes #33184

See merge request !12015




Enabled keyboard shortcuts on artifacts pages

Closes #33184

See merge request !12015






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






Merge branch 'dm-empty-blob-viewer-binary' into 'master'
2017-06-08T17:09:47+00:00

Grzegorz Bizon
grzegorz@gitlab.com

2017-06-08T17:09:47+00:00

299a3a9aa0a91229f2767113145c3166ac642379

Empty blob viewer isn’t binary-only

See merge request !11979




Empty blob viewer isn’t binary-only

See merge request !11979






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 'dm-highlight-diff-file-blob' into 'master'
2017-06-08T15:50:30+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-06-08T15:50:30+00:00

9ea883fb5d02608010db858237cbd4926ae99650

Use Diff::File blob methods from diff highlighter

See merge request !11978




Use Diff::File blob methods from diff highlighter

See merge request !11978