Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slack-notifications-on-ci

# Conflicts:
#	.gitlab-ci.yml

1 files changed, 33 insertions, 33 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc711bf9d6b..c1b753f25d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: "ruby:2.2"
+image: "ruby:2.1"
 
 services:
   - mysql:latest
@@ -6,7 +6,7 @@ services:
   - redis:latest
 
 cache:
-  key: "ruby22"
+  key: "ruby21"
   paths:
   - vendor
 
@@ -160,9 +160,9 @@ bundler:audit:
     - mysql
   allow_failure: true
 
-## Ruby 2.1 jobs
+# Ruby 2.1 jobs
 
-spec:feature:ruby21:
+spec:feature:ruby22:
   stage: test
   image: ruby:2.1
   only:
@@ -171,82 +171,82 @@ spec:feature:ruby21:
     - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
   tags:
     - ruby
     - mysql
 
-spec:api:ruby21:
+spec:api:ruby22:
   stage: test
-  image: ruby:2.1
+  image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
   tags:
     - ruby
     - mysql
 
-spec:models:ruby21:
+spec:models:ruby22:
   stage: test
-  image: ruby:2.1
+  image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
   tags:
     - ruby
     - mysql
 
-spec:lib:ruby21:
+spec:lib:ruby22:
   stage: test
-  image: ruby:2.1
+  image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
   tags:
     - ruby
     - mysql
 
-spec:services:ruby21:
+spec:services:ruby22:
   stage: test
-  image: ruby:2.1
+  image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
   tags:
     - ruby
     - mysql
 
-spec:benchmark:ruby21:
-  stage: test
-  image: ruby:2.1
+spec:benchmark:ruby22:
+   stage: test
+ image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test bundle exec rake spec:benchmark
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
   tags:
@@ -254,60 +254,60 @@ spec:benchmark:ruby21:
     - mysql
   allow_failure: true
 
-spec:other:ruby21:
+spec:other:ruby22:
   stage: test
-  image: ruby:2.1
+  image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
   tags:
     - ruby
     - mysql
 
-spinach:project:half:ruby21:
+spinach:project:half:ruby22:
   stage: test
-  image: ruby:2.1
+  image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
   tags:
     - ruby
     - mysql
 
-spinach:project:rest:ruby21:
+spinach:project:rest:ruby22:
   stage: test
-  image: ruby:2.1
+  image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
   tags:
     - ruby
     - mysql
 
-spinach:other:ruby21:
+spinach:other:ruby22:
   stage: test
-  image: ruby:2.1
+  image: ruby:2.2
   only:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
   cache:
-    key: "ruby21"
+    key: "ruby22"
     paths:
     - vendor
   tags: