Skip to content
Snippets Groups Projects
Commit 0d5cbd16 authored by Stan Hu's avatar Stan Hu
Browse files

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
parents 9ce28bf0 3cf07b6e
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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'
 
Loading
Loading
Loading
Loading
@@ -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)
Loading
Loading
Loading
Loading
@@ -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)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment