Commits · d57d97ba24269f91070453ea5857e374995a574d · nexedi / gitlab-ce

17 Oct, 2018 3 commits
- Fix failing spec for URL paths in issue_builder_spec.rb · d57d97ba
  Stan Hu authored Oct 16, 2018
```
The release-bot merged !7957 by accident, which broke master.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8024
```
  d57d97ba
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-17 · 3b0aa265
  GitLab Bot authored Oct 17, 2018
  
  3b0aa265
- Merge branch 'ce-to-ee-2018-10-16' into 'master' · 8b077edc
  Stan Hu authored Oct 17, 2018
```
CE upstream - 2018-10-16 22:21 UTC

See merge request gitlab-org/gitlab-ee!7959
```
  8b077edc
16 Oct, 2018 37 commits
- Merge branch 'prettify-all-the-things-8' into 'master' · 28d412e5
  Fatih Acet authored Oct 16, 2018
```
Prettify all the things (part 8)

See merge request gitlab-org/gitlab-ce!22258
```
  28d412e5
- Merge branch 'prettify-all-the-things-1' into 'master' · 10cc335c
  Fatih Acet authored Oct 16, 2018
```
Prettify all the things (part 1)

See merge request gitlab-org/gitlab-ce!22248
```
  10cc335c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-16 · 77a6146f
  GitLab Bot authored Oct 16, 2018
  
  77a6146f
- Merge branch '49740-share-frontend-configs-between-repos' into 'master' · 68eafa50
  Clement Ho authored Oct 16, 2018
```
Resolve "Share frontend configs between repos"

Closes #49740

See merge request gitlab-org/gitlab-ce!22405
```
  68eafa50
- Merge branch '51712-no-promise-without-done-fail' into 'master' · 7b37794a
  Mike Greiling authored Oct 16, 2018
```
2. enable jasmine/no-promise-without-done-fail

See merge request gitlab-org/gitlab-ce!22231
```
  7b37794a
- Merge branch '51712-no-promise-without-done-fail-ee' into 'master' · a03b58bf
  Mike Greiling authored Oct 16, 2018
```
2. enable jasmine/no-promise-without-done-fail

See merge request gitlab-org/gitlab-ee!7872
```
  a03b58bf
- Merge branch 'ce-to-ee-2018-10-16' into 'master' · 0b7f1313
  🤖 GitLab Bot 🤖 authored Oct 16, 2018
```
CE upstream - 2018-10-16 21:51 UTC

Closes gitlab-ce#50903

See merge request gitlab-org/gitlab-ee!7957
```
  0b7f1313
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-16 · 1082361a
  GitLab Bot authored Oct 16, 2018
  
  1082361a
- Merge branch 'ce-to-ee-2018-10-16' into 'master' · 9ad5803b
  Stan Hu authored Oct 16, 2018
```
CE upstream - 2018-10-16 18:21 UTC

Closes gitlab-ce#52487

See merge request gitlab-org/gitlab-ee!7955
```
  9ad5803b
- Use @gitlab/eslint-config as base in eslintrc · a001069f
  Mike Greiling authored Oct 16, 2018
  
  a001069f
- Add missing js-reports-container to EE version of mr_widget_options.vue · a4411a75
  Winnie Hellmann authored Oct 16, 2018
```
This is the EE-port of 5ea377a4
```
  a4411a75
- enable jasmine/no-promise-without-done-fail · 3efa2e17
  Johann Hubert Sonntagbauer authored Oct 10, 2018
  
  3efa2e17
- enable jasmine/no-promise-without-done-fail · 0fd203ba
  Johann Hubert Sonntagbauer authored Oct 09, 2018
  
  0fd203ba
- Merge branch 'fix-review-link-docs' into 'master' · d87e88a6
  Douwe Maan authored Oct 16, 2018
```
Fix "ready for review" link

See merge request gitlab-org/gitlab-ce!22393
```
  d87e88a6
- Merge branch 'sh-fix-commit-signatures-error' into 'master' · 69c7d48e
  Douwe Maan authored Oct 16, 2018
```
Fix commit signature error when project is disabled

Closes #50903

See merge request gitlab-org/gitlab-ce!22344
```
  69c7d48e
- Merge branch '52650-webhook-image-urls-rewritten-incorrectly-in-issues' into 'master' · 4f475b81
  Douwe Maan authored Oct 16, 2018
