delta/gitlab/gitlab-ce.git, branch 35769-fix-ruby-2-4-compatibility gitlab.com: gitlab-org/gitlab-ce.git Fix Issue board when using Ruby 2.4 2017-08-01T14:07:05+00:00 Rémy Coutable remy@rymai.me 2017-08-01T08:40:41+00:00 f67c7a4da6eb7e363f5433df74016f234999c467 In Ruby 2.4, Hash#compact exists and returns a Hash, while in Ruby 2.3, Hash#compact is implemented by Rails and returns a new `ActionController::Parameters` instance in this case. Also, `ActionController::Parameters#compact` is deprecated in Rails 5.1 so we're using `reject { |_, value| value.nil? }` instead. Signed-off-by: Rémy Coutable <remy@rymai.me> 
In Ruby 2.4, Hash#compact exists and returns a Hash, while in
Ruby 2.3,
Hash#compact is implemented by Rails and returns a new
`ActionController::Parameters` instance in this case.

Also, `ActionController::Parameters#compact` is deprecated in
Rails 5.1 so we're using `reject { |_, value| value.nil? }` instead.

Signed-off-by: Rémy Coutable <remy@rymai.me>
Merge branch 'doc_code_review' into 'master' 2017-08-01T14:01:49+00:00 Rémy Coutable remy@rymai.me 2017-08-01T14:01:49+00:00 e753444c7341bb9c327aaf7db69a4e612bff0449 Add code review guidelines related to Build [CI skip]. See merge request !13223 
Add code review guidelines related to Build [CI skip].

See merge request !13223
 Add code review guidelines related to Build [CI skip]. 2017-08-01T14:01:48+00:00 Marin Jankovski marin@gitlab.com 2017-08-01T14:01:48+00:00 0430007ec86b7761cdaac2a0ba5d735264d63148 






Merge branch 'fix/sm/35825-api-specs-and-linting-failing-on-master' into 'master'
2017-08-01T13:49:49+00:00

Rémy Coutable
remy@rymai.me

2017-08-01T13:49:49+00:00

1814fef814d2b21d0a4aaa3482233ed8777875ab

Fix "API specs and linting failing on master"

Closes #35825

See merge request !13227




Fix "API specs and linting failing on master"

Closes #35825

See merge request !13227






Merge branch 'winh-cycle-analytics-dropdown-style' into 'master'
2017-08-01T13:38:18+00:00

Annabel Dunstone Gray
annabel.dunstone@gmail.com

2017-08-01T13:38:18+00:00

3f230455f17549346efe0866ebac5bb6fbf3a518

Make time span dropdown style on cycle analytics page consistent

See merge request !13183




Make time span dropdown style on cycle analytics page consistent

See merge request !13183






Make time span dropdown style on cycle analytics page consistent
2017-08-01T13:38:16+00:00

Winnie Hellmann
winnie@gitlab.com

2017-08-01T13:38:16+00:00

08ea9572d61f8fee19b3c013d2e4e943ce054580












Merge branch 'rc/fetch-before-finding-merge-base-in-ee_compat_check' into 'master'
2017-08-01T13:00:05+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-08-01T13:00:05+00:00

c7583e72f967a55fb28d518bb8b0798897a683d4

Always fetch branches before finding the merge base, otherwise we could find an outdated merge base

See merge request !13226




Always fetch branches before finding the merge base, otherwise we could find an outdated merge base

See merge request !13226






Merge branch 'blob-limit-test' into 'master'
2017-08-01T12:53:57+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-08-01T12:53:57+00:00

7a2509ea1ff9e740d0842827cb9713187172adde

Fix bug in blob test

See merge request !13224




Fix bug in blob test

See merge request !13224






Merge branch '28283-legacy-storage-format' into 'master'
2017-08-01T12:24:24+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-08-01T12:24:24+00:00

90cb2aab38341d308a65f79a4c11167c756ffc02

[CE] Added Legacy Storage format

See merge request !13149




[CE] Added Legacy Storage format

See merge request !13149






Add 204. Remove duplicated method.
2017-08-01T12:17:46+00:00

Shinya Maeda
shinya@gitlab.com

2017-08-01T12:17:46+00:00

0c5fbaa72b8e4f032cf58758f8aa75925d57b06f