Commits · f67862a348b1f26f624a69f246ab6574a3e094c7 · nexedi / gitlab-ce

13 Jul, 2018 3 commits
- Resolve conflict in spec/javascripts/test_bundle.js · f67862a3
  Winnie Hellmann authored Jul 13, 2018
  
  f67862a3
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-13 · 93872b9d
  GitLab Bot authored Jul 13, 2018
```
# Conflicts:
#	spec/javascripts/test_bundle.js

[ci skip]
```
  93872b9d
- Merge branch 'ce-to-ee-2018-07-12' into 'master' · 9ee37efe
  Stan Hu authored Jul 13, 2018
```
CE upstream - 2018-07-12 18:22 UTC

See merge request gitlab-org/gitlab-ee!6491
```
  9ee37efe
12 Jul, 2018 37 commits
- Merge branch 'more-mr-widget-fixes' into 'master' · 8616d14b
  Jose Ivan Vargas authored Jul 12, 2018
```
More mr widget fixes

Closes #6857

See merge request gitlab-org/gitlab-ee!6486
```
  8616d14b
- Merge branch 'winh-upgrade-grape-path-helpers' into 'master' · 924146a8
  Stan Hu authored Jul 12, 2018
```
Upgrade grape-path-helpers to 1.0.6

See merge request gitlab-org/gitlab-ce!20601
```
  924146a8
- Upgrade grape-path-helpers to 1.0.6 · a412826b
  Winnie Hellmann authored Jul 12, 2018
  
  a412826b
- Merge branch 'polish-severity-facets' into 'master' · 226d4d0e
  Mek Stittri authored Jul 12, 2018
```
Polish severity level facets further

See merge request gitlab-org/gitlab-ce!20572
```
  226d4d0e
- Merge branch '48912-vue-files-without-tests-missing-in-coverage-report-ee' into 'master' · 374f991d
  Annabel Gray authored Jul 12, 2018
```
Include Vue files without tests in coverage report (EE-port)

Closes gitlab-ce#48912

See merge request gitlab-org/gitlab-ee!6478
```
  374f991d
- Include Vue files without tests in coverage report (EE-port) · 48cd01a8
  Winnie Hellmann authored Jul 12, 2018
  
  48cd01a8
- Merge branch '48912-vue-files-without-tests-missing-in-coverage-report' into 'master' · b8450b8b
  Annabel Gray authored Jul 12, 2018
```
Include Vue files without tests in coverage report

Closes #48912

See merge request gitlab-org/gitlab-ce!20431
```
  b8450b8b
- Resolve conflicts in gitlab.pot · 873a935b
  Jarka Kadlecová authored Jul 12, 2018
  
  873a935b
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-12 · 4efcfe80
  GitLab Bot authored Jul 12, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  4efcfe80
- Merge branch 'rails5-fix-6748' into 'master' · 804fc74e
  Rémy Coutable authored Jul 12, 2018
```
Rails 5 fix the matcher expected the ApplicationSetting to be invalid, but it was valid instead

Closes #6748

See merge request gitlab-org/gitlab-ee!6488
```
  804fc74e
- Merge branch 'an/no-healthcheck-until-brooklyn' into 'master' · adb43719
  Robert Speicher authored Jul 12, 2018
```
Remove healthchecks from prometheus endpoint

Closes #49112

See merge request gitlab-org/gitlab-ce!20565
```
  adb43719
- Remove healthchecks from prometheus endpoint · bb65cb1f
  Andrew Newdigate authored Jul 12, 2018
  
  bb65cb1f
- Merge branch '6017-security-report-footer-regression' into 'master' · 4e850f7f
  Filipa Lacerda authored Jul 12, 2018
```
Resolve "Fixed vulnerabilities should not be actionable in the report"

Closes #6017

See merge request gitlab-org/gitlab-ee!6450
```
  4e850f7f
- Merge branch 'backport-widget-changes' into 'master' · 07866b04
  Filipa Lacerda authored Jul 12, 2018
```
Backport mr widget changes from EE

See merge request gitlab-org/gitlab-ce!20598
```
  07866b04
- Remove padding on reports · f30b5af6
  Annabel Dunstone Gray authored Jul 12, 2018
  
  f30b5af6
- Merge branch 'ce-to-ee-2018-07-12' into 'master' · accb2c02
  Robert Speicher authored Jul 12, 2018
```
CE upstream - 2018-07-12 15:22 UTC

Closes gitlab-com/infrastructure#4550

See merge request gitlab-org/gitlab-ee!6487
```
  accb2c02