```
Resolve "Webhook Image URLs Rewritten Incorrectly in Issues"

Closes #52650

See merge request gitlab-org/gitlab-ce!22361
```
  4f475b81
- Resolve more conflicts in Gemfile.rails5.lock · 2f252545
  Stan Hu authored Oct 16, 2018
  
  2f252545
- Resolve more conflicts in Gemfile.lock · 2ec6fffd
  Stan Hu authored Oct 16, 2018
  
  2ec6fffd
- Merge branch 'prettify-all-the-things-6' into 'master' · 1dfecf3e
  Fatih Acet authored Oct 16, 2018
```
Prettify all the things (part 6)

See merge request gitlab-org/gitlab-ce!22256
```
  1dfecf3e
- Resolve conflicts in app/assets/javascripts/environments/components/environment_item.vue · fcd5878c
  Stan Hu authored Oct 16, 2018
  
  fcd5878c
- Resolve conflicts in app/assets/javascripts/boards/components/issue_card_inner.vue · 5ecefc54
  Stan Hu authored Oct 16, 2018
  
  5ecefc54
- Resolve conflicts in Gemfile.rails5.lock · 8a4fd538
  Stan Hu authored Oct 16, 2018
  
  8a4fd538
- Resolve conflicts in Gemfile.lock · 719b42b7
  Stan Hu authored Oct 16, 2018
  
  719b42b7
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-16 · 1181a3b3
  GitLab Bot authored Oct 16, 2018
```
# Conflicts:
#	Gemfile.lock
#	Gemfile.rails5.lock
#	app/assets/javascripts/boards/components/issue_card_inner.vue
#	app/assets/javascripts/environments/components/environment_item.vue

[ci skip]
```
  1181a3b3
- Merge branch 'ce-to-ee-2018-10-15' into 'master' · bbcacef1
  Stan Hu authored Oct 16, 2018
```
CE upstream - 2018-10-15 17:21 UTC

Closes gitlab-ce#39697

See merge request gitlab-org/gitlab-ee!7938
```
  bbcacef1
- Prettify additional modules (I through Z) · c559bcca
  Mike Greiling authored Oct 10, 2018
  
  c559bcca
- Fix Gitlab::BlobHelper load dependencies for elastic_repo_indexer · 65767695
  Stan Hu authored Oct 16, 2018
  
  65767695
- Merge branch '52147-loading-state' into 'master' · 3e3f8ac8
  Mike Greiling authored Oct 16, 2018
```
Fixes styling issues in test reports

Closes #51386 and #52147

See merge request gitlab-org/gitlab-ce!22204
```
  3e3f8ac8
- Merge branch '52686-project-slug-does-not-auto-populate-in-ie11' into 'master' · 1dae485c
  Mike Greiling authored Oct 16, 2018
```
Resolve "Project slug does not auto populate in IE11"

Closes #52686

See merge request gitlab-org/gitlab-ce!22367
```
  1dae485c
- Prettify environments feature_highlight and filtered_search modules · 8b090caf
  Mike Greiling authored Oct 10, 2018
  
  8b090caf
- Prettify diff_notes diffs and droplab modules · 4d0db16f
  Mike Greiling authored Oct 10, 2018
  
  4d0db16f
- Prettify blob behaviors and cycle_analytics modules · 7fd4e21c
  Mike Greiling authored Oct 10, 2018
  
  7fd4e21c
- Merge branch 'test-usage-ping-in-timeout-case' into 'master' · 65f2e955
  Robert Speicher authored Oct 16, 2018
```
Verify that usage ping works when all counts time out

See merge request gitlab-org/gitlab-ce!22358
```
  65f2e955
- Merge branch 'test-usage-ping-in-timeout-case' into 'master' · 45707e68
  Robert Speicher authored Oct 16, 2018
```
Verify that usage ping works when all counts time out

See merge request gitlab-org/gitlab-ee!7926
```
  45707e68
- Add scope to fix namespace issues with Gitlab::BlobHelper · 2dc3c86d
  Stan Hu authored Oct 16, 2018
  
  2dc3c86d
- Merge branch 'qa-handle-sign-up-with-terms' into 'master' · aeaf6686
  Nick Thomas authored Oct 16, 2018
```
[QA] Handle sign-up when terms must be accepted

See merge request gitlab-org/gitlab-ce!22374
```
  aeaf6686
- Merge branch 'master' into ce-to-ee-2018-10-15 · 78c30dfd
  Stan Hu authored Oct 16, 2018
  
  78c30dfd