Commits · 5f290d24ca3501f5e3194bcdc7f17a91c679b7a6 · nexedi / gitlab-ce

14 Nov, 2018 40 commits
- 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
- 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
- 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
- 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
- Removes jquery as a dependency · f1e35e7e
  Filipa Lacerda authored Nov 13, 2018
  
  f1e35e7e
- Merge branch '53636-fix-rendering-of-any-user-filter' into 'master' · 07fc2ded
  Clement Ho authored Nov 14, 2018
```
Disable updating appearance of filter tokens for special values

Closes #53636

See merge request gitlab-org/gitlab-ce!22865
```
  07fc2ded
- Disable updating appearance of filter tokens for special values · 670e9772
  Heinrich Lee Yu authored Nov 14, 2018
  
  670e9772
- Merge branch 'docs/markup-languages' into 'master' · 51c09c38
  Marcia Ramos authored Nov 14, 2018
```
Add a new markup languages section

See merge request gitlab-org/gitlab-ce!22921
```
  51c09c38
- Merge branch 'gt-show-navigation-line-separator-ce' into 'master' · ea31f56e
  Nick Thomas authored Nov 14, 2018
```
Show navigation line separator when instance metrics is disabled

See merge request gitlab-org/gitlab-ce!22940
```
  ea31f56e
- Merge branch 'gt-show-navigation-line-separator' into 'master' · 07d0ba35
  Nick Thomas authored Nov 14, 2018
```
Show navigation line separator when instance metrics is disabled

Closes #8363

See merge request gitlab-org/gitlab-ee!8379
```
  07d0ba35
- Show navigation line separator when instance metrics is disabled · a622589c
  George Tsiolis authored Nov 14, 2018
  
  a622589c
- Fixed ci conflict · 061a37a0
  Jan Provaznik authored Nov 14, 2018
  
  061a37a0
- Fixed conflicts related to rails 5 · 35cd6ef0
  Jan Provaznik authored Nov 14, 2018
  
  35cd6ef0
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-14 · f7e38648
  GitLab Bot authored Nov 14, 2018
```
# Conflicts:
#	.gitlab-ci.yml
#	db/schema.rb
#	doc/development/README.md

[ci skip]
```
  f7e38648
- Merge branch 'winh-frontend-testing-slash-docs' into 'master' · 24e55997
  Tim Zallmann authored Nov 14, 2018
```
Add missing slash in frontend testing guide

See merge request gitlab-org/gitlab-ce!23027
```
  24e55997
- Merge branch 'switch-rails' into 'master' · af3a73ef
  Sean McGivern authored Nov 14, 2018
```
Switch to Rails 5

Closes #14286 and #48991

See merge request gitlab-org/gitlab-ce!21492
```
  af3a73ef
- Merge branch 'switch-rails-ee' into 'master' · 9fe715c5
  Sean McGivern authored Nov 14, 2018
```
[EE] Switch to Rails 5

See merge request gitlab-org/gitlab-ee!7222
```
  9fe715c5
- Merge branch 'ce-to-ee-2018-11-14' into 'master' · c75ae20e
  🤖 GitLab Bot 🤖 authored Nov 14, 2018
```
CE upstream - 2018-11-14 13:21 UTC

Closes charts/gitlab#897

See merge request gitlab-org/gitlab-ee!8447
```
  c75ae20e
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-14 · fc4c027e
  GitLab Bot authored Nov 14, 2018
  
  fc4c027e
- Minor gem fixes · 53270429
  Jan Provaznik authored Nov 12, 2018
  
  53270429