- Merge branch 'i18n-extract-app/views/admin-groups' into 'master' · df55e39b
  Rémy Coutable authored Jul 12, 2018
```
i18n: externalize strings from 'app/views/admin/groups'

See merge request gitlab-org/gitlab-ce!19924
```
  df55e39b
- Rails 5 fix the matcher expected the ApplicationSetting to be invalid, but it was valid instead · 4d3ce59d
  Jasper Maes authored Jul 12, 2018
  
  4d3ce59d
- Merge branch '48241-fix-invalid-byte-sequence-in-qa' into 'master' · d5a1d86f
  Grzegorz Bizon authored Jul 12, 2018
```
Resolve "QA: False failure on QA test "Push to protected branch when allowed" during staging failover rehearsal"

Closes #48241

See merge request gitlab-org/gitlab-ce!20561
```
  d5a1d86f
- Moves the Vue import to the top of the document · b9ab7cbb
  samdbeckham authored Jul 12, 2018
  
  b9ab7cbb
- Ensure Encoding.default_external is set to UTF-8 when running QA scenarios · 5507ad8f
  Rémy Coutable authored Jul 11, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5507ad8f
- Merge branch 'issue_47709' into 'master' · 4e744e18
  Sean McGivern authored Jul 12, 2018
```
Allow to toggle notifications for issues due soon

Closes #47709

See merge request gitlab-org/gitlab-ce!20530
```
  4e744e18
- i18n: externalize strings from 'app/views/admin/groups' · 03437b49
  Tao Wang authored Jun 16, 2018
```
Signed-off-by: Tao Wang <twang2218@gmail.com>
```
  03437b49
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-12 · 8dca810c
  GitLab Bot authored Jul 12, 2018
  
  8dca810c
- Backport mr widget changes from EE · f4b73d67
  Annabel Dunstone Gray authored Jul 12, 2018
  
  f4b73d67
- Allow to toggle notifications for issues due soon · ef129737
  Felipe Artur authored Jul 10, 2018
  
  ef129737
- Right align expand button · b841ce07
  Annabel Dunstone Gray authored Jul 12, 2018
  
  b841ce07
- Remove button margin; align status icons to top of widget sections · 6fe93a3a
  Annabel Dunstone Gray authored Jul 12, 2018
  
  6fe93a3a
- Merge branch 'vuex-test-helper-improvements' into 'master' · 5c7e2987
  Phil Hughes authored Jul 12, 2018
```
Vuex test helper improvements

Closes #44912, #44919, and #44920

See merge request gitlab-org/gitlab-ce!20513
```
  5c7e2987
- Vuex test helper improvements · be56f2fa
  Lukas Eipert authored Jul 12, 2018
  
  be56f2fa
- Merge branch 'vuex-test-helper-improvements' into 'master' · 6c31f38c
  Phil Hughes authored Jul 12, 2018
```
EE-Port of gitlab-ce!20513

Closes gitlab-ce#44912

See merge request gitlab-org/gitlab-ee!6482
```
  6c31f38c
- EE-Port of gitlab-ce!20513 · 8df3da73
  Lukas Eipert authored Jul 12, 2018
  
  8df3da73
- Merge branch 'ce-to-ee-2018-07-12' into 'master' · 8529f1f5
  Dmitriy Zaporozhets authored Jul 12, 2018
```
CE upstream - 2018-07-12 12:22 UTC

See merge request gitlab-org/gitlab-ee!6481
```
  8529f1f5
- Merge branch 'qa-fix-timestamp' into 'master' · 23a0b0a9
  Grzegorz Bizon authored Jul 12, 2018
```
[QA] Fix duplicate year in namespace name

See merge request gitlab-org/gitlab-ce!20581
```
  23a0b0a9
- Merge branch '49139-sleep-before-installing-tiller-to-prevent-race-condition' into 'master' · e0a7858a
  Grzegorz Bizon authored Jul 12, 2018
```
Resolve "Installing helm tiller sometimes fails with no api token found"

Closes #49139

See merge request gitlab-org/gitlab-ce!20580
```
  e0a7858a
- Swaps double quotes for single quotes · 7ab42caa
  samdbeckham authored Jul 12, 2018
  
  7ab42caa
- Merge branch 'sh-geo-log-skipped-events' into 'master' · 12c6bfc0
  Douglas Barbosa Alexandre authored Jul 12, 2018
```
Geo: Log to geo.log when the Log Cursor skips an event

See merge request gitlab-org/gitlab-ee!6470
```
  12c6bfc0