Commits · da0efda2ecb51c6358bf73bd85cef5a883be402e · nexedi / gitlab-ce

07 Feb, 2018 10 commits
- Merge branch 'zj-n-1-merge-requests-show' into 'master' · da0efda2
  Sean McGivern authored Feb 07, 2018
```
Remove N + 1 issue for MergeRequests#show

Closes #37432 and gitaly#994

See merge request gitlab-org/gitlab-ce!16967
```
  da0efda2
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 7a6e8826
  Mark Fletcher authored Feb 07, 2018
  
  7a6e8826
- Merge branch 'patch-29' into 'master' · bbbc815a
  🏂 Rémy Coutable 🏂 (back Feb. 12th) authored Feb 07, 2018
```
Update GITALY_SERVER_VERSION to 0.81.0

See merge request gitlab-org/gitlab-ce!16966
```
  bbbc815a
- Let CI catch N + 1 calls · 5dd8c05a
  Zeger-Jan van de Weg authored Feb 07, 2018
  
  5dd8c05a
- Update GITALY_SERVER_VERSION · f6ab32e5
  Francisco Javier López authored Feb 07, 2018
  
  f6ab32e5
- Merge branch 'move-board-list-vue-component' into 'master' · 826105df
  Phil Hughes authored Feb 07, 2018
```
Move board list vue component

See merge request gitlab-org/gitlab-ce!16888
```
  826105df
- Merge branch 'sh-add-ldap-qa' into 'master' · 586ecbc5
  Grzegorz Bizon authored Feb 07, 2018
```
Add QA specs for LDAP login

See merge request gitlab-org/gitlab-ce!16914
```
  586ecbc5
- Merge branch 'qa/rs-qa-from-anywhere' into 'master' · a08fc123
  Grzegorz Bizon authored Feb 07, 2018
```
Run bin/qa from anywhere

See merge request gitlab-org/gitlab-ce!16833
```
  a08fc123
- Address review comments for LDAP QA test · 73991674
  Stan Hu authored Feb 06, 2018
  
  73991674
- Merge branch 'master' into sh-add-ldap-qa · cfa58db8
  Stan Hu authored Feb 06, 2018
  
  cfa58db8
06 Feb, 2018 30 commits
- Merge branch 'dm-reset-event-pk-sequence' into 'master' · 4457cf9d
  Yorick Peterse authored Feb 06, 2018
```
Reset `events` table primary key sequence to make sure it’s correct

Closes #42667

See merge request gitlab-org/gitlab-ce!16960
```
  4457cf9d
- Reset `events` table primary key sequence to make sure it’s correct · e2aef6d6
  Douwe Maan authored Feb 06, 2018
  
  e2aef6d6
- Merge branch '26388-push-to-create-a-new-project' into 'master' · b0f0ad05
  Douwe Maan authored Feb 06, 2018
```
Resolve "Push to create a new project"

Closes #26388

See merge request gitlab-org/gitlab-ce!16547
```
  b0f0ad05
- Merge branch 'dm-git-hook-popen' into 'master' · bc59a5d0
  Stan Hu authored Feb 06, 2018
```
Only set cwd on the newly spawned process, instead of the current one

See merge request gitlab-org/gitlab-ce!16958
```
  bc59a5d0
- Merge branch 'master' into '26388-push-to-create-a-new-project' · c51eb79b
  Douwe Maan authored Feb 06, 2018
```
# Conflicts:
#   lib/gitlab/path_regex.rb
```
  c51eb79b
- Merge branch 'update-helm-chart-docs' into 'master' · 3f3b84e0
  Marcia Ramos authored Feb 06, 2018
```
Clarify Helm chart plans

See merge request gitlab-org/gitlab-ce!16822
```
  3f3b84e0
- Merge branch 'dm-route-path-validation' into 'master' · 1f86e549
  Sean McGivern authored Feb 06, 2018
```
Validate user, group and project paths consistently, and only once

See merge request gitlab-org/gitlab-ce!16903
```
  1f86e549
- Merge branch 'dm-user-namespace-route-path-validation' into 'master' · e776096e
  Sean McGivern authored Feb 06, 2018
```
Validate user namespace before saving so that errors persist on model

Closes #42140

See merge request gitlab-org/gitlab-ce!16902
```
  e776096e
