Commits · d482a08e1a253d7e02b972c4d12aed2f6f9619fd · nexedi / gitlab-ce

10 Nov, 2017 11 commits
- 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
- 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
09 Nov, 2017 18 commits
- 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
- 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
- Re-enable some Geo specs · 7ce43dad
  Nick Thomas authored Nov 08, 2017
  
  7ce43dad
- Merge branch '3965-fix-order-dependency-in-specs' into 'master' · 1f298fc4
  Douwe Maan authored Nov 09, 2017
```
Fix a spec to avoid writing to prometheus

Closes #3965

See merge request gitlab-org/gitlab-ee!3324
```
  1f298fc4
- Fix a spec to avoid writing to prometheus · 543aed6f
  Nick Thomas authored Nov 09, 2017
  
  543aed6f
- Merge branch 'ce-to-ee-2017-11-08' into 'master' · 4980f36e
  Rémy Coutable authored Nov 09, 2017
```
CE upstream - Wednesday

Closes gitlab-ce#39732, gitlab-ce#39798, gitlab-ce#38372 et gitlab-ce#39377

See merge request gitlab-org/gitlab-ee!3308
```
  4980f36e
- Merge branch 'mk-backport-security-fixes-to-master' into 'master' · 19df69b2
  Douwe Maan authored Nov 09, 2017
```
Backport 10.1.2 security fixes to master

See merge request gitlab-org/gitlab-ee!3318
```
  19df69b2
- Merge branch '3787-expire-geo-jwts' into 'security-10-1-ee' · d55e091e
  Stan Hu authored Oct 27, 2017
```
Include standard JWT claims in Geo JWTs [10.1]

See merge request gitlab/gitlab-ee!554

(cherry picked from commit 676a194bf27facbb431abf6e9fa57ea6ad29af42)

f2e5dee8 Include standard JWT claims in Geo JWTs
```
  d55e091e
- Merge 10-1-stable into 10-1-stable-ee · fef0f650
  Winnie Hellmann authored Nov 07, 2017
  
  fef0f650
- Fix specs failing because of issuable usage · 2e071d4b
  Jarka Kadlecova authored Nov 09, 2017
  
  2e071d4b
08 Nov, 2017 11 commits
- Merge branch '1745-document-geo-postgres-ssl' into 'master' · c943ef46
  Stan Hu authored Nov 08, 2017
```
Document securing Geo database replication with SSL

Closes #1745

See merge request gitlab-org/gitlab-ee!3284
```
  c943ef46
- Document securing Geo database replication with SSL · 1d8b474d
  Nick Thomas authored Nov 08, 2017
  
  1d8b474d
- Merge branch 'docs/fix-jobs-api-example-request' into 'master' · f60f31d7
  Marcia Ramos authored Nov 08, 2017
```
Fix example request in jobs API docs

Closes gitlab-ce#39901

See merge request gitlab-org/gitlab-ee!3314
```
  f60f31d7
- Merge branch 'fix-mysql-grant-check' into 'master' · 667be38d
  Rémy Coutable authored Nov 07, 2017
```
Fix TRIGGER checks for MySQL

Closes #38372

See merge request gitlab-org/gitlab-ce!15226
```
  667be38d
- Update CHANGELOG.md for 9.5.10 · 50922e4a
  Winnie Hellmann authored Nov 08, 2017
```
[ci skip]
```
  50922e4a
- Update CHANGELOG-EE.md for 9.5.10-ee · 3435afd0
  Winnie Hellmann authored Nov 08, 2017
```
[ci skip]
```
  3435afd0
- Adjust wrong conflict resolution in Groups::EpicsController#show (complement of 5e49495b ) · 106f039e
  Oswaldo Ferreira authored Nov 08, 2017
  
  106f039e
- Merge branch 'sh-geo-node-status-api-docs' into 'master' · 49a2f7e0
  Achilleas Pipinellis authored Nov 08, 2017
```
Add documentation for retrieving Geo nodes and status via API

See merge request gitlab-org/gitlab-ee!3304
```
  49a2f7e0
- Adjust stub_kubeclient_discover method call without argument · 35456c15
  Oswaldo Ferreira authored Nov 08, 2017
  
  35456c15
- Adjust wrong conflict resolution in Groups::EpicsController#show · 5e49495b
  Oswaldo Ferreira authored Nov 08, 2017
  
  5e49495b
- Remove duplicated background-color definition · 10be501b
  Oswaldo Ferreira authored Nov 08, 2017
  
  10be501b