Commits · 327088ae522288cc4af329caf772dc4fe6d9739b · nexedi / gitlab-ce

26 Nov, 2018 19 commits
- Resolve locale/gitlab.pot · 327088ae
  George Tsiolis authored Nov 26, 2018
  
  327088ae
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-26 · a03d66c7
  GitLab Bot authored Nov 26, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  a03d66c7
- Merge branch 'gt-externalize-app-views-project-runners' into 'master' · 16a9080f
  Fatih Acet authored Nov 26, 2018
```
Externalize strings from `/app/views/project/runners`

See merge request gitlab-org/gitlab-ce!23208
```
  16a9080f
- Merge branch 'docs/exclude-qa-frontend' into 'master' · aed88cd4
  Rémy Coutable authored Nov 26, 2018
```
Exclude qa-frontend from running on docs-only branches

See merge request gitlab-org/gitlab-ce!23327
```
  aed88cd4
- Merge branch 'docs/ce-to-ee-no-squash' into 'master' · 00cbe6c9
  Rémy Coutable authored Nov 26, 2018
```
Instruct against squashing in CE to EE MRs

See merge request gitlab-org/gitlab-ce!23330
```
  00cbe6c9
- Merge branch 'ce-attempt-to-fix-lazy_loader_spec-transient-failure' into 'master' · ac123014
  Fatih Acet authored Nov 26, 2018
```
Attempt to fix lazy loader spec transient failure

Closes #49511

See merge request gitlab-org/gitlab-ce!22918
```
  ac123014
- Attempt to fix lazy loader spec transient failure · 1877eb49
  Luke Bennett authored Nov 26, 2018
  
  1877eb49
- Merge branch 'sh-improve-prettier-docs' into 'master' · ceae9f52
  Phil Hughes authored Nov 26, 2018
```
Fix documentation on using prettier for a specific directory

See merge request gitlab-org/gitlab-ce!23336
```
  ceae9f52
- Merge branch 'gitaly-1.0.0' into 'master' · b0eb1128
  Sean McGivern authored Nov 26, 2018
```
Use Gitaly 1.0.0

Closes gitaly#1406

See merge request gitlab-org/gitlab-ce!23323
```
  b0eb1128
- Merge branch '46544-webide-commit-shortcut' into 'master' · 3ea5a1b4
  Phil Hughes authored Nov 26, 2018
```
WebIDE: Make Ctrl+Enter automatically commit when commit textarea is focused

Closes #46544

See merge request gitlab-org/gitlab-ce!23049
```
  3ea5a1b4
- WebIDE: Make Ctrl+Enter automatically commit when commit textarea is focused · 45677139
  Thomas Pathier authored Nov 26, 2018
  
  45677139
- Merge branch 'patch-32' into 'master' · 10e4c873
  Achilleas Pipinellis authored Nov 26, 2018
```
Update to properly reference users instead of projects

See merge request gitlab-org/gitlab-ce!23325
```
  10e4c873
- Merge branch '54462-master-pipeline-failing-due-un-prettify-file' into 'master' · 359a03c2
  Steve Azzopardi authored Nov 26, 2018
```
Run `yarn prettier-all-save`

Closes #54462

See merge request gitlab-org/gitlab-ce!23342
```
  359a03c2
- 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
- Run `yarn prettier-all-save` · 2aa2d6f8
  Steve Azzopardi authored Nov 26, 2018
  
  2aa2d6f8
- 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 3 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
- Fix documentation on using prettier for a specific directory · bfaf72e0
  Stan Hu authored Nov 23, 2018
```
If the `check` parameter is used, the `allFiles` parameter is `false`,
which causes the prettier.js script only to process staged files.
The correct parameters are `check-all` and `save-all`.
```
  bfaf72e0
- Run prettier on app/assets/javascripts/clusters/components/applications.vue · 4c991e83
  Stan Hu authored Nov 23, 2018
  
  4c991e83
23 Nov, 2018 18 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