Commits · 0dcc3cc683b9687fa0b978a8ab174e9856eac2a0 · nexedi / gitlab-ce

17 May, 2019 9 commits
- 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
- 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 31 commits
- 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
- 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
- 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
- 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
- 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
- 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
- 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 '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 '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
- Merge branch 'ce-2087-make-num-shards-configurable' into 'master' · cb45b719
  Sean McGivern authored May 16, 2019
```
CE backport of "Configure the number of ES shards and replicas"

See merge request gitlab-org/gitlab-ce!28329
```
  cb45b719
- Document what to do if review jobs keep failing · 38891633
  Rémy Coutable authored May 16, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  38891633
- Merge branch 'jc-omit-count-diverging-commits-max' into 'master' · 112193e8
  Lin Jen-Shin authored May 16, 2019
```
Omit max-count for diverging_commit_counts behind feature flag

See merge request gitlab-org/gitlab-ce!28157
```
  112193e8
- Merge branch 'diff-filter-bar-placeholder-text' into 'master' · 0795742f
  Filipa Lacerda authored May 16, 2019
```
Changed the placeholder text of the diff tree filter input

Closes #58339

See merge request gitlab-org/gitlab-ce!28352
```
  0795742f
- Explain render_if_exists opts caveat · bc545cfd
  Luke Bennett authored May 16, 2019
  
  bc545cfd
- Merge branch 'disallow-review-deploy-to-fail' into 'master' · bc852e05
  Sean McGivern authored May 16, 2019
```
Disallow the review-deploy and review-qa-smoke jobs to fail

See merge request gitlab-org/gitlab-ce!28314
```
  bc852e05
- CE backport of "Configure the number of ES shards and replicas" · 841ea50b
  Nick Thomas authored May 15, 2019
  
  841ea50b
- Merge branch 'reg-captcha-flag' into 'master' · 2bde9de6
  Nick Thomas authored May 16, 2019
```
Add :registrations_recaptcha feature flag

Closes gitlab-ee#11389

See merge request gitlab-org/gitlab-ce!28296
```
  2bde9de6
- Merge branch 'fix_failure_migrate_on_mysql8' into 'master' · 542b2a7e
  Stan Hu authored May 16, 2019
```
Fix. db:migrate is failed on MySQL 8

See merge request gitlab-org/gitlab-ce!28351
```
  542b2a7e
- Merge branch '49915-fix-error-500-admin-projects-nil-storage' into 'master' · 167b7641
  Stan Hu authored May 16, 2019
```
Resolve "Error 500 viewing admin/projects page: undefined method `storage_size' for nil:NilClass"

Closes #49915

See merge request gitlab-org/gitlab-ce!28355
```
  167b7641
- Merge branch 'docs-render_if_exists-relative-path' into 'master' · 8214d031
  Phil Hughes authored May 16, 2019
```
Explain `render_if_exists` relative path

See merge request gitlab-org/gitlab-ce!28356
```
  8214d031
- Merge branch 'flash-messages-scb' into 'master' · 166ac53c
  Phil Hughes authored May 16, 2019
```
Resolve CE/EE diffs in _flash_messages

Closes gitlab-ee#11037

See merge request gitlab-org/gitlab-ce!28333
```
  166ac53c
- Resolve CE/EE diffs in mirror repos settings · 5735736e
  Luke Bennett authored May 16, 2019
```
Part of single codebase changes.
```
  5735736e
- Fix an error in projects admin when statistics are missing · ec076414
  Rémy Coutable authored May 16, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ec076414
- Resolve CE/EE diffs in admin user access levels · b0f2d869
  Luke Bennett authored May 16, 2019
```
Part of single codebase changes.
```
  b0f2d869
- Merge branch 'sh-update-rubocop-and-gitlab-styles-ce' into 'master' · fcc810a1
  Rémy Coutable authored May 16, 2019
```
Update Rubocop to 0.69.0 and other gems

See merge request gitlab-org/gitlab-ce!28345
```
  fcc810a1
- Explain `render_if_exists` relative path · 62152953
  Luke Bennett authored May 16, 2019
  
  62152953
- Merge branch '59838-blocks' into 'master' · 71244a79
  Phil Hughes authored May 16, 2019
```
Fixes style-lint issues for blocks.scss

Closes #59838

See merge request gitlab-org/gitlab-ce!28251
```
  71244a79
- Changed the placeholder text of the diff tree filter input · 10074ece
  Phil Hughes authored May 16, 2019
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58339
```
  10074ece