Commits · 98821eb16e899a605d5b55cb0181ca380030988a · nexedi / gitlab-ce

16 Oct, 2018 1 commit
- Fix pagination and preloading of resources · 98821eb1
  Kamil Trzciński authored Oct 15, 2018
  
  98821eb1
15 Oct, 2018 30 commits
- Merge branch 'mc/fix-codequality-documentation' into 'master' · baac8a77
  Marcia Ramos authored Oct 15, 2018
```
Revert "Update code quality documentation"

See merge request gitlab-org/gitlab-ee!7913
```
  baac8a77
- Update CHANGELOG.md for 11.3.5 · 4425d208
  GitLab Release Tools Bot authored Oct 15, 2018
```
[ci skip]
```
  4425d208
- Update CHANGELOG-EE.md for 11.3.5-ee · 848afe63
  GitLab Release Tools Bot authored Oct 15, 2018
```
[ci skip]
```
  848afe63
- Merge branch 'ce-to-ee-2018-10-15' into 'master' · a417ceb5
  🤖 GitLab Bot 🤖 authored Oct 15, 2018
```
CE upstream - 2018-10-15 11:21 UTC

Closes gitlab-com/gitlab-docs#234

See merge request gitlab-org/gitlab-ee!7931
```
  a417ceb5
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-15 · 63b1cc6f
  GitLab Bot authored Oct 15, 2018
  
  63b1cc6f
- Merge branch 'docs-fix-table-api-settings' into 'master' · 63cd88c6
  Achilleas Pipinellis authored Oct 15, 2018
```
Docs: fix table on API settings

Closes gitlab-com/gitlab-docs#234

See merge request gitlab-org/gitlab-ce!22083
```
  63cd88c6
- Docs: fix table on API settings · a021bd31
  Marcia Ramos authored Oct 15, 2018
  
  a021bd31
- Merge branch 'docs-update-maintenance-path-ck' into 'master' · 82b74b0f
  Achilleas Pipinellis authored Oct 15, 2018
```
Update docs maintenance upgrade path examples

See merge request gitlab-org/gitlab-ce!22360
```
  82b74b0f
- Update docs maintenance upgrade path examples · 7d307e6d
  Chenjerai Katanda authored Oct 15, 2018
  
  7d307e6d
- Merge branch 'winh-development-guide-docs' into 'master' · 5c7a73e1
  Achilleas Pipinellis authored Oct 15, 2018
```
Adjust link to docs development guide

See merge request gitlab-org/gitlab-ce!22288
```
  5c7a73e1
- Adjust link to docs development guide · 76b0c827
  Winnie Hellmann authored Oct 15, 2018
  
  76b0c827
- Merge branch 'docs-improve-contributing-guide' into 'master' · 5d1ba632
  Achilleas Pipinellis authored Oct 15, 2018
```
Improve the contributing documentation

See merge request gitlab-org/gitlab-ce!22291
```
  5d1ba632
- Merge branch 'ce-to-ee-2018-10-15' into 'master' · 22f2b13c
  🤖 GitLab Bot 🤖 authored Oct 15, 2018
```
CE upstream - 2018-10-15 10:56 UTC

See merge request gitlab-org/gitlab-ee!7930
```
  22f2b13c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-15 · 947c176c
  GitLab Bot authored Oct 15, 2018
  
  947c176c
- Merge branch 'sh-add-deploy-token-qa' into 'master' · c7fd9558
  Rémy Coutable authored Oct 15, 2018
```
Add GitLab QA spec for adding a deploy token

See merge request gitlab-org/gitlab-ce!22207
```
  c7fd9558
- Merge branch 'ce-7921-fix-batch-comments-resolution' into 'master' · 0d3cc866
  Phil Hughes authored Oct 15, 2018
```
Backport CE changes for: Resolves "Reviews: Resolving or unresolving discussions with “Add comment now” does not work"

See merge request gitlab-org/gitlab-ce!22303
```
  0d3cc866
- Merge branch '7921-fix-batch-comments-resolution' into 'master' · 0ec8038a
  Phil Hughes authored Oct 15, 2018
```
Resolves "Reviews: Resolving or unresolving discussions with “Add comment now” does not work"

Closes #7921

See merge request gitlab-org/gitlab-ee!7866
```
  0ec8038a
- Merge branch 'improve-spec-for-gitlab-ci-status-pipeline-factory' into 'master' · a9827357
  Grzegorz Bizon authored Oct 15, 2018
```
Improve spec for Gitlab::Ci::Status::Pipeline::Factory

Closes #52280

See merge request gitlab-org/gitlab-ce!22247
```
  a9827357
