Commits · a2018a3f4e507e0f6e2237af59ccce3e10163af2 · nexedi / gitlab-ce

10 May, 2018 1 commit
- Resolve conflicts in db/schema.rb · a2018a3f
  Ash McKenzie authored May 10, 2018
  
  a2018a3f
09 May, 2018 39 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-09 · 23ef12a2
  GitLab Bot authored May 09, 2018
```
# Conflicts:
#	db/schema.rb

[ci skip]
```
  23ef12a2
- 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
- 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
- Merge branch 'docs/bdo-inclusive-language-groups-docs' into 'master' · 3311bfdb
  Achilleas Pipinellis authored May 09, 2018
```
Update documentation to use inclusive language, gender neutral name and pronoun.

See merge request gitlab-org/gitlab-ee!5597
```
  3311bfdb
- 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 'docs-fix-duplicate-titles-ee' into 'master' · ec6ea1ee
  Achilleas Pipinellis authored May 09, 2018
```
Docs: fix duplicate titles

See merge request gitlab-org/gitlab-ee!5581
```
  ec6ea1ee
- Docs: fix duplicate titles · 92375d1f
  Marcia Ramos 🚫 (OOO - back on May 21) authored May 09, 2018
  
  92375d1f
- 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 '5950-skip-ce-to-ee-branches' into 'master' · cec53ead
  Douwe Maan authored May 09, 2018
```
Resolve "Skip EE specific check for CE upstream branches"

Closes #5950

See merge request gitlab-org/gitlab-ee!5636
```
  cec53ead
- Merge branch 'ce-to-ee-2018-05-09' into 'master' · 10e19915
  Douwe Maan authored May 09, 2018
```
CE upstream - 2018-05-09 12:24 UTC

Closes gitlab-com/gitlab-docs#200

See merge request gitlab-org/gitlab-ee!5633
```
  10e19915
- Skip EE specific check for stable and ce-to-ee branches · 7ecc4f03
  Lin Jen-Shin authored May 09, 2018
  
  7ecc4f03
- Merge branch 'master' into 'ce-to-ee-2018-05-09' · d5e9ecd7
  Douwe Maan authored May 09, 2018
```
# Conflicts:
#   db/schema.rb
```
  d5e9ecd7
- 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 'dm-project-mirror-data-created-updated-at' into 'master' · 12d57caf
  Grzegorz Bizon authored May 09, 2018
```
Remove project_mirror_data created_at and updated_at columns

Closes gitlab-qa#237

See merge request gitlab-org/gitlab-ee!5629
```
  12d57caf
- 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
- Merge branch 'master' into 'dm-project-mirror-data-created-updated-at' · 2127b937
  Douwe Maan authored May 09, 2018
```
# Conflicts:
#   db/schema.rb
```
  2127b937
- bump upath dependency to a version compatible with node 10 · b41b2de7
  Mike Greiling authored May 09, 2018
  
  b41b2de7
- Resolve conflicts in locale/gitlab.pot by regenerating · 981d27c1
  Dylan Griffith authored May 09, 2018
  
  981d27c1
- Merge branch 'simplify-geo-doc-wording' into 'master' · 61bbab8a
  Nick Thomas authored May 09, 2018
```
Simplify Geo doc wording

See merge request gitlab-org/gitlab-ee!5618
```
  61bbab8a
- Simplify Geo doc wording · 627e5b19
  Andreas Kämmerle authored May 09, 2018
  
  627e5b19
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-09 · 2ad0f22d
  GitLab Bot authored May 09, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  2ad0f22d
- 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