Commits · 734e9072c35c4decda0e9e4517707cb6ad3bfeec · nexedi / gitlab-ce

03 Apr, 2019 40 commits
- Automatic merge of gitlab-org/gitlab-ce master · 734e9072
  GitLab Bot authored Apr 03, 2019
  
  734e9072
- Merge branch 'ee-feature-doc-fixes' into 'master' · 6e156a63
  Evan Read authored Apr 03, 2019
```
Minor EE feature doc fixes

See merge request gitlab-org/gitlab-ce!26900
```
  6e156a63
- Use correct `ifEE` variable name · af3f98f0
  Mark Florian authored Apr 03, 2019
```
Presumably the `renderIfEE` is from an older edit.
```
  af3f98f0
- Merge branch 'docs/secure-reorg-intro' into 'master' · 42ab519f
  Achilleas Pipinellis authored Apr 03, 2019
```
Add initial doc on new security page

Closes #10865

See merge request gitlab-org/gitlab-ee!10548
```
  42ab519f
- Add initial doc on new security page · aa17d4d7
  Achilleas Pipinellis authored Apr 03, 2019
  
  aa17d4d7
- Automatic merge of gitlab-org/gitlab-ce master · 514c0050
  GitLab Bot authored Apr 03, 2019
  
  514c0050
- Merge branch '29249-show-download-diff-even-when-merge-request-is-closed' into 'master' · 6202820c
  Mike Greiling authored Apr 03, 2019
```
Resolve "Show download diff even when merge request is closed"

Closes #29249

See merge request gitlab-org/gitlab-ce!26772
```
  6202820c
- Automatic merge of gitlab-org/gitlab-ce master · 2c432b45
  GitLab Bot authored Apr 03, 2019
  
  2c432b45
- Merge branch 'k8s_pod_logs_requirements' into 'master' · cbb587ff
  Mike Lewis authored Apr 03, 2019
```
Make Enabling Deploy Boards SSOT for Kubernetes Pod Log requirements

See merge request gitlab-org/gitlab-ee!10439
```
  cbb587ff
- Merge branch 'fix-issues-time-counter' into 'master' · 14bbc936
  Annabel Dunstone Gray authored Apr 03, 2019
```
Replace 'x seconds ago' with 'just now'

Closes #58425

See merge request gitlab-org/gitlab-ce!25992
```
  14bbc936
- Replace 'x seconds ago' with 'just now' · 448d0bc3
  Sergiu Marton authored Apr 03, 2019
  
  448d0bc3
- Automatic merge of gitlab-org/gitlab-ce master · 9de430de
  GitLab Bot authored Apr 03, 2019
  
  9de430de
- Merge branch '13784-validate-variables-for-masking' into 'master' · 3de43994
  Clement Ho authored Apr 03, 2019
```
Simple masking frontend - CE

See merge request gitlab-org/gitlab-ce!26751
```
  3de43994
- Merge branch 'bvl-regenerate-gitlab-pot' into 'master' · 9512429d
  Douglas Barbosa Alexandre authored Apr 03, 2019
```
Regenerate pot file after merge

Closes #10881

See merge request gitlab-org/gitlab-ee!10572
```
  9512429d
- Regenerate pot file after merge · e1c3cda6
  Bob Van Landuyt authored Apr 03, 2019
  
  e1c3cda6
- Merge branch 'remove-diffence-from-sast-docs' into 'master' · f02753be
  Achilleas Pipinellis authored Apr 03, 2019
```
Remove diffence from SAST docs

See merge request gitlab-org/gitlab-ee!10511
```
  f02753be
- Remove diffence from SAST docs · 8539fe92
  Fabio Busatto authored Apr 03, 2019
  
  8539fe92
- Automatic merge of gitlab-org/gitlab-ce master · 7db154fb
  GitLab Bot authored Apr 03, 2019
  
  7db154fb
- Merge branch 'localize-notification-dropdown-ee' into 'master' · 14ae3837
  Clement Ho authored Apr 03, 2019
```
Localize the notifications dropdown (port to ee)

Closes #10686

See merge request gitlab-org/gitlab-ee!10535
```
  14ae3837
- Localize the notifications dropdown string · 1ed7de86
  Jacques Erasmus authored Apr 03, 2019
```
Localized the notifications dropdown string
```
  1ed7de86
