Commits · 21023fe48f217ed23ffa62d10ecf0025ee30ebb9 · nexedi / gitlab-ce

17 May, 2019 14 commits
- Merge branch 'docs-correct-security-anchor' into 'master' · 21023fe4
  Achilleas Pipinellis authored May 17, 2019
```
Docs: update link to new security docs

See merge request gitlab-org/gitlab-ee!12612
```
  21023fe4
- Update links to new security docs · 2b357bb5
  Mark Chao authored May 17, 2019
```
Related to https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5566
```
  2b357bb5
- Automatic merge of gitlab-org/gitlab-ce master · 9a5f0b62
  GitLab Bot authored May 17, 2019
  
  9a5f0b62
- Merge branch 'docs-followup-28043' into 'master' · e9ed0284
  Achilleas Pipinellis authored May 17, 2019
```
Docs: Add badges and fix redirect style in 3 docs

Closes #61440

See merge request gitlab-org/gitlab-ce!28350
```
  e9ed0284
- Docs: Add badges and fix redirect style in 3 docs · 0dcc3cc6
  Marcel Amirault authored May 17, 2019
  
  0dcc3cc6
- Merge branch 'docs-followup-27956' into 'master' · cde5cd26
  Achilleas Pipinellis authored May 17, 2019
```
Docs: Update links and add badge to examples readme

Closes #61439

See merge request gitlab-org/gitlab-ce!28349
```
  cde5cd26
- Docs: Update links and add badge to examples readme · 44199532
  Marcel Amirault authored May 17, 2019
  
  44199532
- Merge branch 'docs-followup-27943' into 'master' · c4c7162e
  Achilleas Pipinellis authored May 17, 2019
```
Docs: Delete orphaned images in `merge_requests/img`

Closes #61438

See merge request gitlab-org/gitlab-ce!28346
```
  c4c7162e
- Docs: Delete orphaned images in `merge_requests/img` · 6adfe606
  Marcel Amirault authored May 17, 2019
  
  6adfe606
- Merge branch 'docs/single-docs-resync' into 'master' · 513b0391
  Evan Read authored May 17, 2019
```
Resync the docs that were submitted to EE instead of CE

See merge request gitlab-org/gitlab-ce!28389
```
  513b0391
- Merge branch '61914-fix-emojis-urls' into 'master' · fb95e6d1
  Achilleas Pipinellis authored May 17, 2019
```
Fix emojis URLs

Closes #61914

See merge request gitlab-org/gitlab-ce!28371
```
  fb95e6d1
- Fix emojis URLs · 1b3c4193
  Paul Gascou-Vaillancourt authored May 17, 2019
  
  1b3c4193
- Automatic merge of gitlab-org/gitlab-ce master · 142fb4ac
  GitLab Bot authored May 17, 2019
  
  142fb4ac
- Merge branch 'jl-add-component-subheadings-docs' into 'master' · 4eabd76f
  Achilleas Pipinellis authored May 17, 2019
```
Add subheadings to components page

See merge request gitlab-org/gitlab-ce!28382
```
  4eabd76f
16 May, 2019 26 commits
- Automatic merge of gitlab-org/gitlab-ce master · ca266213
  GitLab Bot authored May 16, 2019
  
  ca266213
- Merge branch 'docs/force-auth-mr-12-0' into 'master' · de2a8808
  Evan Read authored May 16, 2019
```
Fix docs intro version for force auth for approvers

See merge request gitlab-org/gitlab-ce!28390
```
  de2a8808
- Merge branch 'docs/force-auth-mr-12-0-ee' into 'master' · c09ae718
  Evan Read authored May 16, 2019
```
Fix docs intro version for force auth for approvers

See merge request gitlab-org/gitlab-ee!12823
```
  c09ae718
- Fix docs intro version for force auth for approvers · eea23a3c
  Achilleas Pipinellis authored May 16, 2019
```
This feature was introduced in 12.0, not in 11.11.
```
  eea23a3c
- Fix docs intro version for force auth for approvers · afe009f5
  Achilleas Pipinellis authored May 16, 2019
```
This feature was introduced in 12.0, not in 11.11.
```
  afe009f5
- Resync the docs that were submitted to EE instead of CE · ed02e2f5
  Achilleas Pipinellis authored May 16, 2019
  
  ed02e2f5
- Automatic merge of gitlab-org/gitlab-ce master · 28bdf020
  GitLab Bot authored May 16, 2019
  
  28bdf020
