Commits · d373c5941688b2dcbdde529f25d9ab4e3a3aa2b2 · nexedi / gitlab-ce

05 Nov, 2018 27 commits
- Merge branch '7615-api-status-filter' into 'master' · d373c594
  Douwe Maan authored Nov 05, 2018
```
Filter epics by state in API

Closes #7615

See merge request gitlab-org/gitlab-ee!8179
```
  d373c594
- Merge branch 'qa-batch-comments-e2e-tests' into 'master' · 0e6e72d2
  Nick Thomas authored Nov 05, 2018
```
Qa batch comments e2e tests

Closes #7275

See merge request gitlab-org/gitlab-ee!7958
```
  0e6e72d2
- Qa batch comments e2e tests · 0b3777a3
  Ramya Authappan authored Nov 05, 2018
  
  0b3777a3
- Merge branch 'ce-to-ee-2018-11-05' into 'master' · bdf1807e
  🤖 GitLab Bot 🤖 authored Nov 05, 2018
```
CE upstream - 2018-11-05 09:21 UTC

See merge request gitlab-org/gitlab-ee!8225
```
  bdf1807e
- Filter epics by state in API · ab261efc
  Jarka Košanová authored Nov 01, 2018
  
  ab261efc
- Merge branch 'fix-merge-request-config-label-margin' into 'master' · 3eb661dc
  Tim Zallmann authored Nov 05, 2018
```
Fix input margin inconsistency

See merge request gitlab-org/gitlab-ee!7942
```
  3eb661dc
- Merge branch '4187-add-reply-edit-shortcuts-in-epic' into 'master' · 7e247865
  Filipa Lacerda authored Nov 05, 2018
```
Add `l`, `r` and `e` keyboard shortcuts support in Epic

Closes #4187

See merge request gitlab-org/gitlab-ee!8203
```
  7e247865
- Merge branch '8265-ops-dashboard-intermittent-dashboard-component-karma-failure' into 'master' · 1e00a8a8
  Filipa Lacerda authored Nov 05, 2018
```
Resolve "Ops Dashboard intermittent dashboard component karma failure"

Closes #8265

See merge request gitlab-org/gitlab-ee!8215
```
  1e00a8a8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-05 · dad0ae56
  GitLab Bot authored Nov 05, 2018
  
  dad0ae56
- Merge branch 'frozen-string-enable-lib-gitlab-ci-remain' into 'master' · 9e2eb85e
  Grzegorz Bizon authored Nov 05, 2018
```
Enable frozen string for lib/gitlab/ci/**/*.rb

See merge request gitlab-org/gitlab-ce!22703
```
  9e2eb85e
- Merge branch '51259-ci-cd-gitlab-ui' into 'master' · a4527d2a
  Phil Hughes authored Nov 05, 2018
```
Uses gitlab-ui components in jobs components.

See merge request gitlab-org/gitlab-ce!22780
```
  a4527d2a
- Merge branch 'toggle-sidebar-alignment' into 'master' · 690298ab
  Phil Hughes authored Nov 05, 2018
```
Align toggle sidebar button across all browsers and OSs

See merge request gitlab-org/gitlab-ce!22771
```
  690298ab
- Merge branch 'ce-to-ee-2018-11-05' into 'master' · 2833cc18
  Steve Azzopardi authored Nov 05, 2018
```
CE upstream - 2018-11-05 01:21 UTC

See merge request gitlab-org/gitlab-ee!8224
```
  2833cc18
- Add changelog entry · 5983bac5
  Kushal Pandya authored Nov 02, 2018
  
  5983bac5
- Spec for Epic keyboard shortcuts · 3eed0d6a
  Kushal Pandya authored Nov 02, 2018
  
  3eed0d6a
- Resolve conflict in changelog ce-to-ee-2018-11-05 · 3f6bd640
  Steve Azzopardi authored Nov 05, 2018
  
  3f6bd640
- Merge branch 'ashmckenzie/6193-geo-update-push-to-secondary' into 'master' · 063e8c5c
  Evan Read authored Nov 05, 2018
```
Geo: Update documentation for push to secondary support

See merge request gitlab-org/gitlab-ee!7854
```
  063e8c5c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-05 · 7ae62fc0
  GitLab Bot authored Nov 05, 2018
```
# Conflicts:
#	CHANGELOG.md

[ci skip]
```
  7ae62fc0
- Bold primary and secondary node references · 31a34c49
  Ash McKenzie authored Nov 02, 2018
  
  31a34c49
