Commits · ab28f5981996e43edef911debde2567bbd62e9ec · nexedi / gitlab-ce

20 Jul, 2018 40 commits
- Merge branch... · ab28f598
  Robert Speicher authored Jul 20, 2018
```
Merge branch '6104-extract-ee-specific-files-lines-for-some-platform-related-project-views' into 'master'

[EE] Resolve "Extract EE specific files/lines for some platform related project views"

See merge request gitlab-org/gitlab-ee!6133
```
  ab28f598
- Merge branch 'sh-move-json-logger' into 'master' · 631b3ee8
  Robert Speicher authored Jul 20, 2018
```
Move JsonLogger to CE and add spec

See merge request gitlab-org/gitlab-ee!6616
```
  631b3ee8
- Merge branch '3871-move-ee-javascript-specs-2' into 'master' · ce19ba6a
  Mike Greiling authored Jul 20, 2018
```
Move EE only files in spec/javascripts/boards

See merge request gitlab-org/gitlab-ee!6606
```
  ce19ba6a
- Merge branch 'ce-to-ee-2018-07-20' into 'master' · 75a98f4d
  Stan Hu authored Jul 20, 2018
```
CE upstream - 2018-07-20 18:21 UTC

See merge request gitlab-org/gitlab-ee!6618
```
  75a98f4d
- Merge branch 'ee-47530-replace-label-light-with-label-bold' into 'master' · b11368ca
  Clement Ho authored Jul 20, 2018
```
Replace label-light with label-bold. Because it's bold, not light

See merge request gitlab-org/gitlab-ee!6612
```
  b11368ca
- Merge branch '6963-pod-log-mobile' into 'master' · f7fca937
  Clement Ho authored Jul 20, 2018
```
Resolve "Mobile view for pod logs has an alignment issue"

Closes #6963

See merge request gitlab-org/gitlab-ee!6597
```
  f7fca937
- Resolve "Mobile view for pod logs has an alignment issue" · 268d337a
  Annabel Gray authored Jul 20, 2018
  
  268d337a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-20 · ead3d151
  GitLab Bot authored Jul 20, 2018
  
  ead3d151
- Move JsonLogger to CE and add spec · 03091781
  Stan Hu authored Jul 20, 2018
  
  03091781
- Merge branch 'ce-to-ee-2018-07-20' into 'master' · 97f71f5b
  Filipa Lacerda authored Jul 20, 2018
```
CE upstream - 2018-07-20 15:21 UTC

Closes gitaly#1106

See merge request gitlab-org/gitlab-ee!6613
```
  97f71f5b
- Merge branch '5594-geo-add-repository-verification-failures-to-api' into 'master' · 16118bef
  Douglas Barbosa Alexandre authored Jul 20, 2018
```
Resolve "Geo: Add repository verification failures to API"

Closes #5594

See merge request gitlab-org/gitlab-ee!6137
```
  16118bef
- Resolve "Geo: Add repository verification failures to API" · bf30d258
  Valery Sizov authored Jul 20, 2018
  
  bf30d258
- Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master' · ced005f3
  Filipa Lacerda authored Jul 20, 2018
```
Resolve ""Jump to first/next unresolved discussion" jumps to resolved discussions"

Closes #48817 and #48602

See merge request gitlab-org/gitlab-ce!20434
```
  ced005f3
- Resolve ""Jump to first/next unresolved discussion" jumps to resolved discussions" · f2f8ddf4
  André Luís authored Jul 20, 2018
  
  f2f8ddf4
- Merge branch 'jupyter-image' into 'master' · 9b01b293
  Dmitriy Zaporozhets authored Jul 20, 2018
```
Specify Jupyter Image to use with JupyterHub Installation

See merge request gitlab-org/gitlab-ce!20714
```
  9b01b293
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-20 · 2731c9e1
  GitLab Bot authored Jul 20, 2018
  
  2731c9e1
- Better chengelog for jupyter image change · f22a7340
  Amit Rathi authored Jul 20, 2018
  
  f22a7340
- Replace label-light with label-bold. Because it's bold, not light · db704770
  Annabel Dunstone Gray authored Jul 20, 2018
  
  db704770
- Merge branch 'dennis-move-droplab-filtered-search-ee-features' into 'master' · 50a8acda
  Fatih Acet authored Jul 20, 2018
```
move EE-only droplab/filtered search features to ee/

See merge request gitlab-org/gitlab-ee!6610
```
  50a8acda
- Move EE only JS specs for spec/javascripts/boards · 9b84f923
  Lin Jen-Shin authored Jul 20, 2018
  
  9b84f923