- Merge branch 'fe-use-process-timer-in-jest-timeout' into 'master' · 04794fb4
  Fatih Acet authored May 16, 2019
```
Use process timer for jest timeout testing

See merge request gitlab-org/gitlab-ce!28209
```
  04794fb4
- Add subheadings to components in architecture page · bad057e8
  Joshua Lambert authored May 16, 2019
  
  bad057e8
- Automatic merge of gitlab-org/gitlab-ce master · f2644063
  GitLab Bot authored May 16, 2019
  
  f2644063
- Merge branch 'sh-bump-gitlab-shell-9.2.0' into 'master' · 913bc964
  Douglas Barbosa Alexandre authored May 16, 2019
```
Upgrade gitlab-shell to 9.2.0

See merge request gitlab-org/gitlab-ce!28372
```
  913bc964
- Automatic merge of gitlab-org/gitlab-ce master · 79bd00a7
  GitLab Bot authored May 16, 2019
  
  79bd00a7
- Merge branch 'haml-lint-fe' into 'master' · 35e9d58e
  Douglas Barbosa Alexandre authored May 16, 2019
```
Add haml-lint.yml to FE for roulette

See merge request gitlab-org/gitlab-ce!28301
```
  35e9d58e
- Merge branch 'parallelize-geo-specs' into 'master' · df4f36f9
  Stan Hu authored May 16, 2019
```
Parallelize the RSpec Geo jobs

See merge request gitlab-org/gitlab-ee!12688
```
  df4f36f9
- Upgrade gitlab-shell to 9.2.0 · 3b1e7118
  Stan Hu authored May 16, 2019
```
Main change is to bump .ruby-version to 2.6.3 so versions
are consistent for the GDK.
```
  3b1e7118
- Automatic merge of gitlab-org/gitlab-ce master · 7d05cf35
  GitLab Bot authored May 16, 2019
  
  7d05cf35
- Merge branch 'admin-user-access-levels-scb' into 'master' · 1602ce28
  Phil Hughes authored May 16, 2019
```
Resolve CE/EE diffs in admin user access levels

Closes gitlab-ee#10507

See merge request gitlab-org/gitlab-ce!28359
```
  1602ce28
- Merge branch 'admin-user-access-levels-scb' into 'master' · d29f0f96
  Phil Hughes authored May 16, 2019
```
Resolve CE/EE diffs in admin user access levels

Closes #10507

See merge request gitlab-org/gitlab-ee!12781
```
  d29f0f96
- Merge branch 'mirror-repos-scb' into 'master' · b5a9295f
  Phil Hughes authored May 16, 2019
```
Resolve CE/EE diffs in mirror repos settings

Closes gitlab-ee#11036

See merge request gitlab-org/gitlab-ce!28361
```
  b5a9295f
- Merge branch 'docs-render_if_exists-opts-caveat' into 'master' · a37a62cf
  Phil Hughes authored May 16, 2019
```
Explain render_if_exists opts caveat

See merge request gitlab-org/gitlab-ce!28366
```
  a37a62cf
- Merge branch 'winh-dashboard_spec-performance' into 'master' · 04e7ebde
  Clement Ho authored May 16, 2019
```
Destroy component instances in environments dashboard tests

Closes #11443

See merge request gitlab-org/gitlab-ee!12644
```
  04e7ebde
- Automatic merge of gitlab-org/gitlab-ce master · 7a08f96f
  GitLab Bot authored May 16, 2019
  
  7a08f96f
- Merge branch '11627-broken-master-due-to-locale-gitlab-pot' into 'master' · 3e729e73
  Bob Van Landuyt authored May 16, 2019
```
Resolve "Broken master due to `locale/gitlab.pot`"

Closes #11627

See merge request gitlab-org/gitlab-ee!12802
```
  3e729e73
- Merge branch 'docs-what-to-do-if-review-jobs-keep-failing' into 'master' · 8cd466ac
  Sean McGivern authored May 16, 2019
```
Document what to do if review jobs keep failing

See merge request gitlab-org/gitlab-ce!28367
```
  8cd466ac
- Fix a string in locale/gitlab.pot · c92e5df0
  Rémy Coutable authored May 16, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c92e5df0
- Automatic merge of gitlab-org/gitlab-ce master · 7e402354
  GitLab Bot authored May 16, 2019
  
  7e402354