Commits · 468c1cab6c3b126996b56547252293c2a5b394e4 · nexedi / gitlab-ce

31 May, 2018 8 commits
- Merge branch 'ee-fj-36819-remove-v3-api' into 'master' · 468c1cab
  Douwe Maan authored May 31, 2018
```
Removal of API v3 from the codebase

See merge request gitlab-org/gitlab-ee!5839
```
  468c1cab
- Merge branch '6243-use-simpler-compare-for-ee-files-location-check' into 'master' · 121e0edb
  Rémy Coutable authored May 31, 2018
```
Resolve "Revert to use a simpler check for `ee-files-location-check`"

Closes #6243

See merge request gitlab-org/gitlab-ee!5910
```
  121e0edb
- Merge branch 'ce-to-ee-2018-05-31' into 'master' · 7ee4357c
  Stan Hu authored May 31, 2018
```
CE upstream - 2018-05-31 06:24 UTC

See merge request gitlab-org/gitlab-ee!5917
```
  7ee4357c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-31 · 2bc88073
  GitLab Bot authored May 31, 2018
  
  2bc88073
- Merge branch 'add-project-features-docs' into 'master' · 76099e7a
  Achilleas Pipinellis authored May 31, 2018
```
Add Wiki and Snippets to project feature overview

See merge request gitlab-org/gitlab-ce!19235
```
  76099e7a
- Merge branch 'ce-to-ee-2018-05-31' into 'master' · cb906987
  Stan Hu authored May 31, 2018
```
CE upstream - 2018-05-31 00:23 UTC

See merge request gitlab-org/gitlab-ee!5916
```
  cb906987
- Fix conflicts in CHANGELOG.md · cbfa94f1
  Stan Hu authored May 30, 2018
```
[ci skip]
```
  cbfa94f1
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-31 · 72ef79b3
  GitLab Bot authored May 31, 2018
```
# Conflicts:
#	CHANGELOG.md

[ci skip]
```
  72ef79b3
30 May, 2018 32 commits
- Merge branch 'ce-to-ee-2018-05-30' into 'master' · cc1cd888
  Stan Hu authored May 30, 2018
```
CE upstream - 2018-05-30 22:00 UTC

See merge request gitlab-org/gitlab-ee!5914
```
  cc1cd888
- Update CHANGELOG.md for 10.8.3 · 37a7b590
  Mayra Cabrera authored May 30, 2018
```
[ci skip]
```
  37a7b590
- Update CHANGELOG.md for 10.8.3 · e8a40c50
  Mayra Cabrera authored May 30, 2018
```
[ci skip]
```
  e8a40c50
- Update CHANGELOG-EE.md for 10.8.3-ee · fb0436a8
  Mayra Cabrera authored May 30, 2018
```
[ci skip]
```
  fb0436a8
- Update CHANGELOG.md for 10.8.3 · 3e9d5974
  Mayra Cabrera authored May 30, 2018
```
[ci skip]
```
  3e9d5974
- Update CHANGELOG-EE.md for 10.8.3-ee · 24d9a0e8
  Mayra Cabrera authored May 30, 2018
```
[ci skip]
```
  24d9a0e8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-30 · 3c8e3e7b
  GitLab Bot authored May 30, 2018
  
  3c8e3e7b
- Merge branch '47002-fix-empty-wiki-illustration' into 'master' · ed5755fc
  Clement Ho authored May 30, 2018
```
Update "col-xs" usage to bootstrap4

Closes #47002

See merge request gitlab-org/gitlab-ce!19256
```
  ed5755fc
- Update "col-xs" usage to bootstrap4 · f9cfe78a
  Paul Slaughter authored May 30, 2018
  
  f9cfe78a
- Merge branch 'sh-move-blob-data-at-public' into 'master' · bcdcea1e
  Robert Speicher authored May 30, 2018
```
Make Repository#blob_data_at a public method

See merge request gitlab-org/gitlab-ce!19259
```
  bcdcea1e
- Merge branch 'ce-to-ee-2018-05-30' into 'master' · 2050edb5
  Stan Hu authored May 30, 2018
