Commits · 7483ed5bdc10b143126b49786dca03ea4b4fe11b · nexedi / gitlab-ce

26 Nov, 2018 8 commits
- Added another test and some refactoring · 7483ed5b
  Sanad Liaquat authored Nov 06, 2018
  
  7483ed5b
- Resolve merge conflict and fix test · 810024a1
  Sanad Liaquat authored Nov 06, 2018
  
  810024a1
- Test is complete · f4c0abd5
  Sanad Liaquat authored Nov 05, 2018
  
  f4c0abd5
- Merge branch 'ce-to-ee-2018-11-26' into 'master' · 4ef33e00
  Steve Azzopardi authored Nov 26, 2018
```
CE upstream - 2018-11-26 05:21 UTC

See merge request gitlab-org/gitlab-ee!8581
```
  4ef33e00
- Resolve conflicts in doc/workflow/time_tracking.md · 50230815
  Steve Azzopardi authored Nov 26, 2018
```
Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23297
```
  50230815
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-26 · 2182cb4a
  GitLab Bot authored Nov 26, 2018
```
# Conflicts:
#	doc/workflow/time_tracking.md

[ci skip]
```
  2182cb4a
- Merge branch 'patch-32' into 'master' · 79ff6da3
  Evan Read authored Nov 26, 2018
```
Add month unit

See merge request gitlab-org/gitlab-ce!23297
```
  79ff6da3
- Merge branch 'docs-fix-badge' into 'master' · 425a37b4
  Evan Read authored Nov 26, 2018
```
Docs: Add security dashboard missing badge

See merge request gitlab-org/gitlab-ee!8575
```
  425a37b4
24 Nov, 2018 2 commits
- Merge branch 'ce-to-ee-2018-11-23' into 'master' · 2c519c97
  Stan Hu authored Nov 24, 2018
```
CE upstream - 2018-11-23 18:21 UTC

See merge request gitlab-org/gitlab-ee!8579
```
  2c519c97
- Run prettier on app/assets/javascripts/clusters/components/applications.vue · 4c991e83
  Stan Hu authored Nov 23, 2018
  
  4c991e83
23 Nov, 2018 30 commits
- Resolve conflicts in doc/README.md · b98a866c
  Stan Hu authored Nov 23, 2018
  
  b98a866c
- Merge branch '2122-add-loading-state' into 'master' · 97ce490f
  Phil Hughes authored Nov 23, 2018
```
Adds loading state to linked pipeline

See merge request gitlab-org/gitlab-ee!8572
```
  97ce490f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-23 · 7e2bd2fb
  GitLab Bot authored Nov 23, 2018
```
# Conflicts:
#	doc/README.md

[ci skip]
```
  7e2bd2fb
- Merge branch 'ce-to-ee-2018-11-23' into 'master' · 6afe9888
  Achilleas Pipinellis authored Nov 23, 2018
```
CE upstream - 2018-11-23 15:21 UTC

See merge request gitlab-org/gitlab-ee!8574
```
  6afe9888
- CE upstream - 2018-11-23 15:21 UTC · 68f59072
  🤖 GitLab Bot 🤖 authored Nov 23, 2018
  
  68f59072
- Merge branch 'speed-up-relative-positioning' into 'master' · 39670ad2
  Douglas Barbosa Alexandre authored Nov 23, 2018
```
Speed up setting of relative position

See merge request gitlab-org/gitlab-ee!8573
```
  39670ad2
- Merge branch 'speed-up-relative-positioning' into 'master' · fbbe5ccd
  Douglas Barbosa Alexandre authored Nov 23, 2018
```
Speed up setting of relative position

See merge request gitlab-org/gitlab-ce!23324
```
  fbbe5ccd
- Merge branch '52371-filter-by-none-any-for-labels-in-issues-mrs-api' into 'master' · 204f6a83
  Nick Thomas authored Nov 23, 2018
```
Resolve "Filter by `None`/`Any` for labels in issues/mrs API"

Closes #52371

See merge request gitlab-org/gitlab-ce!22622
```
  204f6a83
- Merge branch 'csvn-master-patch-28622' into 'master' · 75289665
  Achilleas Pipinellis authored Nov 23, 2018
```
Add docs note for Reverting MR availability

See merge request gitlab-org/gitlab-ce!22289
```
  75289665
- Add docs note for Reverting MR availability · 5cca95ec
  Christian Svensson authored Nov 23, 2018
  
  5cca95ec
