Commits · 4cffe652c607a016cb15530e672d59e106fac168 · nexedi / gitlab-ce

11 Apr, 2019 40 commits
- Merge branch 'sh-fix-snowplow-js' into 'master' · 4cffe652
  Clement Ho authored Apr 11, 2019
```
Add missing quotes in Snowplow integration

Closes gitlab-ce#60421

See merge request gitlab-org/gitlab-ee!10820
```
  4cffe652
- Merge branch... · 1d2ba80c
  Fatih Acet authored Apr 11, 2019
```
Merge branch '10015-move-ee-differences-for-app-assets-javascripts-boards-models-milestone-js' into 'master'

Resolve "Move EE differences for `app/assets/javascripts/boards/models/milestone.js`"

Closes #10015

See merge request gitlab-org/gitlab-ee!10774
```
  1d2ba80c
- Automatic merge of gitlab-org/gitlab-ce master · 1c08b121
  GitLab Bot authored Apr 11, 2019
  
  1c08b121
- Merge branch 'winh-notes_spec-timeout' into 'master' · 396379d8
  Fatih Acet authored Apr 11, 2019
```
Increase timeout for notes_spec.js

See merge request gitlab-org/gitlab-ce!27270
```
  396379d8
- Merge branch '11000-geo-implement-selective-sync-support-for-the-uploads-fdw-queries' into 'master' · 3bab1067
  Michael Kozono authored Apr 11, 2019
```
Geo - Refactor FDW queries in the Geo::ExpireUploadsFinder

Closes #11000

See merge request gitlab-org/gitlab-ee!10654
```
  3bab1067
- Merge branch 'winh-i18n-scoped-label-help-text' into 'master' · 9f1c187d
  Fatih Acet authored Apr 11, 2019
```
Make scoped label help text translatable

See merge request gitlab-org/gitlab-ee!10771
```
  9f1c187d
- Make scoped label help text translatable · aefe31b3
  Winnie Hellmann authored Apr 11, 2019
  
  aefe31b3
- Add missing quotes in Snowplow integration · 37c2385c
  Stan Hu authored Apr 11, 2019
```
This was causing a "Uncaught ReferenceError: cf is not defined" in the
JavaScript console.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60421
```
  37c2385c
- Merge branch 'winh-hide-scoped-labels-message-ee' into 'master' · 9886230b
  James Lopez authored Apr 11, 2019
```
Hide scoped labels help text without corresponding license

Closes #11095

See merge request gitlab-org/gitlab-ee!10737
```
  9886230b
- Hide scoped labels help text without corresponding license · dd6b4227
  Winnie Hellmann authored Apr 11, 2019
  
  dd6b4227
- Automatic merge of gitlab-org/gitlab-ce master · e2b21a24
  GitLab Bot authored Apr 11, 2019
  
  e2b21a24
- Merge branch 'proj-settings-ok-leftovers' into 'master' · e605d8c9
  Clement Ho authored Apr 11, 2019
```
CE Improve project settings page (leftovers)

See merge request gitlab-org/gitlab-ce!27078
```
  e605d8c9
- Update project settings qa selectors · e690fccb
  Sanad Liaquat authored Mar 22, 2019
```
Additionally fixes geo rename test.
```
  e690fccb
- Improve project settings page · b7f76383
  Luke Bennett authored Mar 14, 2019
```
Prioritize and simplify project settings content.
```
  b7f76383
- Automatic merge of gitlab-org/gitlab-ce master · 5174acf2
  GitLab Bot authored Apr 11, 2019
  
  5174acf2
- Merge branch 'ee-proj-settings-ok-leftovers' into 'master' · c2f8bdc7
  Clement Ho authored Apr 11, 2019
```
Improve project settings page (leftovers)

See merge request gitlab-org/gitlab-ee!10630
```
  c2f8bdc7
- Update CHANGELOG.md for 11.9.8 · dc884879
  GitLab Release Tools Bot authored Apr 11, 2019
```
[ci skip]
```
  dc884879
- Update CHANGELOG.md for 11.9.8 · 51eb9527
  GitLab Release Tools Bot authored Apr 11, 2019
```
[ci skip]
```
  51eb9527
- Update CHANGELOG-EE.md for 11.9.8-ee · 6ce0dd17
  GitLab Release Tools Bot authored Apr 11, 2019
```
[ci skip]
```
  6ce0dd17
- Automatic merge of gitlab-org/gitlab-ce master · da45e5bd
  GitLab Bot authored Apr 11, 2019
  
  da45e5bd
