Commits · 9cde4f91e8f58946c8cff15de9d8be93145215b0 · nexedi / gitlab-ce

13 Nov, 2017 16 commits
- 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
- Fixed conflicts in db/schema.rb · 5ae6ca4c
  Yorick Peterse authored Nov 13, 2017
  
  5ae6ca4c
- 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 15 commits
- Update CHANGELOG.md for 10.1.3 · a978e9b9
  Felipe Artur authored Nov 10, 2017
```
[ci skip]
```
  a978e9b9
- 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 'revert-2f644452' into 'master' · e4df83d0
  Mike Greiling authored Nov 10, 2017
```
Revert "Merge branch 'add-typescript' into 'master'"

See merge request gitlab-org/gitlab-ce!15327
```
  e4df83d0
- 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
- Revert "Merge branch 'add-typescript' into 'master'" · 3093c208
  Jacob Schatz authored Nov 10, 2017
```
This reverts merge request !15264
```
  3093c208
- [EE-Compatibiliy] Prevent merge when fast-forward is required · e85e9bf1
  Felipe Artur authored Nov 09, 2017
  
  e85e9bf1
- added missing specs · 76152c0f
  Phil Hughes authored Nov 10, 2017
  
  76152c0f
- Fix permissions link for project member docs · 9fffb6e3
  Mark Fletcher authored Nov 10, 2017
  
  9fffb6e3