- Merge branch 'docs-update-helm-docs' into 'master' · 3250efae
  Achilleas Pipinellis authored Nov 23, 2018
```
add a note about omnibus chart and info how to backup with gitlab chart

See merge request gitlab-org/gitlab-ce!23097
```
  3250efae
- add a note about omnibus chart and info how to backup with gitlab chart · 61a5616a
  Alexander Tanayno authored Nov 23, 2018
  
  61a5616a
- Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master' · 427c1e72
  Kamil Trzciński authored Nov 23, 2018
```
CE port: Promote the GitLab.com Gold trial on a users default dashboard

See merge request gitlab-org/gitlab-ce!22901
```
  427c1e72
- Merge branch 'ee-6983-promote-starting-a-gitlab-com-trial' into 'master' · 872d486a
  Kamil Trzciński authored Nov 23, 2018
```
EE: Promote the GitLab.com Gold trial on a users default dashboard

See merge request gitlab-org/gitlab-ee!8571
```
  872d486a
- Merge branch 'doc/admin-import-src' into 'master' · 5aac64a7
  Achilleas Pipinellis authored Nov 23, 2018
```
[docs] Enable importing from other sites

See merge request gitlab-org/gitlab-ce!23082
```
  5aac64a7
- [docs] Enable importing from other sites · b42aaefb
  Franklin Yu authored Nov 23, 2018
  
  b42aaefb
- Merge branch 'docs/fix_container_scanning_job_link' into 'master' · 756a5a8c
  Achilleas Pipinellis authored Nov 23, 2018
```
Fix container_scanning job link

See merge request gitlab-org/gitlab-ee!8577
```
  756a5a8c
- Merge branch 'fj-force-content-disposition' into 'master' · 2340e094
  Nick Thomas authored Nov 23, 2018
```
Set content disposition attachment to several endpoints

See merge request gitlab-org/gitlab-ce!23223
```
  2340e094
- Set content disposition attachment to several endpoints · 9a5703ec
  Francisco Javier López authored Nov 23, 2018
  
  9a5703ec
- Fix container_scanning job link · aafbe788
  Philippe Lafoucrière authored Nov 23, 2018
  
  aafbe788
- Merge branch 'docs-ck-prom-grafana-steps' into 'master' · 63c1ad18
  Achilleas Pipinellis authored Nov 23, 2018
```
Add instructions on how to add Prometheus as data source in Grafana

See merge request gitlab-org/gitlab-ce!23273
```
  63c1ad18
- Add instructions on how to add Prometheus as data source in Grafana · 414ca3f7
  Chenjerai Katanda authored Nov 23, 2018
  
  414ca3f7
- Merge branch 'patch-31' into 'master' · 0ab4918c
  Achilleas Pipinellis authored Nov 23, 2018
```
Replace public_jobs attribute with public_builds attribute in Projects API docs

See merge request gitlab-org/gitlab-ce!23194
```
  0ab4918c
- Update security_dashboard badge · eea6f5d9
  Marcia Ramos authored Nov 23, 2018
  
  eea6f5d9
- Adds loading state to linked pipeline · a2955b97
  Filipa Lacerda authored Nov 23, 2018
```
Renders a loading spinner for the isLoading
state.
Updates tests
```
  a2955b97
- Merge branch 'docs-add-missing-languages-in-proofreaders-page' into 'master' · 7f6d763d
  Achilleas Pipinellis authored Nov 23, 2018
```
Add missing languages in Proofreaders page

See merge request gitlab-org/gitlab-ce!23243
```
  7f6d763d
- Merge branch 'certmanager-temp' into 'master' · 9c98e2a9
  Kamil Trzciński authored Nov 23, 2018
```
Deploy cert-manager to managed cluster for SSL certificates

See merge request gitlab-org/gitlab-ce!23036
```
  9c98e2a9
- Merge branch 'refactor-landing-page-ee' into 'master' · fe84cc33
  Achilleas Pipinellis authored Nov 23, 2018
```
Refactor landing page EE

See merge request gitlab-org/gitlab-ee!8523
```
  fe84cc33
- Refactor landing page EE · 8d9add63
  Evan Read authored Nov 23, 2018
  
  8d9add63
- Merge branch 'refactor-landing-page' into 'master' · 52ca66fc
  Achilleas Pipinellis authored Nov 23, 2018
```
Refactor landing page CE

See merge request gitlab-org/gitlab-ce!23215
```
  52ca66fc