Commits · 0f31c32c6c44760276070b255b2318c2337487fc · nexedi / gitlab-ce

10 Nov, 2017 23 commits
- Merge branch 'master' into ce-to-ee · 0f31c32c
  Nick Thomas authored Nov 10, 2017
  
  0f31c32c
- Merge branch 'mk-update-changelogs' into 'master' · 26a147d3
  Stan Hu authored Nov 10, 2017
```
Update changelogs for 10.1.2 on master

See merge request gitlab-org/gitlab-ee!3340
```
  26a147d3
- Remove CE changes from CHANGELOG-EE.md · 629af992
  Michael Kozono authored Nov 10, 2017
  
  629af992
- Merge branch '3974-fix-codeclimate-margins' into 'master' · 9ff87aa0
  Tim Zallmann authored Nov 10, 2017
```
Fix margins in code quality widget

Closes #3974

See merge request gitlab-org/gitlab-ee!3338
```
  9ff87aa0
- Merge branch 'winh-update-10-2-ee-docs' into 'master' · b1a2b6c2
  Oswaldo Ferreira authored Nov 10, 2017
```
Add Update guide for 10.2 EE

See merge request gitlab-org/gitlab-ee!3346
```
  b1a2b6c2
- Add Update guide for 10.2 EE · 55dfbf47
  Winnie Hellmann authored Nov 10, 2017
  
  55dfbf47
- Merge branch 'da-fix-broken-spec' into 'master' · f9ab7db3
  Dmitriy Zaporozhets authored Nov 10, 2017
```
Fix broken Geo::HashedStorageMigratedEventStore spec

See merge request gitlab-org/gitlab-ee!3351
```
  f9ab7db3
- Merge branch 'master' into ce-to-ee · 70a950f7
  Nick Thomas authored Nov 10, 2017
  
  70a950f7
- Merge branch 'winh-ce-to-ee-10-2-docs' into 'master' · f8c91d00
  Oswaldo Ferreira authored Nov 10, 2017
```
Add CE to EE guide for 10.2

See merge request gitlab-org/gitlab-ee!3347
```
  f8c91d00
- Merge branch 'sh-fix-issue-3987' into 'master' · d482a08e
  Tim Zallmann authored Nov 10, 2017
```
Fix Geo Node admin screen no longer displaying data

Closes #3987

See merge request gitlab-org/gitlab-ee!3344
```
  d482a08e
- Fix broken spec · 6e097e2d
  Douglas Barbosa Alexandre authored Nov 10, 2017
  
  6e097e2d
- Add CE to EE guide for 10.2 · baa904be
  Winnie Hellmann authored Nov 10, 2017
  
  baa904be
- Merge branch 'dz-move-ee-views' into 'master' · 01707755
  Dmitriy Zaporozhets authored Nov 10, 2017
```
Move some ee-only views to top-level /ee directory

See merge request gitlab-org/gitlab-ee!3337
```
  01707755
- Merge branch 'dz-move-ee-project-controllers' into 'master' · ae3e5fd6
  Dmitriy Zaporozhets authored Nov 10, 2017
```
Move ee-only project controllers to top-level ee directory

See merge request gitlab-org/gitlab-ee!3336
```
  ae3e5fd6
- Merge branch 'dz-move-ee-group-controllers' into 'master' · c89afa8a
  Dmitriy Zaporozhets authored Nov 10, 2017
```
Move ee-only group controllers to top-level ee directory

See merge request gitlab-org/gitlab-ee!3335
```
  c89afa8a
- Merge remote-tracking branch 'dev.gitlab.org/master' · 9c2f7cd0
  Winnie Hellmann authored Nov 10, 2017
  
  9c2f7cd0
- Merge branch 'dz-move-ee-admin-controllers' into 'master' · 997b0218
  Dmitriy Zaporozhets authored Nov 10, 2017
```
Move EE-only /admin controllers under top level /ee directory

See merge request gitlab-org/gitlab-ee!3331
```
  997b0218
- Fix eslint issues with app/assets/javascripts/geo_nodes.js · fc1447b0
  Stan Hu authored Nov 09, 2017
  
  fc1447b0