- Merge branch 'ce-to-ee-2018-10-15' into 'master' · c67e1c42
  🤖 GitLab Bot 🤖 authored Oct 15, 2018
```
CE upstream - 2018-10-15 08:27 UTC

See merge request gitlab-org/gitlab-ee!7923
```
  c67e1c42
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-15 · f436ec3a
  GitLab Bot authored Oct 15, 2018
  
  f436ec3a
- Merge branch 'enable-frozen-string-lib-gitlab' into 'master' · edb46ca6
  Rémy Coutable authored Oct 15, 2018
```
Enable some frozen string in lib/gitlab

See merge request gitlab-org/gitlab-ce!22304
```
  edb46ca6
- Merge branch '52421-show-canary-no-canary-in-the-performance-bar' into 'master' · 05dd7f97
  Sean McGivern authored Oct 15, 2018
```
Resolve "Show canary / no-canary in the performance bar"

Closes #52421

See merge request gitlab-org/gitlab-ce!22222
```
  05dd7f97
- Merge branch '48889-message-for-were-merged-into' into 'master' · 98905c6e
  Phil Hughes authored Oct 15, 2018
```
Only display merge commit SHA when it exists

Closes #48889

See merge request gitlab-org/gitlab-ce!22022
```
  98905c6e
- Only display merge commit SHA when it exists · b4297573
  Mark Chao authored Oct 15, 2018
  
  b4297573
- Merge branch 'ce-to-ee-2018-10-15' into 'master' · 75e6ab53
  🤖 GitLab Bot 🤖 authored Oct 15, 2018
```
CE upstream - 2018-10-15 06:21 UTC

See merge request gitlab-org/gitlab-ee!7922
```
  75e6ab53
- Merge branch 'patch-29' into 'master' · 0a89c0b8
  Kamil Trzciński authored Oct 15, 2018
```
Update Android.gitlab-ci.yml for current stable SDK

See merge request gitlab-org/gitlab-ce!22336
```
  0a89c0b8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-15 · 8282f507
  GitLab Bot authored Oct 15, 2018
  
  8282f507
- Merge branch 'ce-to-ee-2018-10-14' into 'master' · 425413f8
  Stan Hu authored Oct 15, 2018
```
CE upstream - 2018-10-14 23:21 UTC

See merge request gitlab-org/gitlab-ee!7919
```
  425413f8
- Resolve conflicts in doc/administration/job_artifacts.md · 4fd4c8b3
  Stan Hu authored Oct 14, 2018
  
  4fd4c8b3
- Merge branch 'docs-link-development-policies' into 'master' · 75b6ed8d
  Evan Read authored Oct 15, 2018
```
Docs: Link to DeclarativePolicy framework from development guide

See merge request gitlab-org/gitlab-ce!22348
```
  75b6ed8d
14 Oct, 2018 6 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-14 · b8f1af61
  GitLab Bot authored Oct 14, 2018
```
# Conflicts:
#	doc/administration/job_artifacts.md

[ci skip]
```
  b8f1af61
- Link to DeclarativePolicy page from /development · 85316bbb
  Thong Kuah authored Oct 14, 2018
  
  85316bbb
- Merge branch 'docs-bad-links-1-ee' into 'master' · 4a1eba9e
  Evan Read authored Oct 14, 2018
```
(Port to EE) Docs: Fixing some bad links

See merge request gitlab-org/gitlab-ee!7883
```
  4a1eba9e
- (Port to EE) Docs: Fixing some bad links · 28500416
  Marcel Amirault authored Oct 14, 2018
  
  28500416
- Merge branch 'docs-bad-links-1' into 'master' · 93fc4a6d
  Evan Read authored Oct 14, 2018
```
Docs: Fixing some bad links

See merge request gitlab-org/gitlab-ce!22287
```
  93fc4a6d
- Docs: Fixing some bad links · 5849a0ce
  Marcel Amirault authored Oct 14, 2018
  
  5849a0ce
13 Oct, 2018 3 commits
- Merge branch 'ce-to-ee-2018-10-13' into 'master' · beb54aa6
  🤖 GitLab Bot 🤖 authored Oct 13, 2018
```
CE upstream - 2018-10-13 10:22 UTC

See merge request gitlab-org/gitlab-ee!7918
```
  beb54aa6
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-13 · a7e6098c
  GitLab Bot authored Oct 13, 2018
  
  a7e6098c
- Merge branch 'fix-dupilicate-key-license-management' into 'master' · 4127b357
  Dmitriy Zaporozhets authored Oct 13, 2018
```
Fix duplicated key in license management job gitlab-org/gitlab-ce#52609

Closes #52609

See merge request gitlab-org/gitlab-ce!22311
```
  4127b357