delta/gitlab/gitlab-ce.git/lib, branch refactor-dropdown-parameters-ce gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'lib-git-gitaly' into 'master' 2017-07-13T09:32:36+00:00 Sean McGivern sean@mcgivern.me.uk 2017-07-13T09:32:36+00:00 e0ce648d5c0ff9b004dae2324360219684bbecfa Add Gitaly notes to Gitlab::Git, delete diff options See merge request !12814 
Add Gitaly notes to Gitlab::Git, delete diff options

See merge request !12814
 Merge branch 'migrate-workhorse-send-blob-to-gitaly' into 'master' 2017-07-12T16:57:57+00:00 Robert Speicher robert@gitlab.com 2017-07-12T16:57:57+00:00 9bfe49c2b14e102676b2d528b230d6e4a88425a1 Migrate Workhorse SendBlob to Gitaly Closes gitaly#356 See merge request !12313 
Migrate Workhorse SendBlob to Gitaly

Closes gitaly#356

See merge request !12313
 Merge branch 'mr-branch-link-use-tree' into 'master' 2017-07-12T16:52:37+00:00 Robert Speicher robert@gitlab.com 2017-07-12T16:52:37+00:00 777ec2106415f464c3fe98643a41e847861fede3 MR branch link now links to tree instead of commits Closes #34243 See merge request !12763 
MR branch link now links to tree instead of commits

Closes #34243

See merge request !12763
 Try to eliminate unused diff options 2017-07-12T16:28:29+00:00 Jacob Vosmaer jacob@gitlab.com 2017-07-12T15:06:35+00:00 0b0e89ef7b5708cb2ac488d4641e071ce842ca23 






Merge branch 'backport-ee-2405' into 'master'
2017-07-12T16:13:18+00:00

Douwe Maan
douwe@gitlab.com

2017-07-12T16:13:18+00:00

bc1bb50685fc5d7dd588079304719307edbb4c05

Backport "Automatically link Kerberos users and LDAP people" changes to CE

See merge request !12807




Backport "Automatically link Kerberos users and LDAP people" changes to CE

See merge request !12807






Add Gitaly notes and annotations to Gitlab::Git
2017-07-12T15:06:31+00:00

Jacob Vosmaer
jacob@gitlab.com

2017-07-12T14:31:36+00:00

47c844bf34cff269c4c31c2327f1684f5265ebd4












Return `is_admin` attribute in the GET /user endpoint for admins
2017-07-12T10:45:46+00:00

Rémy Coutable
remy@rymai.me

2017-07-12T10:18:14+00:00

91f63820a540e7f3e7206dc8044e257cf28527dc

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>







Extract the finder portion of ldap_person so it can be overridden in EE
2017-07-12T08:41:41+00:00

Nick Thomas
nick@gitlab.com

2017-07-12T08:41:41+00:00

7f350ba16d85efff992a9fe6bd6ad734244656d9












Merge branch 'rs-issue-34941' into 'master'
2017-07-11T22:42:38+00:00

Stan Hu
stanhu@gmail.com

2017-07-11T22:42:38+00:00

bd50b152412dc6c5f2959228110256bfd6b9e81d

Make `Redis::Wrapper#_raw_config` and `#fetch_config` more resilient

Closes #34941

See merge request !12797




Make `Redis::Wrapper#_raw_config` and `#fetch_config` more resilient

Closes #34941

See merge request !12797






Add namespace for Blob
2017-07-11T21:06:38+00:00

Clement Ho
ClemMakesApps@gmail.com

2017-07-11T21:06:38+00:00

8119c444b319bcf4a8305437a648ec630969d251