- Merge branch 'change-discussion-label-to-plan-label' into 'master' · d15309ca
  Sean McGivern authored Jul 20, 2018
```
Change Discussion label to Plan label and add Create label

See merge request gitlab-org/gitlab-ce!20717
```
  d15309ca
- Change Discussion label to Plan label and add Create label · c62d542b
  Victor Wu authored Jul 20, 2018
  
  c62d542b
- Merge branch '45443-unable-to-save-user-profile-update-with-safari' into 'master' · 37067071
  Filipa Lacerda authored Jul 20, 2018
```
Resolve "Unable to save user profile update with Safari"

Closes #45443

See merge request gitlab-org/gitlab-ce!20676
```
  37067071
- Merge branch 'docs/fix-indent-problem-in-mysql_to_postgresql' into 'master' · 623efcef
  Stan Hu authored Jul 20, 2018
```
Docs: Fix indent problem in mysql_to_postgresql.md

See merge request gitlab-org/gitlab-ce!20736
```
  623efcef
- Merge branch 'fj-49014-wiki-search-error' into 'master' · 4e1c35ed
  Sean McGivern authored Jul 20, 2018
```
Fixing bug with wiki ref in ProjectSearchResults

Closes #49014

See merge request gitlab-org/gitlab-ce!20722
```
  4e1c35ed
- Fixing bug with wiki ref in ProjectSearchResults · 6354d554
  Francisco Javier López authored Jul 20, 2018
  
  6354d554
- Merge branch '45230-bootsnap-for-development' into 'master' · 1484ed41
  Douwe Maan authored Jul 20, 2018
```
Enables Bootsnap to GitLab (development)

Closes #45230

See merge request gitlab-org/gitlab-ce!20743
```
  1484ed41
- Merge branch '23705-add-single-file-download-in-repo' into 'master' · f8bedb75
  Douwe Maan authored Jul 20, 2018
```
Resolve "Ability to download single file"

Closes #23705

See merge request gitlab-org/gitlab-ce!20480
```
  f8bedb75
- Adds a note in the documentation about custom Jupyter Image · ec5f72c5
  Amit Rathi authored Jul 20, 2018
  
  ec5f72c5
- Merge branch 'fix/gb/fix-deserializing-ci-yaml-variables' into 'master' · 470e526a
  Kamil Trzciński authored Jul 20, 2018
```
Fix deserializing YAML variables when a build has been imported

Closes #49406

See merge request gitlab-org/gitlab-ce!20713
```
  470e526a
- Add bootsnap to development/test bundle and enable it if available · 31a349e0
  Gabriel Mazetto authored Jul 20, 2018
```
This will enable bootsnap whenver the gem is available.
```
  31a349e0
- move EE-only droplab/filtered search features to ee/ · e1c04f98
  Dennis Tang authored Jul 20, 2018
  
  e1c04f98
- Add formdata-polyfill · 6d4f4caa
  Luke Bennett authored Jul 20, 2018
  
  6d4f4caa
- Merge branch 'zj-remove-refs-cleanup' into 'master' · 3bd8a783
  Kamil Trzciński authored Jul 20, 2018
```
Remove refs cleanup job

See merge request gitlab-org/gitlab-ce!20716
```
  3bd8a783
- Merge branch 'ce-to-ee-2018-07-20' into 'master' · ee7069e5
  Filipa Lacerda authored Jul 20, 2018
```
CE upstream - 2018-07-20 09:21 UTC

See merge request gitlab-org/gitlab-ee!6604
```
  ee7069e5
- Fix Rubocop offense in build_spec.rb 👮 · 20076605
  Grzegorz Bizon authored Jul 20, 2018
  
  20076605
- Merge branch 'tc-pry-docs' into 'master' · 8895863c
  Sean McGivern authored Jul 20, 2018
```
First version of pry_debugging.md

Closes #45728

See merge request gitlab-org/gitlab-ce!20740
```
  8895863c
- Merge branch 'zj-gitaly-migrate-old-migrations' into 'master' · 256e7a63
  Sean McGivern authored Jul 20, 2018
```
Gitaly migrate old DB migrations

Closes gitaly#1106

See merge request gitlab-org/gitlab-ce!20708
```
  256e7a63
- Updated changelog with author name and merge request id · 7e8b3e6e
  Amit Rathi authored Jul 20, 2018
  
  7e8b3e6e
- Update VERSION to 11.2.0-pre · 44dbeccb
  GitLab Release Tools Bot authored Jul 20, 2018
  
  44dbeccb