Commits · 5c8f31eb7ee9a4993b41a72d34afddd43831517e · Léo-Paul Géneau / gitlab-ce

09 May, 2018 33 commits
- Hide merge request option in IDE when merge requests are disabled · 5c8f31eb
  Phil Hughes authored May 09, 2018
```
Closes #45698
```
  5c8f31eb
- Merge branch 'docs-update-docstyleguide' into 'master' · 1802954b
  Achilleas Pipinellis authored May 09, 2018
```
Docs: update docs style guidelines

Closes #46157 and #45321

See merge request gitlab-org/gitlab-ce!18819
```
  1802954b
- Docs: update docs style guidelines · 185f0a39
  Marcia Ramos 🚫 (OOO - back on May 21) authored May 09, 2018
  
  185f0a39
- Merge branch 'support-active-setting-while-registering-a-runner' into 'master' · 063b6b75
  Kamil Trzciński authored May 09, 2018
```
Support 'active' setting on Runner Registration API endpoint

See merge request gitlab-org/gitlab-ce!18848
```
  063b6b75
- Merge branch '46003-fix-node-10-compatibility' into 'master' · b1b66052
  Mike Greiling authored May 09, 2018
```
Resolve "Bump upath to 1.0.5"

Closes #46003 and gitlab-development-kit#348

See merge request gitlab-org/gitlab-ce!18852
```
  b1b66052
- bump upath dependency to a version compatible with node 10 · b41b2de7
  Mike Greiling authored May 09, 2018
  
  b41b2de7
- Merge branch '46010-runner-type-not-null' into 'master' · e9609318
  Kamil Trzciński authored May 09, 2018
```
Set `ci_runners.runner_type` not null

See merge request gitlab-org/gitlab-ce!18825
```
  e9609318
- Add CHANGELOG entry · a9b5f582
  Tomasz Maczukin authored May 09, 2018
  
  a9b5f582
- Support 'active' setting on Runner Registration API endpoint · 8516e3a4
  Tomasz Maczukin authored May 09, 2018
  
  8516e3a4
- Merge branch 'fix-ide-empty-editor' into 'master' · 58086f82
  Filipa Lacerda authored May 09, 2018
```
Fixed empty editors in the IDE

Closes #46153

See merge request gitlab-org/gitlab-ce!18842
```
  58086f82
- Merge branch '10-8-dependencies-update' into 'master' · f29e6937
  James Lopez authored May 09, 2018
```
Update the dependencies license list

See merge request gitlab-org/gitlab-ce!18847
```
  f29e6937
- Merge branch '10-8-update-gitignore' into 'master' · 41593c7e
  James Lopez authored May 09, 2018
```
Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates

See merge request gitlab-org/gitlab-ce!18845
```
  41593c7e
- Merge branch 'cherry-pick-7b8d754e-ce' into 'master' · d9461d69
  Grzegorz Bizon authored May 09, 2018
```
Adjust spec to build correct path when storage path ends in slash

See merge request gitlab-org/gitlab-ce!18843
```
  d9461d69
- Update the dependencies license list · c32878a8
  Filipa Lacerda authored May 09, 2018
  
  c32878a8
- Merge branch 'blackst0ne-fix-downtime-check-job' into 'master' · b63cd070
  Douwe Maan authored May 09, 2018
```
Fix `downtime_check` job

See merge request gitlab-org/gitlab-ce!18840
```
  b63cd070
- Merge branch 'docs-document-redirect-to' into 'master' · c1c934ca
  Achilleas Pipinellis authored May 09, 2018
```
Docs: document the redirect_to method

See merge request gitlab-org/gitlab-ce!18788
```
  c1c934ca
- Merge branch 'docs-add-descriptions' into 'master' · ec7f1d12
  Achilleas Pipinellis authored May 09, 2018
```
Docs: add custom descriptions to most relevant docs

Closes gitlab-com/gitlab-docs#200

See merge request gitlab-org/gitlab-ce!18789
```
  ec7f1d12
- Docs: add custom descriptions to most relevant docs · f703ba3f
  Marcia Ramos authored May 09, 2018
  
  f703ba3f
- Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates · 3fde7b0f
  Filipa Lacerda authored May 09, 2018
  
  3fde7b0f
- Adjust spec to build correct path when storage path ends in slash · 9da52c6f
  Douwe Maan authored May 09, 2018
  
  9da52c6f
