Commits · e09558c52dd9ce33bdaa623bfd273edad8c745d0 · nexedi / gitlab-ce

10 Jan, 2018 29 commits
- Fix HashedStorageAttachmentsEventStore spec when repo is already on disk · e09558c5
  Douglas Barbosa Alexandre authored Jan 10, 2018
```
(cherry picked from commit 14c4d19c)
```
  e09558c5
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-10 · 510506c1
  GitLab Bot authored Jan 10, 2018
  
  510506c1
- Merge branch 'ce-to-ee-2018-01-09' into 'master' · 6dc2e23c
  Luke Bennett authored Jan 10, 2018
```
CE upstream - Tuesday

Closes #4519, #3953, #4308, gitlab-org/release/tasks#13, and gitaly#886

See merge request gitlab-org/gitlab-ee!3978
```
  6dc2e23c
- Merge branch 'fix-group-hooks-mock' into 'master' · 88d9b0a1
  Dmitriy Zaporozhets authored Jan 09, 2018
```
Fix group hooks mock

Closes #4519

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

(cherry picked from commit 1b16ffac)

5800fe16 Fix group hooks mock
```
  88d9b0a1
- Merge branch 'dispatcher-dashboard-projects' into 'master' · be623ef3
  Phil Hughes authored Jan 10, 2018
```
Refactor dispatcher dashboard projects route

See merge request gitlab-org/gitlab-ce!16321
```
  be623ef3
- Merge branch 'ee-dispatcher-dashboard-projects' into 'master' · 3c151a93
  Phil Hughes authored Jan 10, 2018
```
Refactor dispatcher dashboard projects route (EE Version)

See merge request gitlab-org/gitlab-ee!3985
```
  3c151a93
- Merge branch 'ee-dispatcher-dashboard-issues' into 'master' · 459d6053
  Phil Hughes authored Jan 10, 2018
```
Refactor dispatcher dashboard issues path (EE)

See merge request gitlab-org/gitlab-ee!3968
```
  459d6053
- Merge branch 'dispatcher-dashboard-issues' into 'master' · 830e9bf7
  Phil Hughes authored Jan 10, 2018
```
Refactor dispatcher dashboard issues path

See merge request gitlab-org/gitlab-ce!16305
```
  830e9bf7
- Merge branch 'zj-migrate-gitlab-project-rm-mv' into 'master' · ed2c9797
  Douwe Maan authored Jan 10, 2018
```
Migrate GitlabProject (re)move project endpoints

Closes gitaly#873

See merge request gitlab-org/gitlab-ce!16249
```
  ed2c9797
- Merge branch 'fix/use-mirror-refmaps-instead-mirror-refmap' into 'master' · 6a2521d2
  Sean McGivern authored Jan 10, 2018
```
Add support for multiple refmaps to RemoteService#add_remote

Closes gitaly#903

See merge request gitlab-org/gitlab-ce!16331
```
  6a2521d2
- Merge branch 'dispatcher-dashboard-milestone-show' into 'master' · 520cb97e
  Phil Hughes authored Jan 10, 2018
```
Refactor dashboard milestone show inside dispatcher

See merge request gitlab-org/gitlab-ce!16304
```
  520cb97e
- Merge branch 'ee-dispatcher-dashboard-milestone-show' into 'master' · f1e609ad
  Phil Hughes authored Jan 10, 2018
```
Refactor dashboard milestone show inside dispatcher (EE)

See merge request gitlab-org/gitlab-ee!3962
```
  f1e609ad
- Refactor dashboard milestone show inside dispatcher (EE) · a15fb90e
  Clement Ho authored Jan 10, 2018
  
  a15fb90e
- Refactor dashboard milestone show inside dispatcher · 3ead412a
  Clement Ho authored Jan 10, 2018
  
  3ead412a
- Merge branch 'ee-dispatcher-dashboard-milestone-index' into 'master' · 3153264a
  Phil Hughes authored Jan 10, 2018
```
Refactor dashboard milestone index (EE)

See merge request gitlab-org/gitlab-ee!3961
```
  3153264a
- Refactor dashboard milestone index (EE) · 404d7a4e
  Clement Ho authored Jan 10, 2018
  
  404d7a4e
- Merge branch 'dispatcher-dashboard-milestone-index' into 'master' · b1d013bd
  Phil Hughes authored Jan 10, 2018
```
Refactor dashboard milestone index inside dispatcher

See merge request gitlab-org/gitlab-ce!16303
```
  b1d013bd
