Commits · b5f3aea1f0aebd77ad168cdc90970a4ea746f531 · nexedi / gitlab-ce

25 Jan, 2019 40 commits
- Merge branch 'feature/gb/cross-project-pipeline-trigger' into 'master' · b5f3aea1
  Douwe Maan authored Jan 25, 2019
```
Cross-project pipeline triggers

Closes #8997

See merge request gitlab-org/gitlab-ee!9107
```
  b5f3aea1
- Automatic merge of gitlab-org/gitlab-ce master · 9ebfeebc
  GitLab Bot authored Jan 25, 2019
  
  9ebfeebc
- Merge branch 'db-copy-as-gfm-prosemirror-ee' into 'master' · f825dc59
  Phil Hughes authored Jan 25, 2019
```
[EE]  Reimplement Copy-as-GFM using the prosemirror document model

See merge request gitlab-org/gitlab-ee!9288
```
  f825dc59
- Merge branch 'winh-note-actions-vue-test-utils' into 'master' · f4386181
  Phil Hughes authored Jan 25, 2019
```
Convert note_actions_spec.js to Vue test utils

See merge request gitlab-org/gitlab-ce!24665
```
  f4386181
- Automatic merge of gitlab-org/gitlab-ce master · 790c1300
  GitLab Bot authored Jan 25, 2019
  
  790c1300
- Merge branch 'docs-import-links' into 'master' · 426ebea3
  Achilleas Pipinellis authored Jan 25, 2019
```
Linking to backup doc from migration doc, for self-hosted to self-hosted migration

Closes #56339

See merge request gitlab-org/gitlab-ce!24592
```
  426ebea3
- Linking to backup doc from migration doc, for self-hosted to self-hosted migration · e42f265d
  Marcel Amirault authored Jan 25, 2019
  
  e42f265d
- Automatic merge of gitlab-org/gitlab-ce master · da6757a3
  GitLab Bot authored Jan 25, 2019
  
  da6757a3
- Merge branch 'db-copy-as-gfm-prosemirror' into 'master' · cc29bc61
  Phil Hughes authored Jan 25, 2019
```
Reimplement Copy-as-GFM using the prosemirror document model

See merge request gitlab-org/gitlab-ce!22797
```
  cc29bc61
- Automatic merge of gitlab-org/gitlab-ce master · 9091b402
  GitLab Bot authored Jan 25, 2019
  
  9091b402
- Merge branch '54250-upstream-kubeclient-redirect-patch' into 'master' · 53b8e6e3
  Kamil Trzciński authored Jan 25, 2019
```
Use http_max_redirects opt to replace monkeypatch

Closes #54250

See merge request gitlab-org/gitlab-ce!24284
```
  53b8e6e3
- Merge branch '40997-gitlab-pages-deploy-jobs-have-a-null-status' into 'master' · 552f8032
  Grzegorz Bizon authored Jan 25, 2019
```
Fix empty labels for `pages:deploy` job

Closes #40997

See merge request gitlab-org/gitlab-ce!24451
```
  552f8032
- Merge branch 'an-opentracing-active-record-tracing' into 'master' · ca52a125
  Kamil Trzciński authored Jan 25, 2019
```
Adds tracing support for ActiveRecord notifications

See merge request gitlab-org/gitlab-ce!24604
```
  ca52a125
- Apply suggestion to spec/javascripts/test_bundle.js · 52963c89
  Winnie Hellmann authored Jan 25, 2019
  
  52963c89
- Convert note_actions_spec.js to Vue test utils · 8e6d2cca
  Winnie Hellmann authored Jan 25, 2019
  
  8e6d2cca
- Add workaround for Vue test utils setProps · a71d02bb
  Winnie Hellmann authored Jan 25, 2019
```
see https://github.com/vuejs/vue-test-utils/issues/631#issuecomment-421108344
```
  a71d02bb
- Automatic merge of gitlab-org/gitlab-ce master · d572106d
  GitLab Bot authored Jan 25, 2019
  
  d572106d
- Merge branch '56424-fix-gl-form-init-tag-editing' into 'master' · 15a7f3c6
  Filipa Lacerda authored Jan 25, 2019
```
Init GLForm instance on form while editing tags

Closes #56424

See merge request gitlab-org/gitlab-ce!24645
```
  15a7f3c6
- Init GLForm instance on form while editing tags · eb44dc25
  Kushal Pandya authored Jan 25, 2019
  
  eb44dc25
- Merge branch 'diff-fix-folder-path-commas' into 'master' · e055f7d3
  Filipa Lacerda authored Jan 25, 2019