- Align with EE · 3d93ad10
  Lin Jen-Shin authored May 09, 2018
  
  3d93ad10
- added specs · 96785e77
  Phil Hughes authored May 09, 2018
  
  96785e77
- Fixed empty editors in the IDE · cc066314
  Phil Hughes authored May 09, 2018
```
Closes #46153
```
  cc066314
- Merge branch '10244-group-runner-docs' into 'master' · 97dda379
  Achilleas Pipinellis authored May 09, 2018
```
Add docs for group runners

Closes #10244

See merge request gitlab-org/gitlab-ce!18807
```
  97dda379
- Merge branch '45819_update_container_scanning_gitlab_ci_config_doc' into 'master' · 21eccf42
  Achilleas Pipinellis authored May 09, 2018
```
Updates Clair container scanning GitLab CI configuration

Closes #45819

See merge request gitlab-org/gitlab-ce!18614
```
  21eccf42
- Fix `downtime_check` job · 55fa9425
  blackst0ne authored May 09, 2018
```
15fcd965 (!18547) squashes old migrations
to a single one.

Old migrations had `rubocop:disable all` rule, but the new migration doesn't
have it, so the `downtime_check` fails.

This commit explicitly tells that the migration requires downtime.
```
  55fa9425
- Merge branch '46115-i18n-for-group-runner-pages' into 'master' · 9a54cb36
  Filipa Lacerda authored May 09, 2018
```
Resolve "Improve i18n of "Runners""

Closes #46115

See merge request gitlab-org/gitlab-ce!18838
```
  9a54cb36
- Add validation Ci::Runner runner_type must be present · 89ec120f
  Dylan Griffith authored May 09, 2018
  
  89ec120f
- Add DB constraint ci_runners.runner_type not null · 4c2cf907
  Dylan Griffith authored May 08, 2018
  
  4c2cf907
- Merge branch '23465-print-markdown' into 'master' · 2de67448
  Phil Hughes authored May 09, 2018
```
Resolve "Printing wiki pages"

Closes #23465

See merge request gitlab-org/gitlab-ce!18834
```
  2de67448
- Add more i18n for runner pages · 0f7c38f0
  Dylan Griffith authored May 09, 2018
  
  0f7c38f0
- Merge branch 'add-runner-type-to-cluster-app' into 'master' · ca91120e
  Grzegorz Bizon authored May 09, 2018
```
Set `runner_type` for cluster/application

See merge request gitlab-org/gitlab-ce!18832
```
  ca91120e
- Set `runner_type` for cluster/application · a57c953e
  Kamil Trzciński authored May 08, 2018
  
  a57c953e
08 May, 2018 7 commits
- Remove sidebar, flash container, and URLs from print pages · 11a49480
  Annabel Dunstone Gray authored May 08, 2018
  
  11a49480
- Merge branch 'blackst0ne-replace-spinach-project-ff-merge-requests.feature' into 'master' · 5b0e96d0
  Robert Speicher authored May 08, 2018
```
Replace the `project/ff_merge_requests.feature` spinach test with an rspec analog

See merge request gitlab-org/gitlab-ce!18800
```
  5b0e96d0
- Replace the `project/ff_merge_requests.feature` spinach test with an rspec analog · 3cb98379
  blackst0ne authored May 08, 2018
  
  3cb98379
- Merge branch '5750-backport-checksum-git-commanderror-exit-status-128' into 'master' · ee9d4386
  Stan Hu authored May 08, 2018
```
Raise InvalidRepository error for non-valid git repositories

See merge request gitlab-org/gitlab-ce!18594
```
  ee9d4386
- Merge branch '46010-add-missing-parens' into 'master' · ba88a47e
  Kamil Trzciński authored May 08, 2018
```
Add missing parens to make consistent in project_spec and runner_spec

See merge request gitlab-org/gitlab-ce!18808
```
  ba88a47e
- Merge branch 'update-asset-sync' into 'master' · 09747ecd
  Robert Speicher authored May 08, 2018
```
Update asset_sync ~> 2.2.0 to ~> 2.4

See merge request gitlab-org/gitlab-ce!18762
```
  09747ecd
- Merge branch 'fix_plural_handling_for_migration_to_ghost_user' into 'master' · 8194d3e4
  Robert Speicher authored May 08, 2018
```
Cleanly handle plural name for ghost user migration

See merge request gitlab-org/gitlab-ce!18798
```
  8194d3e4