- Merge branch 'patch-31' into 'master' · ff4cc944
  Stan Hu authored Apr 11, 2019
```
Add missing provider_unauthorized method to import_github.rb

Closes #60347

See merge request gitlab-org/gitlab-ce!27218
```
  ff4cc944
- Automatic merge of gitlab-org/gitlab-ce master · 3ac0fa9d
  GitLab Bot authored Apr 11, 2019
  
  3ac0fa9d
- Merge branch 'fj-bump-workhorse-version-8-6-0' into 'master' · fac27e4a
  Nick Thomas authored Apr 11, 2019
```
Update GitLab Workhorse to v8.6.0

See merge request gitlab-org/gitlab-ce!27260
```
  fac27e4a
- Update GitLab Workhorse to v8.6.0 · 704d183f
  Francisco Javier López authored Apr 11, 2019
  
  704d183f
- Merge branch '60398-increase-timeouts-clusters-bundle' into 'master' · 7ae49f3c
  Phil Hughes authored Apr 11, 2019
```
Increase clusters bundle specs timeout

Closes #60398

See merge request gitlab-org/gitlab-ce!27269
```
  7ae49f3c
- Merge branch '60304-long-file-names-in-mr-diffs-cause-horizontal-scrolling' into 'master' · 225ddd14
  Annabel Dunstone Gray authored Apr 11, 2019
```
Resolve "Long file names in MR diffs cause horizontal scrolling"

Closes #60304

See merge request gitlab-org/gitlab-ce!27233
```
  225ddd14
- Merge branch 'ee-run-quarantine-on-master-and-schedules-only' into 'master' · 9098acf8
  Lin Jen-Shin authored Apr 11, 2019
```
Run MySQL and quarantined tests on master and schedules only

See merge request gitlab-org/gitlab-ee!10777
```
  9098acf8
- Increase timeout for notes_spec.js · 4cbca338
  Winnie Hellmann authored Apr 11, 2019
  
  4cbca338
- Added ifEE guard for EE specific parts of board milestone model · e65987d2
  Constance Okoghenun authored Apr 11, 2019
  
  e65987d2
- Merge branch 'add-correct-link-to-license' into 'master' · f6e7ffe1
  Phil Hughes authored Apr 11, 2019
```
Added correct link to licensing page

See merge request gitlab-org/gitlab-ee!10576
```
  f6e7ffe1
- Increase clusters bundle specs timeout · 4722b852
  Enrique Alcantara authored Apr 11, 2019
  
  4722b852
- Merge branch 'dz-registry-proxy-db' into 'master' · 78c549d2
  Andreas Brandl authored Apr 11, 2019
```
Create tables for dependency proxy feature

See merge request gitlab-org/gitlab-ee!10676
```
  78c549d2
- Merge branch 'restore-hipchat' into 'master' · 0276b868
  Nick Thomas authored Apr 11, 2019
```
Revert "Remove HipChat integration from GitLab"

Closes #60042

See merge request gitlab-org/gitlab-ce!27172
```
  0276b868
- Merge branch 'restore-hipchat' into 'master' · 029ff351
  Nick Thomas authored Apr 11, 2019
```
Revert "Remove HipChat integration from GitLab"

See merge request gitlab-org/gitlab-ee!10677
```
  029ff351
- Automatic merge of gitlab-org/gitlab-ce master · 81f917ce
  GitLab Bot authored Apr 11, 2019
  
  81f917ce
- Create tables for dependency proxy feature · 6343c1d2
  Dmitriy Zaporozhets authored Apr 09, 2019
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6343c1d2
- Merge branch 'qa-staging-53-quarantine-issue-suggesstions-spec' into 'master' · ec780444
  Rémy Coutable authored Apr 11, 2019
```
Quarantine Issue suggestions spec

See merge request gitlab-org/gitlab-ce!27259
```
  ec780444
- Automatic merge of gitlab-org/gitlab-ce master · 6ba3360d
  GitLab Bot authored Apr 11, 2019
  
  6ba3360d
- Merge branch 'docs/repo-mirrors-and-sidekiq' into 'master' · 09b4bac6
  Achilleas Pipinellis authored Apr 11, 2019
```
Better documentation on repo mirroring enqueuing

Closes gitlab-ee#10345

See merge request gitlab-org/gitlab-ce!27093
```
  09b4bac6
- Better documentation on repo mirroring enqueuing · cd1ad2b1
  Evan Read authored Apr 11, 2019
  
  cd1ad2b1