Commits · 21d2b475d89fbdef166aaf061dd068dea919f67c · nexedi / gitlab-ce

24 Dec, 2018 1 commit

Merge branch 'fix-geo-ssh-push-secondary-clone-qa' into 'master' · 21d2b475

Lin Jen-Shin authored Dec 24, 2018

Fix wait for project replication before getting clone URL

Closes gitlab-org/quality/nightly#51

See merge request gitlab-org/gitlab-ee!8937

21d2b475

22 Dec, 2018 2 commits
- Merge branch 'dz-add-type-to-packages' into 'master' · 9913c389
  Dmitriy Zaporozhets authored Dec 22, 2018
```
Add package_type column to packages table

See merge request gitlab-org/gitlab-ee!8939
```
  9913c389
- Add package_type column to packages table · 67b7dbad
  Dmitriy Zaporozhets authored Dec 20, 2018
```
So we can distinct between Maven and NPM packages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  67b7dbad
21 Dec, 2018 37 commits
- Merge branch 'ee-44984-use-serializer-for-issuable-sidebar' into 'master' · 9ce83d06
  Mike Greiling authored Dec 21, 2018
```
EE port of 44984-use-serializer-for-issuable-sidebar

See merge request gitlab-org/gitlab-ee!8651
```
  9ce83d06
- Automatic merge of gitlab-org/gitlab-ce master · 12665637
  GitLab Bot authored Dec 21, 2018
  
  12665637
- Merge branch 'dz-ee-api-endpoints' into 'master' · 937b4ca7
  Dmitriy Zaporozhets authored Dec 21, 2018
```
Move EE-only API endpoints mount to separate file

See merge request gitlab-org/gitlab-ee!8945
```
  937b4ca7
- Merge branch 'add-dbalexandre-to-CODEOWNERS' into 'master' · 88094c44
  Stan Hu authored Dec 21, 2018
```
Add @dbalexandre to CODEOWNERS

See merge request gitlab-org/gitlab-ce!23999
```
  88094c44
- Fix wait for project replication · aa1d8bde
  Mark Lapierre authored Dec 20, 2018
```
Wait for the repository to finish replication after visiting the
project page.

Some code cleanup too.
```
  aa1d8bde
- Move EE-only API endpoints mount to separate file · d8375ea8
  Dmitriy Zaporozhets authored Dec 21, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d8375ea8
- Automatic merge of gitlab-org/gitlab-ce master · e430b7f9
  GitLab Bot authored Dec 21, 2018
  
  e430b7f9
- Add @dbalexandre to CODEOWNERS · 4f9f3c6c
  Douglas Barbosa Alexandre authored Dec 21, 2018
  
  4f9f3c6c
- Merge branch 'add-jen-shin-to-CODEOWNERS' into 'master' · 677d88b4
  Douglas Barbosa Alexandre authored Dec 21, 2018
```
Add @godfat to CODEOWNERS

Closes gitlab-com/www-gitlab-com#3354

See merge request gitlab-org/gitlab-ce!23998
```
  677d88b4
- Automatic merge of gitlab-org/gitlab-ce master · 9e80db7b
  GitLab Bot authored Dec 21, 2018
  
  9e80db7b
- Merge branch 'docs-serverless-samples' into 'master' · 7fb33e32
  Achilleas Pipinellis authored Dec 21, 2018
```
Docs serverless samples

Closes #55371

See merge request gitlab-org/gitlab-ce!23961
```
  7fb33e32
- Update verbiage for clarity · 3c88fb51
  danielgruesso authored Dec 21, 2018
  
  3c88fb51
- Change group-cluster beta to regular note · d21b8ef0
  Daniel Gruesso authored Dec 21, 2018
  
  d21b8ef0
- Change alpha states to use note instead of warning · 81d9752a
  Daniel Gruesso authored Dec 21, 2018
  
  81d9752a
- Update registry section. Update serverless.yaml formatting · c5b59a16
  danielgruesso authored Dec 21, 2018
  
  c5b59a16
- Clarify obtaining application URL · 53dba6e3
  danielgruesso authored Dec 20, 2018
  
  53dba6e3
- Merge branch 'revert-62d250ff' into 'master' · a9d02909
  Sean McGivern authored Dec 21, 2018
```
Revert "Merge branch 'winh-discussion-header-commented' into 'master'"

