Commits · fc01042f716da122fcde452d9cc1f34996761810 · nexedi / gitlab-ce

14 Nov, 2017 5 commits
- Add a disable_gitaly flag for specs · fc01042f
  Kim "BKC" Carlbäcker authored Nov 14, 2017
  
  fc01042f
- skip_gitaly_mock disables Gitaly in specs · 7d2a2035
  Kim "BKC" Carlbäcker authored Nov 14, 2017
  
  7d2a2035
- Fix undefined method avatar_path in geo specs · b6c10a90
  Dmitriy Zaporozhets authored Nov 14, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b6c10a90
- Rebuild schema from db:migrate:reset · 138d0f13
  Dmitriy Zaporozhets authored Nov 14, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  138d0f13
- Fix conflict in merge_service_spec.rb · dfbfe5d0
  Felipe Artur authored Nov 14, 2017
  
  dfbfe5d0
13 Nov, 2017 25 commits
- Merge branch 'ce-to-ee' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee · cc9d3617
  Dmitriy Zaporozhets authored Nov 13, 2017
  
  cc9d3617
- Merge remote-tracking branch 'ee-com/master' into ce-to-ee · 3277e58a
  Dmitriy Zaporozhets authored Nov 13, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3277e58a
- Resolve create_new_mr_spec.rb · d837fee6
  Luke "Jared" Bennett authored Nov 13, 2017
  
  d837fee6
- Resolve conflict in spec/requests/api/services_spec.rb · 8c78d6b9
  Rémy Coutable authored Nov 13, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8c78d6b9
- Resolve conflict in scripts/prepare_build.sh · 9cde4f91
  Rémy Coutable authored Nov 13, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9cde4f91
- Merge branch 'refactor-geo-move-repository-service' into 'master' · 01932584
  Nick Thomas authored Nov 13, 2017
```
Refactor Geo::MoveRepositoryService

Closes #3950

See merge request gitlab-org/gitlab-ee!3334
```
  01932584
- Refactor Geo::MoveRepositoryService · ecc6b25a
  Douglas Barbosa Alexandre authored Nov 13, 2017
  
  ecc6b25a
- Merge branch 'qa/gb/rspec-decouple-test-instance-address-ee' into 'master' · a6356bf3
  Grzegorz Bizon authored Nov 13, 2017
```
Decouple QA test instance address - EE version

Closes gitlab-qa#88

See merge request gitlab-org/gitlab-ee!3366
```
  a6356bf3
- 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
- Fixed conflicts in db/schema.rb · 5ae6ca4c
  Yorick Peterse authored Nov 13, 2017
  
  5ae6ca4c
- 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
- Fix conflicts for: · 64e6a73b
  Filipa Lacerda authored Nov 13, 2017
```
 - app/assets/javascripts/lib/utils/text_utility.js
 - spec/javascripts/lib/utils/text_utility_spec.js
```
  64e6a73b
- Merge remote-tracking branch 'ce-com/master' into ce-to-ee · 8da939ca
  Dmitriy Zaporozhets authored Nov 13, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8da939ca
- 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 'multi-editor-store-specs' into 'master' · 9b1e9da9
  Filipa Lacerda authored Nov 13, 2017
```
Added tests to multi-file Vuex store

See merge request gitlab-org/gitlab-ce!15147
```
  9b1e9da9
- 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 'zj-move-repo-exists-opt-out' into 'master' · 3eff7b67
  Sean McGivern authored Nov 13, 2017
```
Repository Exists check is OPT_OUT for Gitaly

See merge request gitlab-org/gitlab-ce!15287
```
  3eff7b67
- 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 'update-services-api-docs-for-kubernetes' into 'master' · 95661d7b
  Douwe Maan authored Nov 13, 2017
```
Update Services API documentation for Kubernetes service

See merge request gitlab-org/gitlab-ce!15343
```
  95661d7b
- Merge branch 'text-utils' into 'master' · 00a212de
  Phil Hughes authored Nov 13, 2017
```
Export text utils as ES6 modules

Closes #40018 and #37851

See merge request gitlab-org/gitlab-ce!15320
```
  00a212de
- Export text utils as ES6 modules · 1ff3f1a4
  Filipa Lacerda authored Nov 13, 2017
  
  1ff3f1a4
- 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
- Update Services API documentation for Kubernetes service · 01e717e7
  Athar Hameed authored Nov 13, 2017
  
  01e717e7
- Merge branch 'docs-40038-broken-link-on-projects-members-documentation-site' into 'master' · c6a48f3f
  Marcia Ramos authored Nov 13, 2017
```
Fix permissions link for project member docs

Closes #40038

See merge request gitlab-org/gitlab-ce!15325
```
  c6a48f3f
12 Nov, 2017 2 commits
- Merge branch '39564-clear-filter-on-gitlab-dropdown-open' into 'master' · 111faddc
  Tim Zallmann authored Nov 12, 2017
```
Clear filter on gl_dropdown open

Closes #39564

See merge request gitlab-org/gitlab-ce!15214
```
  111faddc
- 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 7 commits
- Update squash_and_merge.md · 391f9fbb
  Victor Wu authored Nov 11, 2017
  
  391f9fbb
- Merge branch 'qa/gb/fix-page-refresh-address' into 'master' · d180affa
  Grzegorz Bizon authored Nov 11, 2017
```
Fix QA page refresh address by using absolute URLs

Closes gitlab-qa#99

See merge request gitlab-org/gitlab-ce!15338
```
  d180affa
- 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
- Fix QA page refresh address by using absolute URLs · 461b6f32
  Grzegorz Bizon authored Nov 11, 2017
```
This makes QA page refresh address to be absolute URL since we dropped
`Capybara.app_host`, thus there is no support for relative URLs with
`visit` now.
```
  461b6f32
- 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 1 commit
- Update CHANGELOG.md for 10.1.3 · a978e9b9
  Felipe Artur authored Nov 10, 2017
```
[ci skip]
```
  a978e9b9