- Merge branch 'localize-notification-dropdown' into 'master' · ee72dc1b
  Clement Ho authored Apr 03, 2019
```
Localize notifications dropdown

Closes gitlab-ee#10686

See merge request gitlab-org/gitlab-ce!26844
```
  ee72dc1b
- Localize the notifications dropdown string · 6e61a6a7
  Jacques Erasmus authored Apr 03, 2019
```
Localized the notifications dropdown string
```
  6e61a6a7
- Automatic merge of gitlab-org/gitlab-ce master · b6d4e374
  GitLab Bot authored Apr 03, 2019
  
  b6d4e374
- Merge branch 'eric_theitguy-master-patch-89133' into 'master' · b39209f3
  Achilleas Pipinellis authored Apr 03, 2019
```
Removing redundant "predefined"

See merge request gitlab-org/gitlab-ce!26516
```
  b39209f3
- Removing redundant "predefined" · 9b797e9e
  Eric Hendricks authored Apr 03, 2019
  
  9b797e9e
- Automatic merge of gitlab-org/gitlab-ce master · f0fa01f6
  GitLab Bot authored Apr 03, 2019
  
  f0fa01f6
- Merge branch 'docs/fix-syntax-highlighting' into 'master' · e2e8c9ee
  Achilleas Pipinellis authored Apr 03, 2019
```
Fix code block and other minor fixes

See merge request gitlab-org/gitlab-ce!26894
```
  e2e8c9ee
- Fix code block and other minor fixes · d79e0cd4
  Evan Read authored Apr 03, 2019
  
  d79e0cd4
- Merge branch '6838-add-maven-cli-opts-to-license-mgmt-templates' into 'master' · d98ff002
  Achilleas Pipinellis authored Apr 03, 2019
```
Add docs on MAVEN_CLI_OPTS to License Management CI example page

See merge request gitlab-org/gitlab-ee!10012
```
  d98ff002
- Add docs on MAVEN_CLI_OPTS to License Management CI example page · 21005c23
  Victor Zagorodny authored Apr 03, 2019
  
  21005c23
- Automatic merge of gitlab-org/gitlab-ce master · 3d40cca1
  GitLab Bot authored Apr 03, 2019
  
  3d40cca1
- Merge branch '58644-remove-reply_to_individual_notes-feature-flag' into 'master' · db12e729
  Nick Thomas authored Apr 03, 2019
```
Remove reply_to_individual_notes feature flag

Closes #58644

See merge request gitlab-org/gitlab-ce!26889
```
  db12e729
- Update CHANGELOG.md for 11.9.5 · dd7e927b
  GitLab Release Tools Bot authored Apr 03, 2019
```
[ci skip]
```
  dd7e927b
- Update CHANGELOG.md for 11.9.5 · 91877514
  GitLab Release Tools Bot authored Apr 03, 2019
```
[ci skip]
```
  91877514
- Update CHANGELOG-EE.md for 11.9.5-ee · 0aa7f42c
  GitLab Release Tools Bot authored Apr 03, 2019
```
[ci skip]
```
  0aa7f42c
- Merge branch '8902-jira-dvcs-instance-admin' into 'master' · 36cb80da
  Sean McGivern authored Apr 03, 2019
```
Allow instance admins to setup Jira DVCS integration for all projects

Closes #8902

See merge request gitlab-org/gitlab-ee!10541
```
  36cb80da
- Automatic merge of gitlab-org/gitlab-ce master · 39d4ee8c
  GitLab Bot authored Apr 03, 2019
  
  39d4ee8c
- Merge branch '10864-fix-undefined-with-fallback' into 'master' · f4e8f6c8
  Lin Jen-Shin authored Apr 03, 2019
```
Backport: Bring back Gitlab::UntrustedRegexp.with_fallback

See merge request gitlab-org/gitlab-ce!26901
```
  f4e8f6c8
- Automatic merge of gitlab-org/gitlab-ce master · 72b734f8
  GitLab Bot authored Apr 03, 2019
  
  72b734f8
- Merge branch 'ee-10864-fix-undefined-with-fallback' into 'master' · d9ef69a9
  Lin Jen-Shin authored Apr 03, 2019
```
Bring back Gitlab::UntrustedRegexp.with_fallback

Closes #10864

See merge request gitlab-org/gitlab-ee!10563
```
  d9ef69a9