Commits · 2b9de8725a5863d34a31395cad9259faa2c18124 · nexedi / gitlab-ce

15 Nov, 2018 9 commits
- Merge branch 'ce-to-ee-2018-11-15' into 'master' · 2b9de872
  Steve Azzopardi authored Nov 15, 2018
```
CE upstream - 2018-11-15 06:21 UTC

See merge request gitlab-org/gitlab-ee!8460
```
  2b9de872
- Fixed batch comments · 73406191
  Phil Hughes authored Nov 15, 2018
  
  73406191
- Merge branch 'move-helper-prepends' into 'master' · 7602e839
  Robert Speicher authored Nov 15, 2018
```
Move EE prepend/include to the end of helpers

See merge request gitlab-org/gitlab-ee!8422
```
  7602e839
- Merge branch 'ee-fix-typo-in-admin-intergration' into 'master' · 0724350f
  Sean McGivern authored Nov 15, 2018
```
Fix a typo in Admin: intergration -> integration

See merge request gitlab-org/gitlab-ee!8444
```
  0724350f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-15 · 290f8281
  GitLab Bot authored Nov 15, 2018
  
  290f8281
- Merge branch 'doc-pc-shortcut-webide' into 'master' · 5a67581b
  Achilleas Pipinellis authored Nov 15, 2018
```
Shortcuts documentation: Add the PC equivalent of the Mac's "Cmd" key in the WebIDE section

See merge request gitlab-org/gitlab-ce!23064
```
  5a67581b
- Merge branch 'ce-to-ee-2018-11-14' into 'master' · cda018c2
  🤖 GitLab Bot 🤖 authored Nov 15, 2018
```
CE upstream - 2018-11-14 22:21 UTC

Closes gitlab-ce#54059

See merge request gitlab-org/gitlab-ee!8458
```
  cda018c2
- Merge branch 'leipert-master-patch-67614' into 'master' · 7cf78a14
  Stan Hu authored Nov 15, 2018
```
Update to new security report syntax

See merge request gitlab-org/gitlab-ce!23094
```
  7cf78a14
- Merge branch 'notes-consistent-key-object-case' into 'master' · e0078aba
  Filipa Lacerda authored Nov 15, 2018
```
Made diff & note data consistent

See merge request gitlab-org/gitlab-ce!22950
```
  e0078aba
14 Nov, 2018 31 commits
- Merge branch '53882-extra-container-diff-version' into 'master' · d645df82
  Fatih Acet authored Nov 14, 2018
```
Fix version system note

Closes #53882

See merge request gitlab-org/gitlab-ce!23030
```
  d645df82
- Update to new security report syntax · 95d5518e
  Lukas Eipert authored Nov 14, 2018
  
  95d5518e
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-14 · 5f290d24
  GitLab Bot authored Nov 14, 2018
  
  5f290d24
- Merge branch 'ce-to-ee-2018-11-14' into 'master' · 03fd0591
  🤖 GitLab Bot 🤖 authored Nov 14, 2018
```
CE upstream - 2018-11-14 21:21 UTC

Closes gitlab-ce#54045

See merge request gitlab-org/gitlab-ee!8456
```
  03fd0591
- Merge branch 'sh-exclude-rails4-builds-from-docs' into 'master' · 77b3a8b1
  Douglas Barbosa Alexandre authored Nov 14, 2018
```
Exclude qa and docs from Rails 4 builds

Closes #54059

See merge request gitlab-org/gitlab-ce!23091
```
  77b3a8b1
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-14 · baf61887
  GitLab Bot authored Nov 14, 2018
  
  baf61887
- Exclude qa and docs from Rails 4 builds · 44e8a00b
  Stan Hu authored Nov 14, 2018
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54059
```
  44e8a00b
- Merge branch 'ce-to-ee-2018-11-14' into 'master' · 51a80a31
  🤖 GitLab Bot 🤖 authored Nov 14, 2018
```
CE upstream - 2018-11-14 19:21 UTC

Closes gitlab-org/quality/staging#16

See merge request gitlab-org/gitlab-ee!8453
```
  51a80a31
- Tweak vertical line to line up with system notes and comment avatars · 5e66292d
  Annabel Dunstone Gray authored Nov 14, 2018
  
  5e66292d
- Merge branch 'dm-commit-email-select-options' into 'master' · f76b3106
  Stan Hu authored Nov 14, 2018
```
Fix bug causing not all emails to show up in commit email selectbox

Closes #54045

