Merge branch 'fix-wrong-grape-version-requirement' into 'master'

Currently a dependency for grape `~> 1.1` is defined but gitlab does not work…

See merge request gitlab-org/gitlab-ce!23451

Gemfile

@@ -91,7 +91,7 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
 gem 'net-ldap'
 
 # API
-gem 'grape', '~> 1.1'
+gem 'grape', '~> 1.1.0'
 gem 'grape-entity', '~> 0.7.1'
 gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
 

Gemfile.lock

@@ -1017,7 +1017,7 @@ DEPENDENCIES
   google-api-client (~> 0.23)
   google-protobuf (~> 3.6)
   gpgme
-  grape (~> 1.1)
+  grape (~> 1.1.0)
   grape-entity (~> 0.7.1)
   grape-path-helpers (~> 1.0)
   grape_logging (~> 1.7)

Gemfile.rails4.lock

@@ -1008,7 +1008,7 @@ DEPENDENCIES
   google-api-client (~> 0.23)
   google-protobuf (~> 3.6)
   gpgme
-  grape (~> 1.1)
+  grape (~> 1.1.0)
   grape-entity (~> 0.7.1)
   grape-path-helpers (~> 1.0)
   grape_logging (~> 1.7)