- Update Using a Geo Server · f6d6619a
  Ash McKenzie authored Nov 02, 2018
```
- Removed secondary steps
- Added push to secondary git output example
```
  f6d6619a
- Fix formatting for Using a Geo Server · 12a552a9
  Ash McKenzie authored Nov 02, 2018
  
  12a552a9
- Geo: Update overview illustration · 07fb734c
  Ash McKenzie authored Oct 19, 2018
  
  07fb734c
- Geo: Update Premium URL to go to correct location · 369315a4
  Ash McKenzie authored Oct 12, 2018
  
  369315a4
- Geo: Add push to secondary support for EE 11.3.x · 86721f6b
  Ash McKenzie authored Oct 12, 2018
  
  86721f6b
- Merge branch 'bw-add-elasticsearch-troubelshooting-docs' into 'master' · ef250e65
  Nick Thomas authored Nov 05, 2018
```
Add some troubleshooting docs for our ElasticSearch development docs

See merge request gitlab-org/gitlab-ee!8174
```
  ef250e65
- Merge branch 'ce-to-ee-2018-11-04' into 'master' · 2818a41a
  Stan Hu authored Nov 05, 2018
```
CE upstream - 2018-11-04 23:21 UTC

Closes gitlab-org/quality/team-tasks#67

See merge request gitlab-org/gitlab-ee!8223
```
  2818a41a
- Merge branch 'mk/mitigate-some-geo-ha-setup-pitfalls-docs' into 'master' · 953e8d8d
  Evan Read authored Nov 05, 2018
```
Mitigate a few Geo HA setup pitfalls in the documentation

Closes #7601

See merge request gitlab-org/gitlab-ee!8117
```
  953e8d8d
04 Nov, 2018 13 commits
- Resolve conflicts in doc/development/contributing/merge_request_workflow.md · de46a221
  Stan Hu authored Nov 04, 2018
  
  de46a221
- Update CHANGELOG.md for 11.4.5 · 93846eb1
  GitLab Release Tools Bot authored Nov 04, 2018
```
[ci skip]
```
  93846eb1
- Update CHANGELOG.md for 11.4.5 · 20409996
  GitLab Release Tools Bot authored Nov 04, 2018
```
[ci skip]
```
  20409996
- Update CHANGELOG-EE.md for 11.4.5-ee · a6b5445f
  GitLab Release Tools Bot authored Nov 04, 2018
```
[ci skip]
```
  a6b5445f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-04 · f06bb449
  GitLab Bot authored Nov 04, 2018
```
# Conflicts:
#	doc/development/contributing/merge_request_workflow.md

[ci skip]
```
  f06bb449
- Merge branch 'update-def-of-done-with-qa-tests-requirement-ee' into 'master' · 74cc7569
  Evan Read authored Nov 04, 2018
```
Using inline links for require QA tests part of definition of done per review feedback

See merge request gitlab-org/gitlab-ee!8194
```
  74cc7569
- Merge branch 'update-def-of-done-with-qa-tests-requirement' into 'master' · 37b0af3d
  Evan Read authored Nov 04, 2018
```
docs - Update definition of done with e2e tests requirement

Closes gitlab-org/quality/team-tasks#67

See merge request gitlab-org/gitlab-ce!22655
```
  37b0af3d
- Merge branch 'update_license_management_job' into 'master' · b8286989
  Kamil Trzciński authored Nov 04, 2018
```
Update license_management job

See merge request gitlab-org/gitlab-ce!22732
```
  b8286989
- Update license_management job · ccb1ff9a
  Philippe Lafoucrière authored Nov 04, 2018
  
  ccb1ff9a
- Merge branch 'patch-32' into 'master' · ccc5b740
  Evan Read authored Nov 04, 2018
```
Update mysql.md with correct anchor link to "how services are linked"

See merge request gitlab-org/gitlab-ce!22739
```
  ccc5b740
- Resolve flaky empty state karma tests · 4afbb99d
  Adriel Santiago authored Nov 03, 2018
  
  4afbb99d
- Merge branch 'ce-to-ee-2018-11-04' into 'master' · 8e03b10f
  🤖 GitLab Bot 🤖 authored Nov 04, 2018
```
CE upstream - 2018-11-04 03:21 UTC

See merge request gitlab-org/gitlab-ee!8220
```
  8e03b10f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-04 · ea5df8ba
  GitLab Bot authored Nov 04, 2018
  
  ea5df8ba