Commits · b782bf8b3fef5c3ed9429e42e1ef73c7cb2b7560 · nexedi / gitlab-ce

12 Apr, 2018 14 commits
- Merge branch 'ce-to-ee-2018-04-12' into 'master' · b782bf8b
  Marin Jankovski authored Apr 12, 2018
```
CE upstream - 2018-04-12 08:01 UTC

Closes gitaly#1126

See merge request gitlab-org/gitlab-ee!5335
```
  b782bf8b
- Merge branch 'ee-rendering-markdown-multiple-projects' into 'master' · e55f766c
  Douwe Maan authored Apr 12, 2018
```
EE: Optimise rendering of Markdown documents that belong to different projects

See merge request gitlab-org/gitlab-ee!5308
```
  e55f766c
- Merge branch 'make-ghe-url-consistent' into 'master' · 1525f46a
  Achilleas Pipinellis authored Apr 12, 2018
```
Update github.md on GHE URL

See merge request gitlab-org/gitlab-ee!5332
```
  1525f46a
- Correct another one github.example.com · 8ac13839
  Achilleas Pipinellis authored Apr 12, 2018
```
[ci skip]
```
  8ac13839
- Merge branch 'ee-41436-use-simpler-env-vars-for-auto-devops-replicas' into 'master' · e1446709
  Achilleas Pipinellis authored Apr 12, 2018
```
Ee 41436 use simpler env vars for auto devops replicas

See merge request gitlab-org/gitlab-ee!5143
```
  e1446709
- Ee 41436 use simpler env vars for auto devops replicas · f83d3de1
  Dylan Griffith authored Apr 12, 2018
  
  f83d3de1
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-12 · 581f10ee
  GitLab Bot authored Apr 12, 2018
  
  581f10ee
- Merge branch 'ce-to-ee-2018-04-11' into 'master' · b90be12d
  Stan Hu authored Apr 12, 2018
```
CE upstream - 2018-04-11 15:29 UTC

See merge request gitlab-org/gitlab-ee!5328
```
  b90be12d
- Merge branch 'fix/gb/fix-pipeline-statuses-illustrations' into 'master' · b9d868e3
  Marin Jankovski authored Apr 12, 2018
```
Fix empty state for build that does not have a trace

Closes #45204

See merge request gitlab-org/gitlab-ce!18278
```
  b9d868e3
- Resolve static analysis failure in app/assets/javascripts/pipelines/services/pipeline_service.js · 3ee8cd94
  Stan Hu authored Apr 11, 2018
  
  3ee8cd94
- Merge branch '45245-rspec-flaky-pruner-failure-job-failed-62392094' into 'master' · 85b873e9
  Grzegorz Bizon authored Apr 12, 2018
```
Resolve "RSpec Flaky pruner failure / Job Failed #62392094"

Closes #45245

See merge request gitlab-org/gitlab-ce!18316
```
  85b873e9
- Merge branch... · 076289ac
  Nick Thomas authored Apr 12, 2018
```
Merge branch '5576-geo-checksum-failures-often-due-to-repository-not-existing-on-disk' into 'master'

Resolve "Geo: Checksum failures often due to repository not existing on disk"

Closes #5576

See merge request gitlab-org/gitlab-ee!5329
```
  076289ac
- Resolve "Geo: Checksum failures often due to repository not existing on disk" · 6085f5a6
  Douglas Barbosa Alexandre authored Apr 12, 2018
  
  6085f5a6
- Update github.md on GHE URL · dfcec724
  Xiaogang Wen authored Apr 12, 2018
  
  dfcec724
11 Apr, 2018 26 commits
- Fix scripts/prune-old-flaky-specs requires Bundler to run · d8a58f62
  Rémy Coutable authored Apr 11, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d8a58f62
- Merge branch 'fix/wiki-find-file-gitaly' into 'master' · 947ed8b8
  Robert Speicher authored Apr 11, 2018
```
Fix finding wiki file when Gitaly is enabled

Closes gitaly#1126

See merge request gitlab-org/gitlab-ce!18317
```
  947ed8b8
- Merge branch 'mk/geo/backport-broadcast-message-cache-expiration-hook' into 'master' · 84c70f43
  Nick Thomas authored Apr 11, 2018
```
[CE Backport] Propagate broadcast messages to secondaries

See merge request gitlab-org/gitlab-ce!18324
```
  84c70f43
- Backport: Propagate broadcast messages to secondaries · 1ce0595b
  Michael Kozono authored Apr 11, 2018
  
  1ce0595b
- Merge branch 'mk/geo/fix-broadcast-message-on-secondary' into 'master' · 10cd5c8c
  Nick Thomas authored Apr 11, 2018
```
Geo: Propagate broadcast messages to secondaries

Closes #4930

See merge request gitlab-org/gitlab-ee!5303
```
  10cd5c8c