Closes #55641

See merge request gitlab-org/gitlab-ce!23993
```
  a9d02909
- Merge branch 'revert-62d250ff-ee' into 'master' · a2246872
  Sean McGivern authored Dec 21, 2018
```
Revert "Merge branch 'winh-discussion-header-commented-ee' into 'master'"

Closes gitlab-ce#55641

See merge request gitlab-org/gitlab-ee!8952
```
  a2246872
- Automatic merge of gitlab-org/gitlab-ce master · 93bb3a4a
  GitLab Bot authored Dec 21, 2018
  
  93bb3a4a
- Merge branch '54781-store-disk-path-in-database-for-projects-on-legacy-storage' into 'master' · 7e454dcb
  Stan Hu authored Dec 21, 2018
```
Storage location for projects on legacy storage

See merge request gitlab-org/gitlab-ce!23917
```
  7e454dcb
- Automatic merge of gitlab-org/gitlab-ce master · 89a4a87b
  GitLab Bot authored Dec 21, 2018
  
  89a4a87b
- Merge branch 'support-gitaly-tls' into 'master' · 02878551
  Lin Jen-Shin authored Dec 21, 2018
```
Support tls communication in gitaly

See merge request gitlab-org/gitlab-ce!22602
```
  02878551
- Add @godfat to CODEOWNERS · 8b213bbf
  Lin Jen-Shin authored Dec 22, 2018
  
  8b213bbf
- Revert "Merge branch 'winh-discussion-header-commented-ee' into 'master'" · f32b0f2c
  Winnie Hellmann authored Dec 21, 2018
```
This reverts merge request !8790

(cherry picked from commit 0d3bd9e8e660cb87cad0a0cb5dcb5097062c5514)
```
  f32b0f2c
- Update storage location after a group has been renamed/transfered · 8a172ebd
  Douglas Barbosa Alexandre authored Dec 21, 2018
  
  8a172ebd
- Update storage location after a project has been transfered · 29527d21
  Douglas Barbosa Alexandre authored Dec 18, 2018
  
  29527d21
- Update storage location after a project has been renamed · 3962c725
  Douglas Barbosa Alexandre authored Dec 18, 2018
  
  3962c725
- Track storage location for legacy storage projects · a0222cf8
  Douglas Barbosa Alexandre authored Dec 18, 2018
  
  a0222cf8
- Automatic merge of gitlab-org/gitlab-ce master · e4637d68
  GitLab Bot authored Dec 21, 2018
  
  e4637d68
- Revert "Merge branch 'winh-discussion-header-commented' into 'master'" · 0817c210
  Winnie Hellmann authored Dec 21, 2018
```
This reverts merge request !23622
```
  0817c210
- Merge branch 'gitlab-ui-1.18.0' into 'master' · a9049532
  Phil Hughes authored Dec 21, 2018
```
Updates gitlab ui to v1.18.0

See merge request gitlab-org/gitlab-ce!23983
```
  a9049532
- More tls gitaly docs · 907f0ce8
  Ahmad Hassan authored Dec 21, 2018
  
  907f0ce8
- Merge branch 'dz-fix-ee-master' into 'master' · 36e58cc4
  Dmitriy Zaporozhets authored Dec 21, 2018
```
Fix broken EE master

See merge request gitlab-org/gitlab-ee!8946
```
  36e58cc4
- Merge branch '8850-fix-related-issues-id-wrapping' into 'master' · 2ce3f5df
  Annabel Dunstone Gray authored Dec 21, 2018
```
Fix issue ID wrapping and avatar counter shrinking in Related Issues list

Closes #8850

See merge request gitlab-org/gitlab-ee!8854
```
  2ce3f5df
- Merge branch 'docs-ha-repmgr' into 'master' · eccd6086
  Achilleas Pipinellis authored Dec 21, 2018
```
Updating HA repmgr docs to suggest 3 nodes

See merge request gitlab-org/gitlab-ee!8659
```
  eccd6086
- Updating HA repmgr docs to suggest 3 nodes · 838c17e7
  Aric Buerer authored Dec 21, 2018
  
  838c17e7
- Automatic merge of gitlab-org/gitlab-ce master · fd696d95
  GitLab Bot authored Dec 21, 2018
  
  fd696d95