Commits · c08a3bb11b3aa0498e9cf48d25a0393cfe40c310 · nexedi / gitlab-ce

28 Nov, 2017 11 commits
- Resolve CE/EE merging conflicts · c08a3bb1
  Tomasz Maczukin authored Nov 28, 2017
```
Resolved for:
- lib/api/namespaces.rb
- spec/policies/namespace_policy_spec.rb
- spec/requests/api/namespaces_spec.rb
```
  c08a3bb1
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream[ci skip] · 5a22d8b8
  Valery Sizov authored Nov 28, 2017
  
  5a22d8b8
- Merge branch 'winh-upgrade-codeclimate' into 'master' · c26d7089
  Rémy Coutable authored Nov 28, 2017
```
Upgrade codeclimate image to latest

Closes #40255

See merge request gitlab-org/gitlab-ce!15461
```
  c26d7089
- Upgrade codeclimate image to latest · ae7a1e78
  Winnie Hellmann authored Nov 28, 2017
  
  ae7a1e78
- Merge branch 'tm/feature/list-runners-jobs-api' into 'master' · 763ea26d
  Kamil Trzciński authored Nov 28, 2017
```
Add new API endpoint - list jobs of a specified runner

Closes #39699

See merge request gitlab-org/gitlab-ce!15432
```
  763ea26d
- Merge branch 'ee-tm/feature/namespace-by-id-api' into 'master' · df940acb
  Kamil Trzciński authored Nov 28, 2017
```
Add new API endpoint - get a namespace by ID

See merge request gitlab-org/gitlab-ee!3450
```
  df940acb
- Merge branch 'icon-sizes' into 'master' · 6b0f594c
  Tim Zallmann authored Nov 28, 2017
```
limit icon component size to valid values

See merge request gitlab-org/gitlab-ce!15618
```
  6b0f594c
- Merge branch '40568-bump-seed-fu-to-2-3-7' into 'master' · 4d89f520
  Rémy Coutable authored Nov 28, 2017
```
Upgrade seed-fu to 2.3.7

Closes #40568

See merge request gitlab-org/gitlab-ce!15607
```
  4d89f520
- Merge branch 'tm/feature/namespace-by-id-api' into 'master' · 94c5ca71
  Kamil Trzciński authored Nov 28, 2017
```
Add new API endpoint - get a namespace by ID

Closes #40254

See merge request gitlab-org/gitlab-ce!15442
```
  94c5ca71
- Merge branch '40226-refactor-the-issuable-s-webhooks-data-architecture' into 'master' · 74b50363
  Douwe Maan authored Nov 28, 2017
```
Refactor the way we pass `old associations` to issuable's update services

Closes #40226

See merge request gitlab-org/gitlab-ce!15542
```
  74b50363
- Merge branch '40226-refactor-the-issuable-s-webhooks-data-architecture-ee' into 'master' · a66161d1
  Douwe Maan authored Nov 28, 2017
```
[EE] Refactor the way we pass `old associations` to issuable's update services

See merge request gitlab-org/gitlab-ee!3537
```
  a66161d1
27 Nov, 2017 29 commits
- Refactorize jobs finding logic · 13a902a9
  Tomasz Maczukin authored Nov 27, 2017
  
  13a902a9
- Update documentation · 9d27ce16
  Tomasz Maczukin authored Nov 21, 2017
  
  9d27ce16
- Use 'set' instead of 'let!' when it's possible · c0e72610
  Tomasz Maczukin authored Nov 21, 2017
  
  c0e72610
- Modify output · 7b643c02
  Tomasz Maczukin authored Nov 21, 2017
  
  7b643c02
- Allow filtering by 'status' · b7ed102e
  Tomasz Maczukin authored Nov 21, 2017
  
  b7ed102e
- Add information about project · 8d3e8069
  Tomasz Maczukin authored Nov 16, 2017
  
  8d3e8069
- Add CHANGELOG entry · 83607a4d
  Tomasz Maczukin authored Nov 16, 2017
  
  83607a4d
- Add new API endpoint - list jobs of a specified runner · 623eb681
  Tomasz Maczukin authored Nov 16, 2017
  
  623eb681
- Update policies unit tests · 0074e7da
  Tomasz Maczukin authored Nov 27, 2017
  
  0074e7da