- Refactor dashboard milestone index inside dispatcher · a7c03870
  Clement Ho authored Jan 10, 2018
  
  a7c03870
- Merge branch 'ee-sidebar-collapse-button-padding' into 'master' · b5ffc264
  Phil Hughes authored Jan 10, 2018
```
Restore sidebar collapse button padding (EE Version)

See merge request gitlab-org/gitlab-ee!3975
```
  b5ffc264
- Restore sidebar collapse button padding (EE Version) · f2e94ae2
  Clement Ho authored Jan 10, 2018
  
  f2e94ae2
- Merge branch 'fix/sidebar-collapse-button-spacing' into 'master' · 35dcf851
  Phil Hughes authored Jan 10, 2018
```
Restore sidebar collapse button padding #41803

See merge request gitlab-org/gitlab-ce!16323
```
  35dcf851
- Merge branch 'sh-fix-bare-import-hooks' into 'master' · 7f232d97
  James Lopez authored Jan 10, 2018
```
Fix hooks not being set up properly for bare import Rake task

Closes #41739

See merge request gitlab-org/gitlab-ce!16280
```
  7f232d97
- Merge branch 'dz-improve-code-quality-docs' into 'master' · 047cde24
  Achilleas Pipinellis authored Jan 10, 2018
```
Use 0.69 version of codeclimate image for CI  code quality docs

See merge request gitlab-org/gitlab-ce!16319
```
  047cde24
- Fix hooks not being set up properly for bare import Rake task · 35d3411f
  Stan Hu authored Jan 07, 2018
```
Closes #41739
```
  35d3411f
- Merge branch 'tc-admin-remove-duplicate-links-docs' into 'master' · 738b63c7
  Achilleas Pipinellis authored Jan 10, 2018
```
Remove duplicate links

See merge request gitlab-org/gitlab-ee!3909
```
  738b63c7
- Fix indention · dfdeb4bc
  Clement Ho authored Jan 09, 2018
  
  dfdeb4bc
- Fix indention · d2b88e9b
  Clement Ho authored Jan 09, 2018
  
  d2b88e9b
- Fix indention · be485540
  Clement Ho authored Jan 09, 2018
  
  be485540
- Fix indention · 4668157e
  Clement Ho authored Jan 09, 2018
  
  4668157e
09 Jan, 2018 11 commits
- Merge branch 'master' into ee-dispatcher-dashboard-projects · 87052128
  Clement Ho authored Jan 09, 2018
  
  87052128
- Merge branch 'master' into ee-dispatcher-dashboard-issues · 12f5ec9a
  Clement Ho authored Jan 09, 2018
  
  12f5ec9a
- Merge branch 'ee-dispatcher-dashboard-todos' into 'master' · 0fa15a51
  Fatih Acet authored Jan 09, 2018
```
Refactor dashboard todos inside dispatcher (EE)

See merge request gitlab-org/gitlab-ee!3967
```
  0fa15a51
- Refactor dashboard todos inside dispatcher (EE) · 4388eb2a
  Clement Ho authored Jan 09, 2018
  
  4388eb2a
- Refactor dispatcher dashboard projects route · 2f642c3c
  Clement Ho authored Jan 09, 2018
  
  2f642c3c
- Merge branch 'sh-strong-memoize-validate-path-locks' into 'master' · f26d81f3
  Robert Speicher authored Jan 09, 2018
```
Properly memoize ChangeAccess#validate_path_locks? to avoid excessive queries

Closes #4488

See merge request gitlab-org/gitlab-ee!3945
```
  f26d81f3
- Merge branch 'master' into ee-dispatcher-dashboard-issues · 2e98683c
  Clement Ho authored Jan 09, 2018
  
  2e98683c
- Fix schema.rb conflict resolution · 78bf5863
  Michael Kozono authored Jan 09, 2018
  
  78bf5863
- Merge branch 'fix-group-hooks-mock' into 'master' · 1b16ffac
  Dmitriy Zaporozhets authored Jan 09, 2018
```
Fix group hooks mock

Closes #4519

See merge request gitlab-org/gitlab-ee!3982
```
  1b16ffac
- Revert "Fix Route validation for unchanged path" · 3576d59a
  Michael Kozono authored Jan 09, 2018
```
This reverts commit 8040edcc.
```
  3576d59a
- Revert "Add test for permanent redirects of descendants" · 48a018c6
  Michael Kozono authored Jan 09, 2018
```
This reverts commit a2cb9249.
```
  48a018c6