- Fix Geo Node admin screen no longer displaying data · e3c1885b
  Stan Hu authored Nov 09, 2017
```
As a result of f3ae99fa, SmartInterval was refactored to use a Promised-based
callback.

This MR also fixes a bug where objects were always showing "Not Available".

Closes #3987
```
  e3c1885b
- Merge branch 'dba-fix-nil-status-count' into 'master' · 49a9bdbb
  Stan Hu authored Nov 10, 2017
```
Geo: Fix handling of nil values in advanced section on admin screen

See merge request gitlab-org/gitlab-ee!3343
```
  49a9bdbb
- Add CHANGELOG · 160baed5
  Douglas Barbosa Alexandre authored Nov 09, 2017
  
  160baed5
- Geo: Fix handling of nil values on advanced section in admin screen · 9290380c
  Douglas Barbosa Alexandre authored Nov 09, 2017
  
  9290380c
- Remove released changelog entry · 070c107c
  Michael Kozono authored Nov 09, 2017
  
  070c107c
09 Nov, 2017 17 commits
- Remove bottom space · 3b2f53ce
  Filipa Lacerda authored Nov 09, 2017
  
  3b2f53ce
- Add security fixes to CHANGELOG-EE.md · b011ffe8
  Michael Kozono authored Nov 09, 2017
  
  b011ffe8
- Merge branch 'mk-add-security-fixes-to-changelog-10-1-stable' into '10-1-stable' · 00fc016b
  Stan Hu authored Nov 09, 2017
```
Add 10.1.2 security fixes to CHANGELOG.md

See merge request gitlab-org/gitlab-ce!15302
```
  00fc016b
- Fix margins in code quality widget · cd5ee667
  Filipa Lacerda authored Nov 09, 2017
  
  cd5ee667
- Merge branch '39958-updatemergerequestsworker-are-failing-on-metric-tagging' into 'master' · a18b06c1
  Sean McGivern authored Nov 09, 2017
```
Revert "add metrics tagging to the sidekiq middleware"

Closes #39958

See merge request gitlab-org/gitlab-ce!15285
```
  a18b06c1
- Move some ee-only views to top-level /ee directory · 65f12538
  Dmitriy Zaporozhets authored Nov 09, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  65f12538
- Move EE-only /admin controllers under top level /ee directory · f54d885d
  Dmitriy Zaporozhets authored Nov 09, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f54d885d
- Move ee-only group controllers to top-level ee directory · b8741880
  Dmitriy Zaporozhets authored Nov 09, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b8741880
- Move ee-only project controllers to top-level ee directory · 945948e9
  Dmitriy Zaporozhets authored Nov 09, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  945948e9
- Merge branch 'fix-api_spec-ee-master-failure' into 'master' · 4aba9f8e
  Jacob Schatz authored Nov 09, 2017
```
Fix api_spec failure

Closes #3964

See merge request gitlab-org/gitlab-ee!3315
```
  4aba9f8e
- Fix api_spec failure · 182642b3
  Luke "Jared" Bennett authored Nov 09, 2017
  
  182642b3
- [ci skip] Fix conflicts for: · 520c2817
  Filipa Lacerda authored Nov 09, 2017
```
- app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
- spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
```
  520c2817
- Merge branch 'winh-subgroups-api-ee' into 'master' · a72e2f4e
  Rémy Coutable authored Nov 09, 2017
```
Add /groups/:id/subgroups endpoint to API

Closes gitlab-ce#32652

See merge request gitlab-org/gitlab-ee!3327
```
  a72e2f4e
- Add /groups/:id/subgroups endpoint to API · 6a1c59ce
  Winnie Hellmann authored Nov 09, 2017
  
  6a1c59ce
- Merge branch '3923-restore-geo-specs' into 'master' · b06eb880
  Douwe Maan authored Nov 09, 2017
```
Re-enable some Geo specs

Closes #3923

See merge request gitlab-org/gitlab-ee!3312
```
  b06eb880
- Resolved GH importer conflicts · 517f4257
  Yorick Peterse authored Nov 09, 2017
  
  517f4257
- CE->EE: Fix conflicts · d6d04136
  Nick Thomas authored Nov 09, 2017
  
  d6d04136