Commits · 825be70c895365461ec618465091a09964eaf0c4 · nexedi / gitlab-ce

13 Nov, 2017 7 commits
- Merge branch 'qa/gb/rspec-decouple-test-instance-address' into 'master' · 825be70c
  Rémy Coutable authored Nov 10, 2017
```
Decouple QA test subject's address from Capybara/RSpec

Closes gitlab-qa#88

See merge request gitlab-org/gitlab-ce!15310
```
  825be70c
- Merge branch 'dz-move-ee-files' into 'master' · 2864d1d2
  Rémy Coutable authored Nov 13, 2017
```
Move EE-only controllers, helpers, models, and services to top-level ee directory

See merge request gitlab-org/gitlab-ee!3348
```
  2864d1d2
- Merge branch 'ce-to-ee' into 'master' · 2a030c97
  Dmitriy Zaporozhets authored Nov 13, 2017
```
CE upstream: Thursday

Closes gitlab-qa#87, gitaly#700, and gitlab-ce#39361

See merge request gitlab-org/gitlab-ee!3328
```
  2a030c97
- Merge branch 'fix-epic-header-spacing' into 'master' · 59adb2e6
  Filipa Lacerda authored Nov 13, 2017
```
Fix epic header spacing

See merge request gitlab-org/gitlab-ee!3357
```
  59adb2e6
- Merge branch 'squash-and-merge-commit-message-docs' into 'master' · 63bea6d6
  Sean McGivern authored Nov 13, 2017
```
Squash and merge commit message docs

See merge request gitlab-org/gitlab-ee!3362
```
  63bea6d6
- Merge remote-tracking branch 'ee-com/master' into ce-to-ee · e2a2e8c3
  Dmitriy Zaporozhets authored Nov 13, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e2a2e8c3
- Merge branch 'sh-port-ce-mr-15301' into 'master' · 2722393d
  Rémy Coutable authored Nov 13, 2017
```
Use a non-superuser user to access GitLab to ensure permissions are proper

See merge request gitlab-org/gitlab-ee!3360
```
  2722393d
12 Nov, 2017 1 commit
- Merge branch 'ee-39564-clear-filter-on-gitlab-dropdown-open' into 'master' · aa98f7c4
  Tim Zallmann authored Nov 12, 2017
```
EE clear filter on gitlab dropdown open

See merge request gitlab-org/gitlab-ee!3332
```
  aa98f7c4
11 Nov, 2017 5 commits
- Update squash_and_merge.md · 391f9fbb
  Victor Wu authored Nov 11, 2017
  
  391f9fbb
- Merge branch 'qa/gb/global-qa-scenario-arguments-ee' into 'master' · 235145e7
  Grzegorz Bizon authored Nov 11, 2017
```
Global QA scenario arguments / EE version

See merge request gitlab-org/gitlab-ee!3329
```
  235145e7
- Merge branch 'add-epic-sidebar' into 'master' · 76cca713
  Filipa Lacerda authored Nov 11, 2017
```
Add epic sidebar

Closes #3556

See merge request gitlab-org/gitlab-ee!3253
```
  76cca713
- Add epic sidebar · b42b0f97
  Clement Ho authored Nov 11, 2017
  
  b42b0f97
- Fix epic header spacing · e9ef1416
  Clement Ho authored Nov 10, 2017
  
  e9ef1416
10 Nov, 2017 27 commits
- Update CHANGELOG.md for 10.1.3 · ccb69ca0
  Felipe Artur authored Nov 10, 2017
```
[ci skip]
```
  ccb69ca0
- Update CHANGELOG-EE.md for 10.1.3-ee · fb44fac3
  Felipe Artur authored Nov 10, 2017
```
[ci skip]
```
  fb44fac3
- Merge remote-tracking branch 'origin/master' into ee-39564-clear-filter-on-gitlab-dropdown-open · 74efede7
  Luke "Jared" Bennett authored Nov 10, 2017
  
  74efede7
- Merge branch 'sh-use-non-superuser-db' into 'master' · ca2744cc
  Rémy Coutable authored Nov 10, 2017
```
Use a non-superuser user to access GitLab to ensure permissions are proper

Closes #39932

See merge request gitlab-org/gitlab-ce!15301
```
  ca2744cc
- Merge branch 'ee-issue_39773_be' into 'master' · 17547613
  Felipe Artur authored Nov 10, 2017
```
[EE-Compatibiliy] Prevent merge when fast-forward is required

See merge request gitlab-org/gitlab-ee!3352
```
  17547613
- 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
- [EE-Compatibiliy] Prevent merge when fast-forward is required · e85e9bf1
  Felipe Artur authored Nov 09, 2017
  
  e85e9bf1
- 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
- Move EE-only controllers, helpers, models and services to top-level ee directory · 8a2c4176
  Dmitriy Zaporozhets authored Nov 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8a2c4176
- 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
- Merge branch 'qa/gb/fix-bootable-scenario-arguments' into 'master' · a051190d
  Rémy Coutable authored Nov 10, 2017
```
Fix bootable scenario arguments for OptionParser

See merge request gitlab-org/gitlab-ce!15309
```
  a051190d
- 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