Commits · c145774a8df46d16dd85275d44104b02bdcf0171 · nexedi / gitlab-ce

24 Sep, 2018 25 commits
- Merge branch 'ce-to-ee-2018-09-24' into 'master' · c145774a
  Mike Greiling authored Sep 24, 2018
```
CE upstream - 2018-09-24 11:15 UTC

See merge request gitlab-org/gitlab-ee!7464
```
  c145774a
- Merge branch 'docs/maven-redirect' into 'master' · 957dd448
  Marcia Ramos authored Sep 24, 2018
```
Redirect old Maven docs to new location

See merge request gitlab-org/gitlab-ee!7462
```
  957dd448
- Fix conflicts in doc/install/requirements.md · 0e02bce4
  Mike Greiling authored Sep 24, 2018
  
  0e02bce4
- Fix conflicts in app/assets/javascripts/pipelines/components/graph/stage_column_component.vue · d795b828
  Mike Greiling authored Sep 24, 2018
  
  d795b828
- Fix conflicts in app/assets/javascripts/pipelines/components/graph/graph_component.vue · 1a070027
  Mike Greiling authored Sep 24, 2018
  
  1a070027
- Fix conflicts in app/assets/javascripts/boards/index.js · af46112b
  Mike Greiling authored Sep 24, 2018
  
  af46112b
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-24 · ed820680
  GitLab Bot authored Sep 24, 2018
```
# Conflicts:
#	app/assets/javascripts/boards/index.js
#	app/assets/javascripts/pipelines/components/graph/graph_component.vue
#	app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
#	doc/install/requirements.md

[ci skip]
```
  ed820680
- Merge branch '7388-ensure-geo-documentation-contains-required-tcp-udp-ports-listed-docs' · 5ee4a08b
  Valery Sizov authored Sep 24, 2018
  
  5ee4a08b
- Merge branch 'upgrade-eslint-ee' into 'master' · 89f2a74f
  Marin Jankovski authored Sep 24, 2018
```
Upgrade eslint (EE port)

See merge request gitlab-org/gitlab-ee!7422
```
  89f2a74f
- Merge branch 'upgrade-eslint' into 'master' · 4ce9f2fd
  Marin Jankovski authored Sep 24, 2018
```
Upgrade eslint to v5.x

See merge request gitlab-org/gitlab-ce!21825
```
  4ce9f2fd
- Merge branch 'docs/geo-premium' into 'master' · 17a4f24c
  Marcia Ramos authored Sep 24, 2018
```
Change the tier badge of Geo to be PREMIUM

See merge request gitlab-org/gitlab-ce!21877
```
  17a4f24c
- Merge branch 'docs/geo-premium-ee' into 'master' · 258ace9f
  Marcia Ramos authored Sep 24, 2018
```
Change the tier badge of Geo to be PREMIUM

See merge request gitlab-org/gitlab-ee!7461
```
  258ace9f
- Merge branch '7307-fix-epics-sidebar-popover-content-url' into 'master' · 3f2e4f24
  Phil Hughes authored Sep 24, 2018
```
Update popover URL to point to help page of same domain

Closes #7307

See merge request gitlab-org/gitlab-ee!7446
```
  3f2e4f24
- Merge branch 'dm-create-note-return-discussion' into 'master' · 421108c6
  Filipa Lacerda authored Sep 24, 2018
```
Increase performance when creating discussion on diff

Closes #49002

See merge request gitlab-org/gitlab-ce!21743
```
  421108c6
- Merge branch 'fix/help-text-font-color-in-merge-request-creation' into 'master' · e9b13d18
  Filipa Lacerda authored Sep 24, 2018
```
Fixes WIP text with two different colors in MR edit page

Transforms a `p` element in a `div` to guarantee WIP
the explanation is rendered inside `text-muted`

See merge request gitlab-org/gitlab-ce!21740
```
  e9b13d18
- Redirect old Maven docs to new location · cbeb8a09
  Achilleas Pipinellis authored Sep 24, 2018
```
[ci skip]
```
  cbeb8a09
- Add changelog entry · 456fd772
  Kushal Pandya authored Sep 21, 2018
  
  456fd772
- Update popover URL to point to help page of same domain · 1d8ae6c4
  Kushal Pandya authored Sep 21, 2018
  
  1d8ae6c4
- Merge branch 'ccr/6318_system_note_for_issue' into 'master' · db4de93c
  Kamil Trzciński authored Sep 24, 2018
