Commits · 6b983071c18a70ae31b8b9321c532ec11d7793b8 · nexedi / gitlab-ce

17 Jul, 2017 18 commits
- Fix conflict in doc/administration/auth/ldap.md · 6b983071
  Dmitriy Zaporozhets authored Jul 17, 2017
  
  6b983071
- fix missing conflict in doc/..../merge_requests/index.md · 0606dae5
  Marcia Ramos authored Jul 17, 2017
  
  0606dae5
- Merge branch 'ce-to-ee' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee · 57c71991
  Marcia Ramos authored Jul 17, 2017
  
  57c71991
- fix conflict (doc/workflow/groups.md) · d918e2a9
  Marcia Ramos authored Jul 17, 2017
  
  d918e2a9
- fix conflict (doc/user/project/merge_request/index) · 88632c97
  Marcia Ramos authored Jul 17, 2017
  
  88632c97
- fix conflict (doc/user/project/issues/issues_functionalitites) · f77ca2b4
  Marcia Ramos authored Jul 17, 2017
  
  f77ca2b4
- Fix test coverage conflict in the README.md · e9847391
  Dmitriy Zaporozhets authored Jul 17, 2017
  
  e9847391
- fix conflict (doc/user/project/issues/index) · 27c51134
  Marcia Ramos authored Jul 17, 2017
  
  27c51134
- fix conflict (doc/user/group/index) · c7226edf
  Marcia Ramos authored Jul 17, 2017
  
  c7226edf
- resolve conflict (doc/ee/readme) · 59d51f3f
  Marcia Ramos authored Jul 17, 2017
  
  59d51f3f
- Resolve conflicts in project update service · 7ecaae69
  Grzegorz Bizon authored Jul 17, 2017
  
  7ecaae69
- Resolve autocomplete controller conflict · be9efb63
  Tiago Botelho authored Jul 17, 2017
  
  be9efb63
- Merge remote-tracking branch 'ce-com/master' into ce-to-ee · 637f0537
  Dmitriy Zaporozhets authored Jul 17, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  637f0537
- Merge branch 'ce-to-ee-2017-07-14' into 'master' · 300898f0
  Dmitriy Zaporozhets authored Jul 17, 2017
```
CE Upstream - Friday (2017-07-14)

See merge request !2435
```
  300898f0
- Merge branch '35064-fix-px-difference' into 'master' · 5f32bd77
  Phil Hughes authored Jul 17, 2017
```
Reduce padding on context header

Closes #35064

See merge request !12855
```
  5f32bd77
- Merge branch 'context-nav-avatar-bg' into 'master' · bcd82849
  Phil Hughes authored Jul 17, 2017
```
Add white background to context header avatar

See merge request !12857
```
  bcd82849
- Merge branch '35174-fix-aws-elb-query' into 'master' · 43a46ef1
  Tim Zallmann authored Jul 17, 2017
```
Fix incorrect AWS ELB metrics.

Closes #35174

See merge request !12902
```
  43a46ef1
- Fix incorrect AWS ELB metrics. · 6e88631c
  Joshua Lambert authored Jul 17, 2017
  
  6e88631c
16 Jul, 2017 22 commits
- Merge branch 'google-launcher' into 'master' · 00861676
  Robert Speicher authored Jul 16, 2017
```
Update Google launcher details

[ci skip]

See merge request !12899
```
  00861676
- Merge branch '2943-fix-grammar' into 'master' · ca559ae6
  Achilleas Pipinellis authored Jul 16, 2017
```
Doc: fix grammar

Closes #2943

See merge request !2451
```
  ca559ae6
- Doc: fix grammar · 617393ee
  Marcia Ramos authored Jul 16, 2017
  
  617393ee
- Merge branch 'docs/multi-project-mini-graph' into 'master' · 281cc63a
  Marcia Ramos authored Jul 16, 2017
```
Add docs on multi-project pipelines mini graph

Closes #2938

See merge request !2450
```
  281cc63a
- Add docs on multi-project pipelines mini graph · b6b8ab07
  Achilleas Pipinellis authored Jul 16, 2017
  
  b6b8ab07
- Merge branch 'docs/slack-app' into 'master' · 53892327
  Marcia Ramos authored Jul 16, 2017
```
Refactor GitLab Slack app docs

Closes #2862

See merge request !2447
```
  53892327
- Merge branch 'docs/update-health-check-ee' into 'master' · 21f6b28a
  Marcia Ramos authored Jul 16, 2017
```
Update health check docs

See merge request !2446
```
  21f6b28a
- Merge branch 'docs/canary-fixes' into 'master' · 478cc615
  Marcia Ramos authored Jul 16, 2017
```
Add small fixes in Canary deployments docs

See merge request !2449
```
  478cc615
- Merge branch 'docs/fix-link-styleguide' into 'master' · c7b26623
  Marcia Ramos authored Jul 16, 2017
```
Fix wrong link to docs in docs styleguide

See merge request !12901
```
  c7b26623
- Merge branch 'docs/update-health-check' into 'master' · 899c290f
  Marcia Ramos authored Jul 16, 2017
```
Update health check docs

See merge request !12794
```
  899c290f
- Add small fixes in Canary deployments docs · 61dbe360
  Achilleas Pipinellis authored Jul 16, 2017
  
  61dbe360
- Fix wrong link to docs in docs styleguide · 63b66f1d
  Achilleas Pipinellis authored Jul 16, 2017
  
  63b66f1d
- Merge branch 'docs/overview-features-3' into 'master' · aab51dbf
  Achilleas Pipinellis authored Jul 16, 2017
```
Update issue-related docs

See merge request !12881
```
  aab51dbf
- Update issue-related docs · e63d7fb6
  Marcia Ramos authored Jul 16, 2017
  
  e63d7fb6
- Merge branch 'docs/add-features-groups' into 'master' · 34800fe8
  Achilleas Pipinellis authored Jul 16, 2017
```
Refactor groups docs

See merge request !12888
```
  34800fe8
- Refactor groups docs · af39e4be
  Marcia Ramos authored Jul 16, 2017
  
  af39e4be
- Merge branch 'docs/add-features-groups-ee' into 'master' · ef295f01
  Achilleas Pipinellis authored Jul 16, 2017
```
Update links to groups doc

See merge request !2442
```
  ef295f01
- Update links to groups doc · be9f0268
  Marcia Ramos authored Jul 16, 2017
  
  be9f0268
- Merge branch 'docs/link-related-issues-from-index' into 'master' · 9bcb2b37
  Achilleas Pipinellis authored Jul 16, 2017
```
Llink new doc (Related Issues) from indexes pages

See merge request !2443
```
  9bcb2b37
- Merge branch 'docs/add-subgroups-limitations-to-pages-ee' into 'master' · 66bc4435
  Achilleas Pipinellis authored Jul 16, 2017
```
Add subgroups limitations to Pages docs

Closes gitlab-ce#34621

See merge request !2444
```
  66bc4435
- Merge branch 'docs/add-subgroups-limitations-to-pages' into 'master' · 1cfa37d6
  Achilleas Pipinellis authored Jul 16, 2017
```
Add subgroups limitations to Pages docs

Closes #34621

See merge request !12891
```
  1cfa37d6
- Add subgroups limitations to Pages docs · 7d5e8276
  Marcia Ramos authored Jul 16, 2017
  
  7d5e8276