Commits · 9de430de783a15728ce951e24fd04e0603b09629 · nexedi / gitlab-ce

03 Apr, 2019 40 commits
- 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
- Merge branch 'docs-jest-debug' into 'master' · 53bf489a
  Fatih Acet authored Apr 03, 2019
```
Add docs for debugging Jest tests

See merge request gitlab-org/gitlab-ce!26810
```
  53bf489a
- Add docs for debugging Jest tests · f54e4eb1
  Simon Knox authored Apr 03, 2019
  
  f54e4eb1
- Automatic merge of gitlab-org/gitlab-ce master · 7a3c88f1
  GitLab Bot authored Apr 03, 2019
  
  7a3c88f1
- Merge branch '59942-fix-mr-swipe-diff-user-select' into 'master' · bc696947
  Phil Hughes authored Apr 03, 2019
```
MR image diff swipe view: Disable user-select on drag

Closes #59942

See merge request gitlab-org/gitlab-ce!26884
```
  bc696947
- MR image diff swipe view: Disable user-select on drag · 7c61fb03
  ftab authored Apr 03, 2019
```
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/59942
```
  7c61fb03
- Merge branch 'remaining-lib-differences' into 'master' · e036cb04
  Robert Speicher authored Apr 03, 2019
```
Resolve remaining CE to EE differences in lib/

See merge request gitlab-org/gitlab-ce!26608
```
  e036cb04
- Merge branch 'ee-remaining-lib-differences' into 'master' · a82cec1f
  Robert Speicher authored Apr 03, 2019
```
EE: resolve remaining CE to EE differences in lib/

See merge request gitlab-org/gitlab-ee!10430
```
  a82cec1f
- Automatic merge of gitlab-org/gitlab-ce master · 55d83734
  GitLab Bot authored Apr 03, 2019
  
  55d83734
- Merge branch 'feature/webide_escaping' into 'master' · 12522d22
  Nick Thomas authored Apr 03, 2019
```
Improve file handling of special characters in WebIDE

Closes #54376

See merge request gitlab-org/gitlab-ce!25727
```
  12522d22
- Merge branch 'feature/webide_escaping' of gitlab.com:hiddentiger/gitlab-ce... · ebbcc17f
  Kieran Andrews authored Apr 03, 2019
```
Merge branch 'feature/webide_escaping' of gitlab.com:hiddentiger/gitlab-ce into feature/webide_escaping
```
  ebbcc17f
- Merge branch 'docs-tr-add-requested-resource-metrics' into 'master' · 2d75b525
  Achilleas Pipinellis authored Apr 03, 2019
```
Add requested resources to cluster health - docs

See merge request gitlab-org/gitlab-ee!10373
```
  2d75b525