Commits · 1c817595bcac0d12a9cf6bb1b0fd93bbc66c4657 · nexedi / gitlab-ce

02 Jul, 2018 17 commits
- Merge branch 'crose-amend-bamboo-steps' into 'master' · 1c817595
  Achilleas Pipinellis authored Jul 02, 2018
```
Doc update for Bamboo Integration with GitLab

See merge request gitlab-org/gitlab-ee!6311
```
  1c817595
- Doc update for Bamboo Integration with GitLab · 39048a2b
  Chris Rose authored Jul 02, 2018
  
  39048a2b
- Merge branch '6195-http-git-push-to-secondary-for-git-lfs-currently-does-not-work' into 'master' · e5f92197
  Nick Thomas authored Jul 02, 2018
```
Resolve "Git LFS: Support for HTTP git push to secondary"

Closes #6195

See merge request gitlab-org/gitlab-ee!6109
```
  e5f92197
- Merge branch 'patch-7' into 'master' · c5915736
  Achilleas Pipinellis authored Jul 02, 2018
```
Update index.md changed "gonna" to "going to be"

See merge request gitlab-org/gitlab-ee!6312
```
  c5915736
- Merge branch 'dm-user-without-projects-performance-ee' into 'master' · cd5f7163
  Yorick Peterse authored Jul 02, 2018
```
[EE] Improve performance of User.without_projects scope

See merge request gitlab-org/gitlab-ee!6330
```
  cd5f7163
- Merge branch 'document-11.1-ce-to-ee' into 'master' · f051114c
  James Lopez authored Jul 02, 2018
```
Add From Community Edition 11.1 to Enterprise Edition 11.1 guide

See merge request gitlab-org/gitlab-ee!6345
```
  f051114c
- Improve performance of User.without_projects scope · 37dfe202
  Douwe Maan authored Jun 29, 2018
  
  37dfe202
- Add From Community Edition 11.1 to Enterprise Edition 11.1 guide · 1edc0ec1
  Alessio Caiazza authored Jul 02, 2018
  
  1edc0ec1
- Merge branch 'fix/gb/external-ci-files-use-default-branch' into 'master' · 7ed779bd
  Douwe Maan authored Jul 02, 2018
```
Use default branch SHA to get external files using `include`

Closes #5864

See merge request gitlab-org/gitlab-ee!6325
```
  7ed779bd
- Merge branch 'docs/6763-link-for-expired_in-is-broken' into 'master' · 70e46b03
  Achilleas Pipinellis authored Jul 02, 2018
```
Resolve "Link for 'expired_in' is broken"

Closes #6763

See merge request gitlab-org/gitlab-ee!6323
```
  70e46b03
- Merge branch 'ee-44726-cancel_lease_upon_completion_in_project_cache_worker' into 'master' · b5c890cc
  Sean McGivern authored Jul 02, 2018
```
Cancel ExclusiveLease upon completion in ProjectCacheWorker

See merge request gitlab-org/gitlab-ee!6315
```
  b5c890cc
- Merge branch 'kingjan1999/gitlab-ce-47462-issues-disabled-group-page' into 'master' · ed95db7e
  Sean McGivern authored Jul 02, 2018
```
[EE]  Resolve "404 when trying to create a new issue from the group"

See merge request gitlab-org/gitlab-ee!6273
```
  ed95db7e
- Update geo docs on git-lfs redirect support · 37a418c6
  Ash McKenzie authored Jun 13, 2018
  
  37a418c6
- Geo: Support git-lfs push to secondary redirect · aa73ef0a
  Ash McKenzie authored Jun 13, 2018
  
  aa73ef0a
- Move check logic into #batch_operation_disallowed? · f0164abc
  Ash McKenzie authored Jun 13, 2018
  
  f0164abc
- Better route matching for read-only detection · 051ac7d5
  Ash McKenzie authored Jun 13, 2018
  
  051ac7d5
- Merge branch 'ee-tz-npm-dateformat' into 'master' · 865fd7d5
  Phil Hughes authored Jul 02, 2018
```
EE-Port for moving dateformat to npm and remove from global

See merge request gitlab-org/gitlab-ee!6329
```
  865fd7d5
01 Jul, 2018 9 commits
- Merge branch 'ce-to-ee-2018-07-01' into 'master' · cc0f74bd
  Stan Hu authored Jul 01, 2018
```
CE upstream - 2018-07-01 09:38 UTC

See merge request gitlab-org/gitlab-ee!6342
```
  cc0f74bd
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-01 · a4e4b66b
  GitLab Bot authored Jul 01, 2018
  
  a4e4b66b
