Commits · 8616d14b3b84aae58b0fd319744d47e816bf489f · nexedi / gitlab-ce

12 Jul, 2018 40 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 '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 '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 '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
- 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
- Rails 5 fix the matcher expected the ApplicationSetting to be invalid, but it was valid instead · 4d3ce59d
  Jasper Maes authored Jul 12, 2018
  
  4d3ce59d
- Moves the Vue import to the top of the document · b9ab7cbb
  samdbeckham authored Jul 12, 2018
  
  b9ab7cbb
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-12 · 8dca810c
  GitLab Bot authored Jul 12, 2018
  
  8dca810c
- 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
- Merge branch 'fix-performance-problem-of-tags-query' into 'master' · 5a55dd99
  Yorick Peterse authored Jul 12, 2018
```
Fix performance problem of tags query

Closes gitlab-com/infrastructure#4550

See merge request gitlab-org/gitlab-ce!20555
```
  5a55dd99
- Merge branch 'docs-port-ee-contributing-to-ce' into 'master' · d5e53119
  Jacob Schatz authored Jul 12, 2018
```
Update CONTRIBUTING.md to port Contribution Flow section from EE doc

See merge request gitlab-org/gitlab-ce!20546
```
  d5e53119
- Resolve conflicts in gitlab.pot · 697bcf1c
  Jarka Kadlecová authored Jul 12, 2018
  
  697bcf1c
- Moves the rest of the security reports mutations to use `Vue.use()` · 8593a7de
  samdbeckham authored Jul 12, 2018
  
  8593a7de
- Resolve conflicts after CE merge · 9cba3612
  Dmitriy Zaporozhets authored Jul 12, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9cba3612
- Merge branch '48789-remove-event-listeners-scroll' into 'master' · 78df5fe2
  Phil Hughes authored Jul 12, 2018
```
Resolve "Improve performance of MR Changes tab: reduce event listeners on scroll event"

Closes #48639 and #48789

See merge request gitlab-org/gitlab-ce!20558
```
  78df5fe2
- Resolve "Improve performance of MR Changes tab: reduce event listeners on scroll event" · 289530a0
  Filipa Lacerda authored Jul 12, 2018
  
  289530a0
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-12 · 1cb9fe25
  GitLab Bot authored Jul 12, 2018
```
# Conflicts:
#	app/views/projects/new.html.haml
#	doc/user/project/import/index.md
#	locale/gitlab.pot

[ci skip]
```
  1cb9fe25
- Merge branch 'winh-remove-service-architecture-docs' into 'master' · eddf34f4
  Filipa Lacerda authored Jul 12, 2018
```
Remove old service architecture from Vue docs

See merge request gitlab-org/gitlab-ce!20579
```
  eddf34f4
- Remove old service architecture from Vue docs · 5cb48d36
  Winnie Hellmann authored Jul 12, 2018
  
  5cb48d36
- Merge branch 'qa-264' into 'master' · 0399b644
  Rémy Coutable authored Jul 12, 2018
```
Adding spec to test basic forking functionalities

See merge request gitlab-org/gitlab-ce!20097
```
  0399b644
- Adding spec to test basic forking functionalities · 29955c9c
  Mykhailo Formus authored Jul 12, 2018
  
  29955c9c
- Merge branch '48690-follow-up-from-milestone-tests' into 'master' · fc4c7956
  Rémy Coutable authored Jul 12, 2018
```
Resolve "Follow-up from "Milestone tests""

Closes #48690

See merge request gitlab-org/gitlab-ce!20563
```
  fc4c7956
- Merge branch 'ee-dz-manifest-import' into 'master' · 6bdf064d
  Douwe Maan authored Jul 12, 2018
```
Add manifest import feature (EE port)

See merge request gitlab-org/gitlab-ee!6430
```
  6bdf064d
- Merge branch 'dz-manifest-import' into 'master' · 2f83794d
  Douwe Maan authored Jul 12, 2018
```
Add manifest import

See merge request gitlab-org/gitlab-ce!20304
```
  2f83794d
- Fix performance problem of accessing tag list for projects api endpoints · 1399eb05
  Kamil Trzciński authored Jul 11, 2018
  
  1399eb05
- Merge branch 'ce-to-ee-2018-07-12' into 'master' · 3a9367a4
  Filipa Lacerda authored Jul 12, 2018
```
CE upstream - 2018-07-12 09:24 UTC

See merge request gitlab-org/gitlab-ee!6476
```
  3a9367a4
- Merge branch 'docs-add-api-params-array-hash' into 'master' · 94627fd7
  Douwe Maan authored Jul 12, 2018
```
Add examples for array and hash type API params

See merge request gitlab-org/gitlab-ce!20574
```
  94627fd7
- Merge branch 'sh-optimize-wiki-empty-check' into 'master' · 6f8cf37e
  Douwe Maan authored Jul 12, 2018
```
Optimize ProjectWiki#empty? check

See merge request gitlab-org/gitlab-ce!20573
```
  6f8cf37e