diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51ef188f1bdcdcc0c77446ba770efb98d7441e5c..8a729f957a2e7abd2a76a6fd91947fb055ce1e10 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ services:
   - redis:latest
 
 cache:
-  key: "ruby22"
+  key: "ruby21"
   paths:
   - vendor
 
@@ -140,147 +140,147 @@ bundler:audit:
     - mysql
   allow_failure: true
 
-# Ruby 2.1 jobs
-#
-#spec:feature:ruby21:
-#  image: ruby:2.1
-#  only:
-#  - master
-#  script:
-#    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
-#    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
-#  cache:
-#    key: "ruby21"
-#    paths:
-#    - vendor
-#  tags:
-#    - ruby
-#    - mysql
-#
-#spec:api:ruby21:
-#  image: ruby:2.1
-#  only:
-#  - master
-#  script:
-#    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
-#  cache:
-#    key: "ruby21"
-#    paths:
-#    - vendor
-#  tags:
-#    - ruby
-#    - mysql
-#
-#spec:models:ruby21:
-#  image: ruby:2.1
-#  only:
-#  - master
-#  script:
-#    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
-#  cache:
-#    key: "ruby21"
-#    paths:
-#    - vendor
-#  tags:
-#    - ruby
-#    - mysql
-#
-#spec:lib:ruby21:
-#  image: ruby:2.1
-#  only:
-#  - master
-#  script:
-#    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
-#  cache:
-#    key: "ruby21"
-#    paths:
-#    - vendor
-#  tags:
-#    - ruby
-#    - mysql
-#
-#spec:services:ruby21:
-#  image: ruby:2.1
-#  only:
-#  - master
-#  script:
-#    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
-#  cache:
-#    key: "ruby21"
-#    paths:
-#    - vendor
-#  tags:
-#    - ruby
-#    - mysql
-#
-#spec:benchmark:ruby21:
-#  image: ruby:2.1
-#  only:
-#  - master
-#  script:
-#    - RAILS_ENV=test bundle exec rake spec:benchmark
-#  cache:
-#    key: "ruby21"
-#    paths:
-#    - vendor
-#  tags:
-#    - ruby
-#    - mysql
-#  allow_failure: true
-#
-#spec:other:ruby21:
-#  image: ruby:2.1
-#  only:
-#  - master
-#  script:
-#    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
-#  cache:
-#    key: "ruby21"
-#    paths:
-#    - vendor
-#  tags:
-#    - ruby
-#    - mysql
-#
-#spinach:project:half:ruby21:
-#  image: ruby:2.1
-#  only:
-#  - master
-#  script:
-#    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
-#  cache:
-#    key: "ruby21"
-#    paths:
-#    - vendor
-#  tags:
-#    - ruby
-#    - mysql
-#
-#spinach:project:rest:ruby21:
-#  image: ruby:2.1
-#  only:
-#  - master
-#  script:
-#    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
-#  cache:
-#    key: "ruby21"
-#    paths:
-#    - vendor
-#  tags:
-#    - ruby
-#    - mysql
-#
-#spinach:other:ruby21:
-#  image: ruby:2.1
-#  only:
-#  - master
-#  script:
-#    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
-#  cache:
-#    key: "ruby21"
-#    paths:
-#    - vendor
-#  tags:
-#    - ruby
-#    - mysql
-#
+# Ruby 2.2 jobs
+
+spec:feature:ruby22:
+  image: ruby:2.2
+  only:
+  - master
+  script:
+    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
+  cache:
+    key: "ruby22"
+    paths:
+    - vendor
+  tags:
+    - ruby
+    - mysql
+
+spec:api:ruby22:
+  image: ruby:2.2
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
+  cache:
+    key: "ruby22"
+    paths:
+    - vendor
+  tags:
+    - ruby
+    - mysql
+
+spec:models:ruby22:
+  image: ruby:2.2
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
+  cache:
+    key: "ruby22"
+    paths:
+    - vendor
+  tags:
+    - ruby
+    - mysql
+
+spec:lib:ruby22:
+  image: ruby:2.2
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
+  cache:
+    key: "ruby22"
+    paths:
+    - vendor
+  tags:
+    - ruby
+    - mysql
+
+spec:services:ruby22:
+  image: ruby:2.2
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
+  cache:
+    key: "ruby22"
+    paths:
+    - vendor
+  tags:
+    - ruby
+    - mysql
+
+spec:benchmark:ruby22:
+  image: ruby:2.2
+  only:
+  - master
+  script:
+    - RAILS_ENV=test bundle exec rake spec:benchmark
+  cache:
+    key: "ruby22"
+    paths:
+    - vendor
+  tags:
+    - ruby
+    - mysql
+  allow_failure: true
+
+spec:other:ruby22:
+  image: ruby:2.2
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
+  cache:
+    key: "ruby22"
+    paths:
+    - vendor
+  tags:
+    - ruby
+    - mysql
+
+spinach:project:half:ruby22:
+  image: ruby:2.2
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
+  cache:
+    key: "ruby22"
+    paths:
+    - vendor
+  tags:
+    - ruby
+    - mysql
+
+spinach:project:rest:ruby22:
+  image: ruby:2.2
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
+  cache:
+    key: "ruby22"
+    paths:
+    - vendor
+  tags:
+    - ruby
+    - mysql
+
+spinach:other:ruby22:
+  image: ruby:2.2
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
+  cache:
+    key: "ruby22"
+    paths:
+    - vendor
+  tags:
+    - ruby
+    - mysql
+
diff --git a/.ruby-version b/.ruby-version
index 04b10b4f150135c42748aead459c7ae6caa77c16..ebf14b46981c4134412e7deaef0ccdc719a195d4 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.1.7
+2.1.8
diff --git a/doc/development/ci_setup.md b/doc/development/ci_setup.md
index 70f02bf08e0ad5e73d0ad9a9e509e757f40a5d11..6776d9b083fd70b4101d271762ea3d8053de9237 100644
--- a/doc/development/ci_setup.md
+++ b/doc/development/ci_setup.md
@@ -26,7 +26,7 @@ We use [these build scripts](https://gitlab.com/gitlab-org/gitlab-ci/blob/master
 # Build configuration on [Semaphore](https://semaphoreapp.com/gitlabhq/gitlabhq/) for testing the [GitHub.com repo](https://github.com/gitlabhq/gitlabhq)
 
 - Language: Ruby
-- Ruby version: 2.1.7
+- Ruby version: 2.1.8
 - database.yml: pg
 
 Build commands
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 12334c908304655f4206ebd7fdc09b3e87e8df72..2a5b99609e40b96a16937f832682f29c166a7a6e 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -123,9 +123,9 @@ Remove the old Ruby 1.8 if present:
 Download Ruby and compile it:
 
     mkdir /tmp/ruby && cd /tmp/ruby
-    curl -O --progress https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.7.tar.gz
-    echo 'e2e195a4a58133e3ad33b955c829bb536fa3c075  ruby-2.1.7.tar.gz' | shasum -c - && tar xzf ruby-2.1.7.tar.gz
-    cd ruby-2.1.7
+    curl -O --progress https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.8.tar.gz
+    echo 'c7e50159357afd87b13dc5eaf4ac486a70011149  ruby-2.1.8.tar.gz' | shasum -c - && tar xzf ruby-2.1.8.tar.gz
+    cd ruby-2.1.8
     ./configure --disable-install-rdoc
     make
     sudo make install