Merge branch 'chulkilee-ruby-2.2.0' into 'master'

chulkilee ruby 2.2.0

Merged https://github.com/gitlabhq/gitlabhq/pull/8511 into master

See merge request !1369

.ruby-version

-2.1.5
+2.2.0

Gemfile

@@ -95,7 +95,7 @@ gem "github-markup"
 gem 'redcarpet', '~> 3.1.2'
 gem 'RedCloth'
 gem 'rdoc', '~>3.6'
-gem 'org-ruby', '= 0.9.9'
+gem 'org-ruby', '= 0.9.12'
 gem 'creole', '~>0.3.6'
 gem 'wikicloth', '=0.8.1'
 gem 'asciidoctor', '= 0.1.4'

Gemfile.lock

@@ -124,7 +124,7 @@ GEM
     equalizer (0.0.8)
     erubis (2.7.0)
     escape_utils (0.2.4)
-    eventmachine (1.0.3)
+    eventmachine (1.0.4)
     excon (0.32.1)
     execjs (2.0.2)
     expression_parser (0.9.0)
@@ -280,7 +280,7 @@ GEM
     kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.8.1)
+    kgio (2.9.2)
     launchy (2.4.2)
       addressable (~> 2.3)
     letter_opener (1.1.2)
@@ -343,7 +343,7 @@ GEM
     omniauth-twitter (1.0.1)
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
-    org-ruby (0.9.9)
+    org-ruby (0.9.12)
       rubypants (~> 0.2)
     orm_adapter (0.5.0)
     pg (0.15.1)
@@ -409,7 +409,7 @@ GEM
       activesupport (= 4.1.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.12.0)
+    raindrops (0.13.0)
     rake (10.3.2)
     raphael-rails (2.1.2)
     rb-fsevent (0.9.3)
@@ -677,7 +677,7 @@ DEPENDENCIES
   omniauth-kerberos
   omniauth-shibboleth
   omniauth-twitter
-  org-ruby (= 0.9.9)
+  org-ruby (= 0.9.12)
   pg
   poltergeist (~> 1.5.1)
   pry