Commits · 40e17727c72904d947b2c281918e4dad71656f62 · nexedi / gitlab-ce

10 May, 2018 1 commit
- Merge branch 'master' into per-project-pipeline-iid · 40e17727
  Shinya Maeda authored May 10, 2018
  
  40e17727
09 May, 2018 39 commits
- Merge branch 'blackst0ne-replace-spinach-project-issues-references.feature' into 'master' · 93498185
  Robert Speicher authored May 09, 2018
```
Replace the `project/issues/references.feature` spinach test with an rspec analog

See merge request gitlab-org/gitlab-ce!18769
```
  93498185
- Replace the `project/issues/references.feature` spinach test with an rspec analog · f5c8bfea
  blackst0ne authored May 09, 2018
  
  f5c8bfea
- Merge branch 'blackst0ne-replace-spinach-project-deploy-keys.feature' into 'master' · f4c36fac
  Robert Speicher authored May 09, 2018
```
Replace the `project/deploy_keys.feature` spinach test with an rspec analog

See merge request gitlab-org/gitlab-ce!18796
```
  f4c36fac
- Replace the `project/deploy_keys.feature` spinach test with an rspec analog · 3b21da84
  blackst0ne authored May 09, 2018
  
  3b21da84
- Merge branch '46032/cycle-analytics-service-axios' into 'master' · 1a9f90f8
  Clement Ho authored May 09, 2018
```
refactor 'cycle_analytics' to use axios

See merge request gitlab-org/gitlab-ce!18782
```
  1a9f90f8
- refactor 'cycle_analytics' to use axios · 0421fbcd
  Paul Slaughter authored May 09, 2018
  
  0421fbcd
- Merge branch 'dm-repository-xcode-project' into 'master' · 149e91b5
  Robert Speicher authored May 09, 2018
```
Add Repository#xcode_project? method

See merge request gitlab-org/gitlab-ce!18854
```
  149e91b5
- Merge branch '46032/deploy-keys-axios' into 'master' · 846a80eb
  Clement Ho authored May 09, 2018
```
refactor "deploy_keys" to use axios

See merge request gitlab-org/gitlab-ce!18792
```
  846a80eb
- refactor "deploy_keys" to use axios · 0cc349f0
  Paul Slaughter authored May 09, 2018
  
  0cc349f0
- Merge branch 'fix-project-mirror-data-schema' into 'master' · f0a0da69
  Douwe Maan authored May 09, 2018
```
Fix project mirror data schema

See merge request gitlab-org/gitlab-ce!18811
```
  f0a0da69
- Merge branch 'jivl-delete-d3-rails-gem' into 'master' · ee563bcb
  Douwe Maan authored May 09, 2018
```
Removed the d3_rails gem

See merge request gitlab-org/gitlab-ce!18860
```
  ee563bcb
- Merge branch 'master' into 'fix-project-mirror-data-schema' · c4957ea9
  Douwe Maan authored May 09, 2018
```
# Conflicts:
#   db/schema.rb
```
  c4957ea9
- Add Repository#xcode_project? method · f6ecb726
  Douwe Maan authored May 09, 2018
  
  f6ecb726
- Removed the d3_rails gem · 27518843
  Jose authored May 09, 2018
  
  27518843
- Merge branch 'docs/bdo-inclusive-language-groups-docs' into 'master' · 96b9c070
  🚄 Job van der Voort 🚀 authored May 09, 2018
```
Update documentation to use inclusive language, gender neutral name and pronoun.

See merge request gitlab-org/gitlab-ce!18858
```
  96b9c070
- Merge branch '45840-fix-cache-key-docs' into 'master' · ade1db58
  Achilleas Pipinellis authored May 09, 2018
```
Resolve "Incorrect documentation for .gitlab-ci.yml cache:key default value"

Closes #45840

See merge request gitlab-org/gitlab-ce!18841
```
  ade1db58
- Update documentation to use inclusive language, gender neutral name and pronoun. · dec1b6dd
  Brendan O'Leary 🐢 authored May 07, 2018
  
  dec1b6dd
- Merge branch 'docs-fix-duplicate-titles' into 'master' · 5ea93ac3
  Achilleas Pipinellis authored May 09, 2018
```
Docs: fix duplicate titles

Closes #46061

See merge request gitlab-org/gitlab-ce!18758
```
  5ea93ac3
- Docs: fix duplicate titles · 1983e159
  Marcia Ramos 🚫 (OOO - back on May 21) authored May 09, 2018
  
  1983e159
- Merge branch 'fix/gb/add-missing-foreign-key-to-database-schema' into 'master' · 88c02d9e
  Kamil Trzciński authored May 09, 2018
```
Add missing pipeline build foreign key to the schema

See merge request gitlab-org/gitlab-ce!18846
```
  88c02d9e
- Merge branch 'fix/gb/add-tmp-index-to-improve-stages-migration-cleanup' into 'master' · b673d75c
  Kamil Trzciński authored May 09, 2018
```
Add tmp index to ci_builds to optimize stages migration

Closes #46179

See merge request gitlab-org/gitlab-ce!18844
```
  b673d75c
- Merge branch 'zj-remove-rugged-call' into 'master' · ce793073
  Robert Speicher authored May 09, 2018
```
Remove rugged call in blame controller

See merge request gitlab-org/gitlab-ce!18817
```
  ce793073
- 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
- Add missing pipeline build foreign key to the schema · e5df8b58
  Grzegorz Bizon authored May 09, 2018
  
  e5df8b58
- 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