kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

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

See merge request gitlab-org/gitlab-ce!23451
This commit is contained in:
Stan Hu 2018-11-30 07:36:51 +00:00
commit 0d5cbd16ee
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -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'

2
Gemfile.lock
View file

@ -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)

2
Gemfile.rails4.lock
View file

@ -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)