- Add some unit tests for lib/api/helpers.rb · 609813fa
  Tomasz Maczukin authored Nov 27, 2017
  
  609813fa
- Update policies unit tests · f144cce8
  Tomasz Maczukin authored Nov 27, 2017
```
This commit also makes spec/policies/namespace_policy_spec.rb file
to be compatible with the same file in GitLab EE.
```
  f144cce8
- Add some unit tests for lib/api/helpers.rb · a9212e0f
  Tomasz Maczukin authored Nov 27, 2017
  
  a9212e0f
- Merge branch 'backport-disable-autocomplete' into 'master' · 25a3a183
  Fatih Acet authored Nov 27, 2017
```
Backport disable autocomplete

See merge request gitlab-org/gitlab-ce!15557
```
  25a3a183
- Merge branch 'disable-autocomplete' into 'master' · c97b60cb
  Fatih Acet authored Nov 27, 2017
```
Disable autocomplete for epics

Closes #4066

See merge request gitlab-org/gitlab-ee!3504
```
  c97b60cb
- Disable autocomplete for epics · 38abbafe
  Clement Ho authored Nov 27, 2017
  
  38abbafe
- Merge branch 'pawel/update_prometheus_gem_to_fix_build_on_Rpi' into 'master' · 8e7e2aeb
  Robert Speicher authored Nov 27, 2017
```
Update prometheus gem to fix build on RPi

Closes omnibus-gitlab#2988

See merge request gitlab-org/gitlab-ce!15616
```
  8e7e2aeb
- Merge branch 'backport-epic-fullscreen' into 'master' · 04ceeac1
  Fatih Acet authored Nov 27, 2017
```
Backport epic fullscreen

See merge request gitlab-org/gitlab-ce!15437
```
  04ceeac1
- Merge branch 'fix-epic-fullscreen' into 'master' · 522f4f13
  Fatih Acet authored Nov 27, 2017
```
Fix epic fullscreen editing

Closes #4065

See merge request gitlab-org/gitlab-ee!3437
```
  522f4f13
- Fix epic fullscreen editing · 01574ec5
  Clement Ho authored Nov 27, 2017
  
  01574ec5
- Merge branch 'backport-add-epic-sidebar' into 'master' · f8de23e6
  Fatih Acet authored Nov 27, 2017
```
Backport of add-epic-sidebar

See merge request gitlab-org/gitlab-ce!15335
```
  f8de23e6
- limit icon component size to valid values · 539ea5eb
  Simon Knox authored Nov 28, 2017
  
  539ea5eb
- Update prometheus gem to fix build on RPi · 359f41fa
  Pawel Chojnacki authored Nov 27, 2017
  
  359f41fa
- Merge branch '39601-create-issuable-destroy-service' into 'master' · a7f6ab95
  Rémy Coutable authored Nov 27, 2017
```
Create issue and merge request destroy services

Closes #39601

See merge request gitlab-org/gitlab-ce!15604
```
  a7f6ab95
- Merge branch 'patch-29' into 'master' · 24fadd7c
  Rémy Coutable authored Nov 27, 2017
```
Add in the Oxford comma

See merge request gitlab-org/gitlab-ce!15602
```
  24fadd7c
- [EE] Refactor the way we pass `old associations` to issuable's update services · b5e01ac2
  Rémy Coutable authored Nov 21, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b5e01ac2
- Merge branch 'docs-add-redis-cli' into 'master' · af687aa1
  Marin Jankovski authored Nov 27, 2017
```
Add command for starting redis-cli to HA Redis docs

See merge request gitlab-org/gitlab-ee!3546
```
  af687aa1
- Add command for starting redis-cli to HA Redis docs · b681d330
  Chenjerai Katanda authored Nov 27, 2017
  
  b681d330
- Merge branch 'ce-to-ee' into 'master' · 7c8d4edc
  Dmitriy Zaporozhets authored Nov 27, 2017
```
CE Upstream - Monday

Closes omnibus-gitlab#2988

See merge request gitlab-org/gitlab-ee!3558
```
  7c8d4edc
- Merge branch '40273_404_on_commits_page_when_all_files_on_branch_deleted' into 'master' · 8ab0fcee
  Rémy Coutable authored Nov 27, 2017
```
Fix 404 on commits list for branch that doesn't have any files

See merge request gitlab-org/gitlab-ce!15603
```
  8ab0fcee