delta/gitlab/gitlab-ce.git/lib, branch docs/split-autodevops-variable-table gitlab.com: gitlab-org/gitlab-ce.git Merge branch '19186-redirect-wiki-git-route-to-wiki' into 'master' 2019-07-26T21:01:41+00:00 Stan Hu stanhu@gmail.com 2019-07-26T21:01:41+00:00 2219b140b6873b893a3cac2cae195b929a20f5aa Redirect project.wiki.git to project wiki home See merge request gitlab-org/gitlab-ce!31085 
Redirect project.wiki.git to project wiki home

See merge request gitlab-org/gitlab-ce!31085
 Fix pid discovery for Unicorn in PidProvider 2019-07-26T15:02:21+00:00 Aleksei Lipniagov alipniagov@gitlab.com 2019-07-26T15:02:21+00:00 13676e021cddba7a801386a183dba696200312bf 






Merge branch 'remove-nested-groups-checks' into 'master'
2019-07-26T14:57:12+00:00

Lin Jen-Shin
godfat@godfat.org

2019-07-26T14:57:12+00:00

bd1a5a9f422df267725bd5fbd254f3c1f16fd596

Remove code related to object hierarchy and MySQL

Closes #65056 and #65055

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




Remove code related to object hierarchy and MySQL

Closes #65056 and #65055

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






Merge branch 'mc/feature/find-all-artifacts-for-sha' into 'master'
2019-07-26T14:32:20+00:00

Robert Speicher
rspeicher@gmail.com

2019-07-26T14:32:20+00:00

900ef6fc316c7d4024545b5d08598c61fa9f3936

Find build by sha from ref

Closes #64534 and #45697

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




Find build by sha from ref

Closes #64534 and #45697

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






Merge branch 'dm-submodule-links-nil' into 'master'
2019-07-26T11:27:00+00:00

Nick Thomas
nick@gitlab.com

2019-07-26T11:27:00+00:00

55f99e930e1c147ec191a234ff4881ea7e70ea61

Fix error rendering submodules in MR diffs when there is no .gitmodules

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




Fix error rendering submodules in MR diffs when there is no .gitmodules

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






Prefer `flat_map` over `map` + `flatten`
2019-07-26T10:44:13+00:00

Peter Leitzen
pleitzen@gitlab.com

2019-07-26T10:44:13+00:00

8136fac26c8f470720ff90d152b93abf50f5084d

Convert several occurrences of `map` + `flatten` to
`flat_map` where applicable.





Convert several occurrences of `map` + `flatten` to
`flat_map` where applicable.







Fix error rendering submodules in MR diffs when there is no .gitmodules
2019-07-26T10:05:56+00:00

Douwe Maan
douwe@selenight.nl

2019-07-25T22:01:17+00:00

cfef1e8e99c275386d3680b90e95ba0cdf137f7c

Without this change, we get a NoMethodError on nil





Without this change, we get a NoMethodError on nil







Merge branch 'extract_auto_deploy_into_base_image' into 'master'
2019-07-26T08:47:10+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2019-07-26T08:47:10+00:00

f2b6c6ca0de25512fa2c44f3058cdf24397954d3

Extract Auto DevOps deploy functions in a base image

Closes #50286

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




Extract Auto DevOps deploy functions in a base image

Closes #50286

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






Ensure Warden triggers after_authentication callback
2019-07-26T07:05:50+00:00

Imre Farkas
ifarkas@gitlab.com

2019-07-26T07:05:50+00:00

929b403d21308cb7843aa474bfba599345b706b4

By not triggering the callback:
- ActiveSession lookup keys are not cleaned
- Devise also misses its hook related to session cleanup





By not triggering the callback:
- ActiveSession lookup keys are not cleaned
- Devise also misses its hook related to session cleanup







Redirect project.wiki.git to project wiki home
2019-07-25T23:49:36+00:00

Luke Duncalfe
lduncalfe@eml.cc

2019-07-24T01:53:06+00:00

634a03bf608eaf86ecf14b4f44fa30e62905ac6b

https://gitlab.com/gitlab-org/gitlab-ce/issues/19186





https://gitlab.com/gitlab-org/gitlab-ce/issues/19186