Commits · 1fd685668b8f61c067df0310d57f7f0df7687182 · nexedi / gitlab-ce

10 Apr, 2018 19 commits
- Merge branch 'docs-add-warning-about-recursive-includes' into 'master' · 1fd68566
  Achilleas Pipinellis authored Apr 10, 2018
```
Add a note about not supporting recursive includes on Ci YAML documentation

See merge request gitlab-org/gitlab-ee!5282
```
  1fd68566
- Add a note about not supporting recursive includes on Ci YAML documentation · 63b1c62f
  Mayra Cabrera authored Apr 10, 2018
  
  63b1c62f
- Merge branch 'explain-auto-devops' into 'master' · 9d4f7960
  Achilleas Pipinellis authored Apr 10, 2018
```
explain auto-devops better

See merge request gitlab-org/gitlab-ee!5290
```
  9d4f7960
- Copyedit Auto DevOps · 34b47408
  Achilleas Pipinellis authored Apr 10, 2018
```
[ci skip]
```
  34b47408
- Merge branch 'ce-to-ee-2018-04-10' into 'master' · 13688f0e
  Rémy Coutable authored Apr 10, 2018
```
CE upstream - 2018-04-10 04:58 UTC

See merge request gitlab-org/gitlab-ee!5305
```
  13688f0e
- Merge branch 'master' into ce-to-ee-2018-04-10 · d7ee7e89
  Nick Thomas authored Apr 10, 2018
  
  d7ee7e89
- Fix eslint errors · a20fa3f4
  Filipa Lacerda authored Apr 10, 2018
  
  a20fa3f4
- Fix conflicts for CHANGELOG.md · 30e94ece
  Filipa Lacerda authored Apr 10, 2018
  
  30e94ece
- Fix conflicts in project model · fb10506b
  Sean McGivern authored Apr 10, 2018
  
  fb10506b
- Fix conflicts in issue model · c95477a9
  Sean McGivern authored Apr 10, 2018
  
  c95477a9
- Fix conflicts for ... · 0bf45519
  Filipa Lacerda authored Apr 10, 2018
```
Fix conflicts for  app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
```
  0bf45519
- Merge branch 'sh-test-ruby-2.3.7' into 'master' · cf031738
  Rémy Coutable authored Apr 10, 2018
```
Port Ruby 2.3.7 changes to EE

See merge request gitlab-org/gitlab-ee!5304
```
  cf031738
- Merge branch 'master' into ce-to-ee-2018-04-10 · 2ee16104
  Stan Hu authored Apr 09, 2018
  
  2ee16104
- Merge branch 'copy-premium-trial-to-ultimate' into 'master' · 56a0e409
  Douwe Maan authored Apr 10, 2018
```
Change all in-product trial references from Premium/EE to Ultimate

See merge request gitlab-org/gitlab-ee!5258
```
  56a0e409
- Change all in-product trial references from Premium/EE to Ultimate · ab23de66
  Jeremy Watson authored Apr 10, 2018
  
  ab23de66
- Remove the use of AEAD in CBC ciphers because it's not supported by OpenSSL · f629b8ef
  Stan Hu authored Apr 09, 2018
```
Ruby 2.3.7 fails when attempting to set `auth_data`. Previous versions would
not complain.
```
  f629b8ef
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-10 · 7ffe5f67
  GitLab Bot authored Apr 10, 2018
```
# Conflicts:
#	CHANGELOG.md
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
#	app/models/issue.rb
#	app/models/project.rb

[ci skip]
```
  7ffe5f67
- Merge branch 'ce-to-ee-2018-04-09' into 'master' · a85f7883
  Stan Hu authored Apr 10, 2018
```
CE upstream - 2018-04-09 12:27 UTC

See merge request gitlab-org/gitlab-ee!5299
```
  a85f7883
- Merge branch 'port-features-project-project-to-rspec' into 'master' · bc841c7d
  Robert Speicher authored Apr 10, 2018
```
Migrate features/project/project.feature to RSpec and reorganize several Project feature specs

See merge request gitlab-org/gitlab-ce!18223
```
  bc841c7d
09 Apr, 2018 21 commits
- Merge branch 'ee-port-features-project-project-to-rspec' into 'master' · fa4360d3
  Robert Speicher authored Apr 09, 2018
