Commits · 3c9756ec7e02b0b12ff554bd621018a4aaa090f9 · nexedi / gitlab-ce

13 Nov, 2017 3 commits
- Add internationalization to empty epics page · 3c9756ec
  Clement Ho authored Nov 13, 2017
  
  3c9756ec
- Fix specs, add issue number to TODOs comments · 7459f48a
  Jarka Kadlecova authored Nov 13, 2017
  
  7459f48a
- Make issuable nav more readable · f8450992
  Clement Ho authored Nov 13, 2017
  
  f8450992
10 Nov, 2017 28 commits
- Merge branch 'master' into 3553-epics-list · c49ae5bc
  Clement Ho authored Nov 10, 2017
  
  c49ae5bc
- 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 '3553-epics-list' of gitlab.com:gitlab-org/gitlab-ee into 3553-epics-list · 3e2ec21f
  Clement Ho authored Nov 10, 2017
  
  3e2ec21f
- Update empty state copy · be62a39d
  Clement Ho authored Nov 10, 2017
  
  be62a39d
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into 3553-epics-list · ffd414c9
  Jarka Kadlecova authored Nov 10, 2017
```
# Conflicts:
#	app/controllers/concerns/issuable_actions.rb
#	app/controllers/projects/issues_controller.rb
#	app/models/merge_request.rb
#	ee/app/controllers/ee/projects/issues_controller.rb
```
  ffd414c9
- 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
- Fix the comment · cb086b9b
  Jarka Kadlecova authored Nov 10, 2017
  
  cb086b9b
- Remove todos · 5a47dc8d
  Clement Ho authored Nov 10, 2017
  
  5a47dc8d
- Merge branch '3553-epics-list' of gitlab.com:gitlab-org/gitlab-ee into 3553-epics-list · 8c90d212
  Clement Ho authored Nov 10, 2017
  
  8c90d212
- Set all state as default for epics · 4f599491
  Jarka Kadlecova authored Nov 10, 2017
  
  4f599491
- Use state all as default · 74ed5688
  Jarka Kadlecova authored Nov 10, 2017
  
  74ed5688
- Include opened state in the counts for epics · 0e913fbc
  Jarka Kadlecova authored Nov 10, 2017
  
  0e913fbc
- 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
- uncomment nav state · 5cf10e2f
  Clement Ho authored Nov 09, 2017
  
  5cf10e2f
- 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 9 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
- Add count_by_state method · db7b066d
  Jarka Kadlecova authored Nov 09, 2017
  
  db7b066d
- Add changelog · a7c16f68
  Clement Ho authored Nov 09, 2017
  
  a7c16f68