- Merge branch 'winh-protection-push-dropdowns-backport' into 'master' · 9f8d91c9
  Clement Ho authored Apr 11, 2018
```
Limit dropdown toggle width for protected branches / tags

See merge request gitlab-org/gitlab-ce!18212
```
  9f8d91c9
- Merge branch 'winh-protection-push-dropdowns' into 'master' · 6bf9c407
  Clement Ho authored Apr 11, 2018
```
Shorten protected branch / tag access level dropdown text

Closes #5216

See merge request gitlab-org/gitlab-ee!5091
```
  6bf9c407
- Shorten protected branch / tag access level dropdown text · 9c38fec6
  Winnie Hellmann authored Apr 11, 2018
  
  9c38fec6
- Merge branch 'winh-sprintf-no-escape-docs' into 'master' · 8206cae7
  Clement Ho authored Apr 11, 2018
```
Document example for sprintf without escaping

See merge request gitlab-org/gitlab-ce!16712
```
  8206cae7
- Propagate broadcast messages to secondaries · 545d0a04
  Michael Kozono authored Apr 09, 2018
  
  545d0a04
- Merge branch 'unresolved-discussions-vue-component-i18n-and-tests' into 'master' · ac2271f8
  Clement Ho authored Apr 11, 2018
```
Add i18n and update specs for UnresolvedDiscussions vue component

See merge request gitlab-org/gitlab-ce!17866
```
  ac2271f8
- Merge branch '41748-vertical-misalignment-login-box' into 'master' · e77ecf62
  Clement Ho authored Apr 11, 2018
```
Vertical misalignment of login box header

Closes #41748

See merge request gitlab-org/gitlab-ce!16275
```
  e77ecf62
- Merge branch 'winh-single-karma-test' into 'master' · 54691d3d
  Clement Ho authored Apr 11, 2018
```
Add possibility to filter Karma spec files by path

Closes #40899

See merge request gitlab-org/gitlab-ce!16102
```
  54691d3d
- Merge branch '5619-geo-wiki-repository-verification-is-broken' into 'master' · c79679f6
  Nick Thomas authored Apr 11, 2018
```
Resolve "Geo: Wiki repository verification is broken"

Closes #5619

See merge request gitlab-org/gitlab-ee!5315
```
  c79679f6
- Resolve "Geo: Wiki repository verification is broken" · c5d195e7
  Douglas Barbosa Alexandre authored Apr 11, 2018
  
  c5d195e7
- Merge branch 'move-estimate-only-pane-vue-component' into 'master' · 615f9578
  Filipa Lacerda authored Apr 11, 2018
```
Move TimeTrackingEstimateOnlyPane vue component

See merge request gitlab-org/gitlab-ce!18318
```
  615f9578
- Merge branch 'mk/geo/improve-failover-docs' into 'master' · 5a15ca02
  Nick Thomas authored Apr 11, 2018
```
Geo: Minor improvements to Disaster Recovery and Planned Failover docs

Closes #4932

See merge request gitlab-org/gitlab-ee!5284
```
  5a15ca02
- Geo: Minor improvements to Disaster Recovery and Planned Failover docs · f8853569
  Michael Kozono authored Apr 11, 2018
  
  f8853569
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-11 · b8ab5d96
  GitLab Bot authored Apr 11, 2018
  
  b8ab5d96
- Refactor CSS to eliminate vertical misalignment of login nav · 21e6c7ac
  Takuya Noguchi authored Jan 08, 2018
  
  21e6c7ac
- Merge branch 'blackst0ne-rails5-update-event-subclass-from-attributes' into 'master' · 6593b2db
  Yorick Peterse authored Apr 11, 2018
```
[Rails5] Update Event#subclass_from_attributes method

See merge request gitlab-org/gitlab-ce!18312
```
  6593b2db
- Merge branch 'docs/monitoring-index-ee' into 'master' · e61cc7c4
  🚄 Job van der Voort 🚀 authored Apr 11, 2018
```
Link Monitor docs to the front page

See merge request gitlab-org/gitlab-ee!5327
```
  e61cc7c4
- Merge branch 'docs/monitoring-index' into 'master' · 8f0e9e01
  🚄 Job van der Voort 🚀 authored Apr 11, 2018
```
Link Monitor docs to the front page

Closes #45006

See merge request gitlab-org/gitlab-ce!18314
```
  8f0e9e01
- Move TimeTrackingEstimateOnlyPane vue component · 3f204b55
  George Tsiolis authored Apr 11, 2018
  
  3f204b55
- Fix finding wiki file when Gitaly is enabled · f6112122
  Ahmad Sherif authored Apr 11, 2018
```
Fixes gitaly#1126
```
  f6112122
- Merge branch 'ce-to-ee-2018-04-11' into 'master' · e6a2885c
  Rémy Coutable authored Apr 11, 2018
```
CE upstream - 2018-04-11 12:26 UTC

See merge request gitlab-org/gitlab-ee!5326
```
  e6a2885c