```
Add link to issue on epic

Closes #6318

See merge request gitlab-org/gitlab-ee!7407
```
  db4de93c
- Add link to issue on epic · dc9b21e7
  Chantal Rollison authored Sep 24, 2018
  
  dc9b21e7
- Added CHANGELOG · 21f02674
  Phil Hughes authored Sep 24, 2018
  
  21f02674
- Merge branch 'update-gitlab-ui-version' into 'master' · 05048e15
  Phil Hughes authored Sep 24, 2018
```
Use gitlab-ui 1.5.1

See merge request gitlab-org/gitlab-ce!21865
```
  05048e15
- Change the tier badge of Geo to be PREMIUM · d3f39dea
  Achilleas Pipinellis authored Sep 24, 2018
  
  d3f39dea
- Change the tier badge of Geo to be PREMIUM · 3dd27e4f
  Achilleas Pipinellis authored Sep 24, 2018
  
  3dd27e4f
- Switch to per-line rule exceptions · 0e66bf67
  Mike Greiling authored Sep 21, 2018
  
  0e66bf67
22 Sep, 2018 5 commits
- Merge branch 'ce-to-ee-2018-09-21' into 'master' · cac5471a
  Stan Hu authored Sep 22, 2018
```
CE upstream - 2018-09-21 21:21 UTC

See merge request gitlab-org/gitlab-ee!7456
```
  cac5471a
- Reolsve conflicts in doc/api/settings.md · 50b364bb
  Stan Hu authored Sep 22, 2018
  
  50b364bb
- Merge branch 'docs/change-maven-location-in-in-app-help' into 'master' · 6daebdff
  Dmitriy Zaporozhets authored Sep 22, 2018
```
Change the Maven docs location of the internal help page

See merge request gitlab-org/gitlab-ee!7458
```
  6daebdff
- Change the Maven docs location of the internal help page · c8dea1e9
  Achilleas Pipinellis authored Sep 22, 2018
  
  c8dea1e9
- Removed span tag and p tag from form-text · 9a3b1504
  Gerard Montemayor authored Sep 22, 2018
  
  9a3b1504
21 Sep, 2018 10 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-21 · 82221143
  GitLab Bot authored Sep 21, 2018
```
# Conflicts:
#	doc/api/settings.md

[ci skip]
```
  82221143
- Merge branch 'gitaly-auth-v2' into 'master' · 4c8d2232
  Robert Speicher authored Sep 21, 2018
```
Use the new gitaly auth scheme (v2)

See merge request gitlab-org/gitlab-ce!21417
```
  4c8d2232
- Merge branch 'docs-redirect-maven-repo' into 'master' · 5933ab16
  Mike Lewis authored Sep 21, 2018
```
Docs: redirect old Maven Repo docs to new ones

See merge request gitlab-org/gitlab-ee!7455
```
  5933ab16
- Docs: redirect old Maven Repo docs to new ones · 69f520ef
  Marcia Ramos authored Sep 21, 2018
  
  69f520ef
- Merge branch 'admin-geo-namespace-support' into 'master' · e6a4bf7b
  Douglas Barbosa Alexandre authored Sep 21, 2018
```
Geo: Refactor Admin controllers to use Geo specific namespace

See merge request gitlab-org/gitlab-ee!7395
```
  e6a4bf7b
- Geo: Refactor Admin controllers to use Geo specific namespace · 593c8370
  Gabriel Mazetto authored Sep 21, 2018
  
  593c8370
- Merge branch 'ee-admin-geo-namespace-support' into 'master' · e255b88e
  Douglas Barbosa Alexandre authored Sep 21, 2018
```
Backport Admin menu changes from EE

See merge request gitlab-org/gitlab-ce!21864
```
  e255b88e
- Use gitlab-ui 1.5.1 · 744b9a4d
  Clement Ho authored Sep 21, 2018
  
  744b9a4d
- Merge branch 'ce-to-ee-2018-09-21' into 'master' · 03fe66c4
  Dmitriy Zaporozhets authored Sep 21, 2018
```
CE upstream - 2018-09-21 12:16 UTC

Closes #5325

See merge request gitlab-org/gitlab-ee!7451
```
  03fe66c4
- Merge branch 'ee-51725-push-mirrors-default-branch-reset-to-master' into 'master' · e82c68c2
  Stan Hu authored Sep 21, 2018
```
Port of 51725-push-mirrors-default-branch-reset-to-master to EE

See merge request gitlab-org/gitlab-ee!7454
```
  e82c68c2