- Merge branch 'dm-sidekiq-memory-killer-getcwd' into 'master' · 8999d8eb
  Stan Hu authored Feb 06, 2018
```
Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd

See merge request gitlab-org/gitlab-ce!16954
```
  8999d8eb
- Check ability ability before proceeding with project specific checks · 8b4280cb
  Tiago Botelho authored Feb 06, 2018
  
  8b4280cb
- Merge branch 'ce-4813-quickfix' into 'master' · dffd5669
  Sean McGivern authored Feb 06, 2018
```
Resolve "spec/ee/spec/services/ee/projects/destroy_service_spec.rb is failing"

See merge request gitlab-org/gitlab-ce!16955
```
  dffd5669
- Revert "Merge branch 'update-qa-docs-with-directory-req' into 'master'" · 4067b64d
  Robert Speicher authored Jan 31, 2018
```
This reverts commit e6579d82, reversing
changes made to afcd9fc7.
```
  4067b64d
- Expand QA spec file paths to allow running bin/qa from anywhere · bf0ec009
  Robert Speicher authored Jan 31, 2018
  
  bf0ec009
- Only set cwd on the newly spawned process, instead of the current one · 81b5ce11
  Douwe Maan authored Feb 06, 2018
  
  81b5ce11
- Add changelog · 4f335663
  Douwe Maan authored Feb 02, 2018
  
  4f335663
- Validate User username only on Namespace, and bubble up appropriately · a03d29da
  Douwe Maan authored Jan 31, 2018
  
  a03d29da
- Validate path uniqueness only on Route, and bubble up appropriately · 75144b1e
  Douwe Maan authored Jan 31, 2018
  
  75144b1e
- Validate user namespace before saving so that errors persist on model · 8d69436c
  Douwe Maan authored Jan 31, 2018
  
  8d69436c
- Reset Project's column information in... · e39031de
  Rémy Coutable authored Feb 06, 2018
```
Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e39031de
- Merge branch '42730-close-rugged-repository' into 'master' · 7095c2bf
  Douwe Maan authored Feb 06, 2018
```
Resolve "ProjectCacheWorker leaks file descriptors"

Closes #42730

See merge request gitlab-org/gitlab-ce!16930
```
  7095c2bf
- Merge branch 'zj/gitlab-ce-zj-wiki-page-versions' · a480ee18
  Douwe Maan authored Feb 06, 2018
  
  a480ee18
- Merge branch 'gitaly-lfs-client-prep' into 'master' · 245d9375
  Robert Speicher authored Feb 06, 2018
```
Refactor Gitlab::Git code related to LFS changes for Gitaly migration

Closes gitaly#980

See merge request gitlab-org/gitlab-ce!16835
```
  245d9375
- Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd · 87685428
  Douwe Maan authored Feb 06, 2018
  
  87685428
- Merge branch 'zj-protobuf' into 'master' · 2d5f10b2
  Marin Jankovski authored Feb 06, 2018
```
Downgrade google-protobuf

See merge request gitlab-org/gitlab-ce!16941
```
  2d5f10b2
- Downgrade google-protobuf · 9f152630
  Zeger-Jan van de Weg authored Feb 06, 2018
  
  9f152630
- Moves project creationg to git access check for git push · 1e56b3f4
  Tiago Botelho authored Feb 02, 2018
  
  1e56b3f4
- Merge branch '42669-allow-order_by-users-in-gitlab-api' into 'master' · e8e4e3fc
  Douwe Maan authored Feb 06, 2018
```
Add sorting options for /users API

Closes #42669

See merge request gitlab-org/gitlab-ce!16945
```
  e8e4e3fc
- Close low level rugged repository in project cache worker · 285d5d52
  Bastian Blank authored Feb 05, 2018
```
Signed-off-by: Bastian Blank <waldi@debian.org>
```
  285d5d52
- Merge branch 'jej/upload-file-tracks-lfs' into 'master' · f81306e7
  Sean McGivern authored Feb 06, 2018
```
File upload UI obeys LFS filter

Closes #29876

See merge request gitlab-org/gitlab-ce!16412
```
  f81306e7
- Merge branch 'master' into 'zj-wiki-page-versions' · 5db5a9cb
  Douwe Maan authored Feb 06, 2018
```
# Conflicts:
#   Gemfile
#   Gemfile.lock
```
  5db5a9cb