Commits · c65bbb8dfd24e6c5a04ec4e9d6967804a3f5113c · nexedi / gitlab-ce

31 May, 2018 25 commits
- Fix static analysis · c65bbb8d
  Kamil Trzciński authored May 28, 2018
  
  c65bbb8d
- Fix traits of runners factories · ad223027
  Kamil Trzciński authored May 28, 2018
  
  ad223027
- Improve `Ci::Runner#assign_to` to return a flag whether it succeeded or not · f55215cf
  Kamil Trzciński authored May 28, 2018
  
  f55215cf
- Fix specs api/runners_spec.rb, api/v3/runners_spec.rb update_build_queue_service_spec.rb · 6765e190
  Dylan Griffith authored May 27, 2018
  
  6765e190
- Fix spec for User#ci_owned_runners · 24f6d46b
  Dylan Griffith authored May 27, 2018
  
  24f6d46b
- Fix the conflict resolution in spec/models/ci/runner_spec.rb · 1a3b6b75
  Dylan Griffith authored May 24, 2018
  
  1a3b6b75
- Fix spec/features/runners_spec.rb · 4b4aa8b4
  Dylan Griffith authored May 24, 2018
  
  4b4aa8b4
- Make Ci::Runner#assign_to keep returning RunnerProject · cf07d506
  Dylan Griffith authored May 24, 2018
  
  cf07d506
- Fix some failures · fd31137b
  Kamil Trzciński authored May 23, 2018
  
  fd31137b
- Fix `register_job_service_spec` failures · eb26c7da
  Kamil Trzciński authored May 23, 2018
  
  eb26c7da
- Fix weird Rails bug that leads to `runner_id=null` in SQL query · 09cc75a4
  Kamil Trzciński authored May 23, 2018
  
  09cc75a4
- Refactor validations and make runner factory by default to be instance-wide runner · 36d6b6f8
  Kamil Trzciński authored May 23, 2018
  
  36d6b6f8
- Fix weird Rails bug that leads to `runner_id=null` in SQL query · cb23e111
  Dylan Griffith authored May 27, 2018
  
  cb23e111
- Ensure we validate Runner#runner_type when persisting RunnerNamespace · fa7322f1
  Dylan Griffith authored May 14, 2018
  
  fa7322f1
- Improve runner_type validations for Ci::Runner · d1d1e87b
  Dylan Griffith authored May 11, 2018
  
  d1d1e87b
- Merge branch 'leipert-port-project-settings-ee' into 'master' · 24914b88
  Rémy Coutable authored May 31, 2018
```
Cleanup EE specific code for Project settings

See merge request gitlab-org/gitlab-ee!5902
```
  24914b88
- Cleanup EE specific code for Project settings · c1368657
  Lukas Eipert authored May 31, 2018
  
  c1368657
- 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 15 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