- Merge branch 'ccr/add_locked_state' into 'master' · 3cf68362
  Rémy Coutable authored Jul 01, 2018
```
Add locked state to merge request API

See merge request gitlab-org/gitlab-ce!20186
```
  3cf68362
- Merge branch 'ee-ccr/add_locked_state' into 'master' · 972d01b9
  Rémy Coutable authored Jul 01, 2018
```
Port of ccr/add_locked_state to EE

See merge request gitlab-org/gitlab-ee!6307
```
  972d01b9
- Merge branch 'bcrypt-update' into 'master' · 61c17b25
  Rémy Coutable authored Jul 01, 2018
```
update to support latest bcrypt. resolves #48149

Closes #48149

See merge request gitlab-org/gitlab-ce!20260
```
  61c17b25
- update to support latest bcrypt. resolves #48149 · 912fe2c5
  Muhammad Nuzaihan authored Jul 01, 2018
  
  912fe2c5
- Merge branch 'i18n-extract-app/views/projects-settings' into 'master' · 7f9dfacf
  Rémy Coutable authored Jul 01, 2018
```
i18n: externalize strings from 'app/views/projects/settings'

See merge request gitlab-org/gitlab-ce!19821
```
  7f9dfacf
- Merge branch 'docs-ee-features-link' into 'master' · 59804e26
  Rémy Coutable authored Jul 01, 2018
```
Update ee_features.md to fix link

See merge request gitlab-org/gitlab-ce!20283
```
  59804e26
- i18n: externalize strings from 'app/views/projects/settings' · 9e99eb6c
  Tao Wang authored Jun 14, 2018
```
Signed-off-by: Tao Wang <twang2218@gmail.com>
```
  9e99eb6c
30 Jun, 2018 14 commits
- Merge branch 'ce-to-ee-2018-06-30' into 'master' · 37b56ca8
  Stan Hu authored Jun 30, 2018
```
CE upstream - 2018-06-30 15:21 UTC

See merge request gitlab-org/gitlab-ee!6339
```
  37b56ca8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-30 · fe436498
  GitLab Bot authored Jun 30, 2018
  
  fe436498
- Merge branch 'tz-mr-diff-performance' into 'master' · 923172c9
  Fatih Acet authored Jun 30, 2018
```
Performance Improvements to Vue MR page

Closes #48492

See merge request gitlab-org/gitlab-ce!20246
```
  923172c9
- Performance Improvements to Vue MR page · fb44cb3d
  Tim Zallmann authored Jun 30, 2018
  
  fb44cb3d
- Merge branch 'ee-tz-mr-diff-performance' into 'master' · 06dcd2f3
  Fatih Acet authored Jun 30, 2018
```
EE-Port: Performance Improvements to Vue MR page

See merge request gitlab-org/gitlab-ee!6326
```
  06dcd2f3
- EE-Port: Performance Improvements to Vue MR page · f704d542
  Tim Zallmann authored Jun 30, 2018
  
  f704d542
- Cancel ExclusiveLease upon completion in ProjectCacheWorker · 24d60c8a
  Imre Farkas authored Jun 22, 2018
  
  24d60c8a
- Update ee_features.md to fix link · a0f3c585
  Marcel Amirault authored Jun 30, 2018
  
  a0f3c585
- Merge branch 'ce-to-ee-2018-06-30' into 'master' · 0447d65f
  Stan Hu authored Jun 30, 2018
```
CE upstream - 2018-06-30 06:21 UTC

See merge request gitlab-org/gitlab-ee!6338
```
  0447d65f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-30 · 7a1e6fed
  GitLab Bot authored Jun 30, 2018
  
  7a1e6fed
- Merge branch 'ce-to-ee-2018-06-30' into 'master' · b21bd8bb
  Stan Hu authored Jun 30, 2018
```
CE upstream - 2018-06-30 03:21 UTC

See merge request gitlab-org/gitlab-ee!6337
```
  b21bd8bb
- Merge branch 'bw-fix-ee-dashboard' into 'master' · 3a3233a5
  Stan Hu authored Jun 30, 2018
```
EE/Geo information paritals not rendered on dashboard

See merge request gitlab-org/gitlab-ce!20276
```
  3a3233a5
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-30 · 4bd543e8
  GitLab Bot authored Jun 30, 2018
  
  4bd543e8
- Merge branch 'docs/install-requirements' into 'master' · 854d39ad
  Mike Lewis authored Jun 30, 2018
```
Update requirements.md to make 8GB the minimum instance size

See merge request gitlab-org/gitlab-ce!20133
```
  854d39ad