```
[EE] Migrate features/project/project.feature to RSpec and reorganize several Project feature specs

See merge request gitlab-org/gitlab-ee!5272
```
  fa4360d3
- Address review feedback · 40b4da79
  Rémy Coutable authored Apr 09, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  40b4da79
- [EE] Migrate features/project/project.feature to RSpec and reorganize several Project feature specs · 98d4fde5
  Rémy Coutable authored Apr 06, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  98d4fde5
- Address review feedback · 13f7415a
  Rémy Coutable authored Apr 09, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  13f7415a
- Migrate features/project/project.feature to RSpec and reorganize several Project feature specs · 2d54dfb2
  Rémy Coutable authored Apr 06, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2d54dfb2
- Add Ruby 2.3.7 workaround for lib/gitlab/github_import/parallel_importer.rb · 68083a03
  Stan Hu authored Apr 09, 2018
  
  68083a03
- Fix email handler spec for EE · 241bcc25
  Michael Kozono authored Apr 09, 2018
  
  241bcc25
- Update CHANGELOG.md for 10.6.4 · ffc9a470
  Mayra Cabrera authored Apr 09, 2018
```
[ci skip]
```
  ffc9a470
- Update CHANGELOG.md for 10.6.4 · 6d08a5dd
  Mayra Cabrera authored Apr 09, 2018
```
[ci skip]
```
  6d08a5dd
- Update CHANGELOG-EE.md for 10.6.4-ee · 193898eb
  Mayra Cabrera authored Apr 09, 2018
```
[ci skip]
```
  193898eb
- Merge branch 'sh-bump-ruby-and-git-image-ci' into 'master' · 201c1917
  Rémy Coutable authored Apr 09, 2018
```
Bump Ruby to 2.3.7 and git to 2.17.0 in CI image

See merge request gitlab-org/gitlab-ce!18244
```
  201c1917
- Merge branch 'feature/add_target_to_tags' into 'master' · 91a3a4b5
  Robert Speicher authored Apr 09, 2018
```
Expose the target commit ID through the tag API

See merge request gitlab-org/gitlab-ce!18248
```
  91a3a4b5
- Merge branch 'fix-n-plus-one-when-getting-notification-settings-for-recipients' into 'master' · db204e23
  Yorick Peterse authored Apr 09, 2018
```
Use Goldiloader for handling N+1 queries

See merge request gitlab-org/gitlab-ce!18217
```
  db204e23
- Merge branch 'ee-fix-n-plus-one-when-getting-notification-settings-for-recipients' into 'master' · 9248aa29
  Yorick Peterse authored Apr 09, 2018
```
Use Goldiloader for handling N+1 queries

See merge request gitlab-org/gitlab-ee!5297
```
  9248aa29
- Merge branch 'sh-bump-ruby-and-git-image-ci' into 'master' · bf2368a9
  Rémy Coutable authored Apr 09, 2018
```
Bump Ruby to 2.3.7 and git to 2.17.0 in CI image

See merge request gitlab-org/gitlab-ce!18244
```
  bf2368a9
- Merge branch 'ee-44296-commit-path' into 'master' · 63dc7a9b
  Phil Hughes authored Apr 09, 2018
```
Resolve "Cannot read property 'commit_path' of null"

See merge request gitlab-org/gitlab-ee!5277
```
  63dc7a9b
- Resolve "Cannot read property 'commit_path' of null" · 67209d3a
  Filipa Lacerda authored Apr 09, 2018
  
  67209d3a
- Merge branch '44296-commit-path' into 'master' · 9e13ca6a
  Phil Hughes authored Apr 09, 2018
```
Resolve "Cannot read property 'commit_path' of null"

Closes #44296

See merge request gitlab-org/gitlab-ce!18231
```
  9e13ca6a
- Update index.md · 06213dee
  Mark Pundsack authored Apr 09, 2018
  
  06213dee
- Merge branch 'osw-jira-dev-panel-doc-fix' into 'master' · d391a218
  Victor Wu authored Apr 09, 2018
```
Jira dev panel docs minor numbered list adjustment

See merge request gitlab-org/gitlab-ee!5283
```
  d391a218
- Merge branch 'gitlab-shell-7.1.2' into 'master' · de3f55b2
  Douwe Maan authored Apr 09, 2018
```
Use gitlab-shell 7.1.2

See merge request gitlab-org/gitlab-ce!18258
```
  de3f55b2