delta/gitlab/gitlab-ce.git, branch ce-4813-quickfix gitlab.com: gitlab-org/gitlab-ce.git Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb 2018-02-06T17:50:01+00:00 Rémy Coutable remy@rymai.me 2018-02-06T17:50:01+00:00 e39031deca2635eb174beafefb25e9feddb1dd30 Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Merge branch '42730-close-rugged-repository' into 'master' 2018-02-06T17:49:00+00:00 Douwe Maan douwe@gitlab.com 2018-02-06T17:49:00+00:00 7095c2bf4064911568ae1574752adbc066c5347d Resolve "ProjectCacheWorker leaks file descriptors" Closes #42730 See merge request gitlab-org/gitlab-ce!16930 
Resolve "ProjectCacheWorker leaks file descriptors"

Closes #42730

See merge request gitlab-org/gitlab-ce!16930
 Merge branch 'zj/gitlab-ce-zj-wiki-page-versions' 2018-02-06T17:41:09+00:00 Douwe Maan douwe@selenight.nl 2018-02-06T17:41:09+00:00 a480ee184b88a9945207dc2e4e387bb6ef0c2df9 






Merge branch 'gitaly-lfs-client-prep' into 'master'
2018-02-06T17:35:08+00:00

Robert Speicher
robert@gitlab.com

2018-02-06T17:35:08+00:00

245d93751424b71ae5fa5d9f1b0b62c1c5319923

Refactor Gitlab::Git code related to LFS changes for Gitaly migration

Closes gitaly#980

See merge request gitlab-org/gitlab-ce!16835




Refactor Gitlab::Git code related to LFS changes for Gitaly migration

Closes gitaly#980

See merge request gitlab-org/gitlab-ce!16835






Merge branch 'zj-protobuf' into 'master'
2018-02-06T17:01:06+00:00

Marin Jankovski
marin@gitlab.com

2018-02-06T17:01:06+00:00

2d5f10b2a7f05b29ca5869b2d1acb53d5bcbf50b

Downgrade google-protobuf

See merge request gitlab-org/gitlab-ce!16941




Downgrade google-protobuf

See merge request gitlab-org/gitlab-ce!16941






Downgrade google-protobuf
2018-02-06T16:58:04+00:00

Zeger-Jan van de Weg
zegerjan@gitlab.com

2018-02-06T16:58:04+00:00

9f152630aa162cc6e7a66d9087687c605b669514












Merge branch '42669-allow-order_by-users-in-gitlab-api' into 'master'
2018-02-06T16:40:25+00:00

Douwe Maan
douwe@gitlab.com

2018-02-06T16:40:25+00:00

e8e4e3fcbe8d63a06e29f48719d70ee94d220281

Add sorting options for /users API

Closes #42669

See merge request gitlab-org/gitlab-ce!16945




Add sorting options for /users API

Closes #42669

See merge request gitlab-org/gitlab-ce!16945






Close low level rugged repository in project cache worker
2018-02-06T16:36:35+00:00

Bastian Blank
waldi@debian.org

2018-02-05T17:36:51+00:00

285d5d526b1d568580b63488b8832cfc9ef19077

Signed-off-by: Bastian Blank <waldi@debian.org>





Signed-off-by: Bastian Blank <waldi@debian.org>







Merge branch 'jej/upload-file-tracks-lfs' into 'master'
2018-02-06T16:24:54+00:00

Sean McGivern
sean@mcgivern.me.uk

2018-02-06T16:24:54+00:00

f81306e76fa16458d8ea72c2e7edf76af822610d

File upload UI obeys LFS filter

Closes #29876

See merge request gitlab-org/gitlab-ce!16412




File upload UI obeys LFS filter

Closes #29876

See merge request gitlab-org/gitlab-ce!16412






Merge branch 'master' into 'zj-wiki-page-versions'
2018-02-06T16:08:06+00:00

Douwe Maan
douwe@gitlab.com

2018-02-06T16:08:06+00:00

5db5a9cbd1192d776874a92e0a253c605f3c4417

# Conflicts:
#   Gemfile
#   Gemfile.lock




# Conflicts:
#   Gemfile
#   Gemfile.lock