Commits · 5d5457c21e44f16ad6401357c2399fde086fa626 · nexedi / gitlab-ce

10 May, 2018 3 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-10 · 5d5457c2
  GitLab Bot authored May 10, 2018
  
  5d5457c2
- Merge branch 'ce-to-ee-2018-05-09' into 'master' · aa689b23
  Stan Hu authored May 10, 2018
```
CE upstream - 2018-05-09 18:24 UTC

Closes gitlab-development-kit#348

See merge request gitlab-org/gitlab-ee!5642
```
  aa689b23
- Resolve conflicts in db/schema.rb · a2018a3f
  Ash McKenzie authored May 10, 2018
  
  a2018a3f
09 May, 2018 37 commits
- Merge branch 'blackst0ne-replace-spinach-project-deploy-keys.feature-ee' into 'master' · faa1543e
  Robert Speicher authored May 09, 2018
```
[CE Port] Replace the `project/deploy_keys.feature` spinach test with an rspec analog

See merge request gitlab-org/gitlab-ee!5626
```
  faa1543e
- Merge branch 'unify-repository-controller' into 'master' · f7fc2020
  Robert Speicher authored May 09, 2018
```
Move include SafeMirrorParams to EE module

See merge request gitlab-org/gitlab-ee!5631
```
  f7fc2020
- 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... · 67d2b90d
  Stan Hu authored May 09, 2018
```
Merge branch '5957-geo-secondary-can-t-log-failed-sign-in-attempts-due-to-read-only-db' into 'master'

Resolve "Geo: Secondary can't log failed sign-in attempts due to read-only DB"

Closes #5957

See merge request gitlab-org/gitlab-ee!5643
```
  67d2b90d
- Add CHANGELOG · b1770cd6
  Douglas Barbosa Alexandre authored May 09, 2018
  
  b1770cd6
- Does not log failed sign-in attempts when in a GitLab read-only instance · bd74ca32
  Douglas Barbosa Alexandre authored May 09, 2018
  
  bd74ca32
- 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 'fix_epics' into 'master' · 19971836
  Nick Thomas authored May 09, 2018
```
Epics - include ::Issuable, not EE::Issuable

See merge request gitlab-org/gitlab-ee!5644
```
  19971836
- Epics - include ::Issuable, not EE::Issuable · 2a40285f
  Mario de la Ossa authored May 09, 2018
  
  2a40285f
- 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 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
- 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
- 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