Commits · 6a517e8f53bf581a3ac52fa77224e3e35d7b7171 · nexedi / gitlab-ce

10 Apr, 2018 31 commits
- Improve the architecture of RspecFlaky classes by introducing a new RspecFlaky::Report class · 6a517e8f
  Rémy Coutable authored Apr 10, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  6a517e8f
- Introduce scripts/prune-old-flaky-specs to prune outdated flaky specs from the report · 732e30a4
  Rémy Coutable authored Apr 05, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  732e30a4
- Merge branch 'ce-to-ee-2018-04-10' into 'master' · a5c567d2
  Marin Jankovski authored Apr 10, 2018
```
CE upstream - 2018-04-10 12:26 UTC

See merge request gitlab-org/gitlab-ee!5310
```
  a5c567d2
- 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
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-10 · 76bc1df1
  GitLab Bot authored Apr 10, 2018
  
  76bc1df1
- 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 'revert-e9e800f5' into 'master' · e4c8a84d
  Marin Jankovski authored Apr 10, 2018
```
Revert "Merge branch 'improve-jobs-queuing-time-metric' into 'master'"

See merge request gitlab-org/gitlab-ce!18276
```
  e4c8a84d
- Merge branch 'master' into ce-to-ee-2018-04-10 · d7ee7e89
  Nick Thomas authored Apr 10, 2018
  
  d7ee7e89
- Revert "Merge branch 'improve-jobs-queuing-time-metric' into 'master'" · f2a5493c
  Kamil Trzciński authored Apr 10, 2018
```
This reverts merge request !17730
```
  f2a5493c
- Merge branch '40487-axios-pipelines' into 'master' · 174950b6
  Phil Hughes authored Apr 10, 2018
```
Replace vue resource with axios for pipelines table

See merge request gitlab-org/gitlab-ce!18264
```
  174950b6
- Fix eslint errors · a20fa3f4
  Filipa Lacerda authored Apr 10, 2018
  
  a20fa3f4
- Merge branch 'docs-gitaly-for-new-git-features' into 'master' · 3800b431
  Sean McGivern authored Apr 10, 2018
```
Document process for new Git features

See merge request gitlab-org/gitlab-ce!18230
```
  3800b431
- Document process for new Git features · 3717deae
  Jacob Vosmaer (GitLab) authored Apr 10, 2018
  
  3717deae
- Fix conflicts for CHANGELOG.md · 30e94ece
  Filipa Lacerda authored Apr 10, 2018
  
  30e94ece
- Merge branch 'gitaly-0.95.0' into 'master' · 74bb5b21
  Sean McGivern authored Apr 10, 2018
```
Use Gitaly 0.95.0

See merge request gitlab-org/gitlab-ce!18256
```
  74bb5b21
- 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
- Merge branch 'deploy-tokens-container-registry-specs' into 'master' · 89c3c4cc
  Kamil Trzciński authored Apr 10, 2018
```
Verify that deploy token has valid access when pulling container registry image

Closes #45148

See merge request gitlab-org/gitlab-ce!18260
```
  89c3c4cc
- Verify that deploy token has valid access when pulling container registry image · 3e35f653
  Mayra Cabrera authored Apr 10, 2018
  
  3e35f653
- 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 9 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