```
Fixed diff tree folders being rendered incorrectly

See merge request gitlab-org/gitlab-ce!24635
```
  e055f7d3
- Merge branch 'gt-externalize-app-views-projects-ci' into 'master' · d42762ce
  Filipa Lacerda authored Jan 25, 2019
```
Externalize strings from `/app/views/projects/ci`

See merge request gitlab-org/gitlab-ce!24617
```
  d42762ce
- Externalize strings from `/app/views/projects/ci` · dc0b81a4
  George Tsiolis authored Jan 25, 2019
  
  dc0b81a4
- Merge branch 'gt-externalize-app-views-projects-ci-ee' into 'master' · fa911c37
  Filipa Lacerda authored Jan 25, 2019
```
Externalize strings from `/app/views/projects/ci`

See merge request gitlab-org/gitlab-ee!9279
```
  fa911c37
- Externalize strings from `/app/views/projects/ci` · e086ba52
  George Tsiolis authored Jan 25, 2019
  
  e086ba52
- Automatic merge of gitlab-org/gitlab-ce master · 66308338
  GitLab Bot authored Jan 25, 2019
  
  66308338
- Merge branch 'diff-settings-dropdown' into 'master' · 965dbbd2
  Filipa Lacerda authored Jan 25, 2019
```
Added dropdown for diff settings

Closes #55491

See merge request gitlab-org/gitlab-ce!24460
```
  965dbbd2
- Merge branch 'qa-update-merge-request-page' into 'master' · aabc4876
  Ramya Authappan authored Jan 25, 2019
```
Update merge request page object and rebase test

Closes gitlab-org/quality/staging#3

See merge request gitlab-org/gitlab-ce!24375
```
  aabc4876
- Merge branch 'winh-issue-board-switcher-gitlab-ui-ee' into 'master' · bcc3873e
  Tim Zallmann authored Jan 25, 2019
```
Convert issue board switcher to gitlab-ui dropdown components

Closes #9088 and #8855

See merge request gitlab-org/gitlab-ee!8591
```
  bcc3873e
- Automatic merge of gitlab-org/gitlab-ce master · 735da7ec
  GitLab Bot authored Jan 25, 2019
  
  735da7ec
- Merge branch '7751-add-refactored-epics-sidebar-shell' into 'master' · 87d35ec7
  Phil Hughes authored Jan 25, 2019
```
[Part 1] Add Epic sidebar shell to refactored Epics app

See merge request gitlab-org/gitlab-ee!9289
```
  87d35ec7
- Merge branch 'mg-upgrade-webpack' into 'master' · 000a67f4
  Phil Hughes authored Jan 25, 2019
```
Upgrade webpack and monaco-editor to latest

See merge request gitlab-org/gitlab-ce!24646
```
  000a67f4
- Upgrade webpack and monaco-editor to latest · ef6311d6
  Mike Greiling authored Jan 25, 2019
  
  ef6311d6
- Automatic merge of gitlab-org/gitlab-ce master · 415e818e
  GitLab Bot authored Jan 25, 2019
  
  415e818e
- Merge branch 'improve-personas-section-in-issue-template' into 'master' · 47e6675c
  Mike Lewis authored Jan 25, 2019
```
Improve Target audience section for issue templates

See merge request gitlab-org/gitlab-ce!24527
```
  47e6675c
- Automatic merge of gitlab-org/gitlab-ce master · 74642cbd
  GitLab Bot authored Jan 25, 2019
  
  74642cbd
- Merge branch '6769-epics-votes-ce' into 'master' · 07941f7f
  Nick Thomas authored Jan 25, 2019
```
Add missing attrs to Issue example API responses

See merge request gitlab-org/gitlab-ce!24641
```
  07941f7f
- Merge branch '6769-epics-votes' into 'master' · cbe30cb8
  Nick Thomas authored Jan 25, 2019
```
Add upvote/downvote counts to Epics API

Closes gitlab-ce#56723 and #6769

See merge request gitlab-org/gitlab-ee!9264
```
  cbe30cb8
- Minor edit to personas mention · de3fa98d
  Mike Lewis authored Jan 25, 2019
  
  de3fa98d
- Use http_max_redirects opt to replace monkeypatch · f234aef9
  Thong Kuah authored Jan 10, 2019
```
http_max_redirects was introduced in 4.2.2, so upgrade kubeclient.

The monkey-patch was global so we will have to check that all instances
of Kubeclient::Client are handled.

Spec all methods of KubeClient

This should provide better confidence that we are indeed disallowing
redirection in all cases
```
  f234aef9
- Automatic merge of gitlab-org/gitlab-ce master · 050312ed
  GitLab Bot authored Jan 25, 2019
  
  050312ed