```
CE upstream - 2018-05-30 15:02 UTC

Closes #6045, #2678, and omnibus-gitlab#2138

See merge request gitlab-org/gitlab-ee!5906
```
  2050edb5
- Merge branch 'dm-external-authorization-403' into 'master' · 4e6e7024
  Robert Speicher authored May 30, 2018
```
Treat external authorization service response status 403 as failure

Closes #6235

See merge request gitlab-org/gitlab-ee!5909
```
  4e6e7024
- Merge branch 'sh-add-usage-ping-api-settings' into 'master' · a8a02926
  Robert Speicher authored May 30, 2018
```
Add missing usage_ping_enabled to API settings

See merge request gitlab-org/gitlab-ce!19263
```
  a8a02926
- Merge branch 'fix-nbsp-after-sign-in-with-google' into 'master' · 77462804
  Filipa Lacerda authored May 30, 2018
```
Fix &nbsp; after sign-in with Google button

Closes #45551

See merge request gitlab-org/gitlab-ce!19249
```
  77462804
- Update CHANGELOG.md for 10.8.3 · 80366882
  Mayra Cabrera authored May 30, 2018
```
[ci skip]
```
  80366882
- Update CHANGELOG-EE.md for 10.8.3-ee · 240c43e3
  Mayra Cabrera authored May 30, 2018
```
[ci skip]
```
  240c43e3
- Fix bad merge causing duplicate methods in... · a7cb4460
  Stan Hu authored May 30, 2018
```
Fix bad merge causing duplicate methods in app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
```
  a7cb4460
- Resolve conflicts in lib/api/settings.rb · ed02f0cb
  Stan Hu authored May 30, 2018
  
  ed02f0cb
- Resolve conflicts in app/views/shared/_import_form.html.haml · 0c90f9e5
  Stan Hu authored May 30, 2018
  
  0c90f9e5
- resolve doc/user/project/merge_requests/index.md · 265d7da5
  Valery Sizov authored May 30, 2018
  
  265d7da5
- resolve doc/ci/variables/README.md · ea6c6192
  Valery Sizov authored May 30, 2018
  
  ea6c6192
- resolve doc/ci/variables/where_variables_can_be_used.md · feae0f42
  Valery Sizov authored May 30, 2018
  
  feae0f42
- Resolve doc/user/project/merge_requests/squash_and_merge.md · c985c76b
  Valery Sizov authored May 30, 2018
  
  c985c76b
- Add missing usage_ping_enabled to API settings · c20766e8
  Stan Hu authored May 30, 2018
```
Identified while resolving conflicts in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5906
```
  c20766e8
- Resolve conflicts in spec/fixtures/api/schemas/entities/merge_request_widget.json · 887b9c22
  Stan Hu authored May 30, 2018
  
  887b9c22
- Resolve conflicts in spec/fixtures/api/schemas/entities/merge_request_widget.json · f1e4d286
  Stan Hu authored May 30, 2018
  
  f1e4d286
- Resolve conflicts in spec/fixtures/api/schemas/public_api/v3/merge_requests.json · 7b50ba8a
  Stan Hu authored May 30, 2018
  
  7b50ba8a
- Resolve conflicts in spec/fixtures/api/schemas/public_api/v4/merge_requests.json · aec22c71
  Stan Hu authored May 30, 2018
  
  aec22c71
- Merge branch 'leipert-upgrade-eslint' into 'master' · 7d1a9ef3
  Mike Greiling authored May 30, 2018
```
Upgrade eslint 3 -> 4

Closes #40476

See merge request gitlab-org/gitlab-ce!19182
```
  7d1a9ef3
- Merge branch 'leipert-upgrade-eslint-ee' into 'master' · c955f1e2
  Mike Greiling authored May 30, 2018
```
EE-Port of gitlab-ce!19182

See merge request gitlab-org/gitlab-ee!5885
```
  c955f1e2
- EE-Port of gitlab-ce!19182 · e0bbe3de
  Lukas Eipert authored May 30, 2018
  
  e0bbe3de
- Merge branch '46999-line-profiling-modal-width' into 'master' · e1b3a11f
  Clement Ho authored May 30, 2018
```
Line profiling modal width

Closes #46999

See merge request gitlab-org/gitlab-ce!19253
```
  e1b3a11f