See merge request gitlab-org/gitlab-ce!23079
```
  f76b3106
- Add back margin on discussion system notes · 0c4170b8
  Annabel Dunstone Gray authored Nov 14, 2018
  
  0c4170b8
- Remove box on diff tab system note · d0f8e279
  Annabel Dunstone Gray authored Nov 14, 2018
  
  d0f8e279
- Fix version system note · f25e6aa2
  Annabel Dunstone Gray authored Nov 13, 2018
  
  f25e6aa2
- Merge branch '53918-snippet-commit-comments' into 'master' · e9d6651f
  Fatih Acet authored Nov 14, 2018
```
Fix styling of snippet and commit discussion comments

Closes #53918

See merge request gitlab-org/gitlab-ce!23035
```
  e9d6651f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-14 · 16286c95
  GitLab Bot authored Nov 14, 2018
  
  16286c95
- Made diff & note data consistent · 234563ba
  Phil Hughes authored Nov 09, 2018
```
This caused many pain points when working with it.
Part of the data was camel cased the other snake case.
Other parts where snake case & then getting converted in components,
this conversion has the potential for leaking memory.

This changes that & makes it consistent with what it returned from the
API, snake case.
```
  234563ba
- Fix bug causing not all emails to show up in commit email selectbox · 78c8a3e3
  Douwe Maan authored Nov 14, 2018
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54045
```
  78c8a3e3
- Merge branch 'discussion-fixes-2' into 'master' · 7de16665
  Fatih Acet authored Nov 14, 2018
```
Fix vertical line alignment in discussion & diff border-radius

Closes #53975

See merge request gitlab-org/gitlab-ce!23075
```
  7de16665
- Merge branch 'dark-theme-comments' into 'master' · 5b1b0934
  Fatih Acet authored Nov 14, 2018
```
Add white background to commit diff comments

See merge request gitlab-org/gitlab-ce!23078
```
  5b1b0934
- Merge branch 'ce-to-ee-2018-11-14' into 'master' · 8b9b1b71
  🤖 GitLab Bot 🤖 authored Nov 14, 2018
```
CE upstream - 2018-11-14 17:23 UTC

Closes gitlab-ce#53866

See merge request gitlab-org/gitlab-ee!8451
```
  8b9b1b71
- Add white background to commit diff comments · e2b40e29
  Annabel Dunstone Gray authored Nov 14, 2018
  
  e2b40e29
- Merge branch 'qa-fix-git-protocol-v2-spec' into 'master' · 507c98a0
  Rémy Coutable authored Nov 14, 2018
```
Fix Git protocol v2 e2e test

Closes gitlab-org/quality/staging#16

See merge request gitlab-org/gitlab-ce!23067
```
  507c98a0
- Merge branch 'master' into 'master' · 6ffe6f1c
  Rémy Coutable authored Nov 14, 2018
```
Update proofreader.md

See merge request gitlab-org/gitlab-ce!20752
```
  6ffe6f1c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-14 · 6a551a1e
  GitLab Bot authored Nov 14, 2018
  
  6a551a1e
- Fix diff border radius · fee29d95
  Annabel Dunstone Gray authored Nov 14, 2018
  
  fee29d95
- Fix vertical line alignment in discussion · 315baf83
  Annabel Dunstone Gray authored Nov 14, 2018
  
  315baf83
- Merge branch 'fl-gitlab-ui-cicd' into 'master' · 2059e9f5
  Clement Ho authored Nov 14, 2018
```
Updates pipeline code to use gitlab-ui

See merge request gitlab-org/gitlab-ce!22999
```
  2059e9f5
- Fix styling of snippet and commit discussion comments · 973c5240
  Annabel Dunstone Gray authored Nov 13, 2018
  
  973c5240
- Merge branch 'ce-to-ee-2018-11-14' into 'master' · 06ef748d
  Robert Speicher authored Nov 14, 2018
```
CE upstream - 2018-11-14 14:21 UTC

See merge request gitlab-org/gitlab-ee!8449
```
  06ef748d
- Fix Git protocol v2 e2e test · 99a084e7
  Mark Lapierre authored Nov 14, 2018
```
Remove references to `Factory`
```
  99a084e7
- Merge branch 'mr-expand-all-collapsed-files' into 'master' · 63b4b4b2
  Filipa Lacerda authored Nov 14, 2018
```
Fix collapsed files not fully fully expanding

Closes #53866

See merge request gitlab-org/gitlab-ce!23019
```
  63b4b4b2