diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-11-30 07:36:51 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-11-30 07:36:51 +0000 |
| commit | 0d5cbd16ee3b8eac49d134af063b1827748f2b6d (patch) | |
| tree | c7ca90ace4f03c6b39ea72e26f9dec9adb3a99d1 | |
| parent | 9ce28bf08b7112bd80f97d9db749cffa5e034c5c (diff) | |
| parent | 3cf07b6e02559a723bf9818d9bb32c596ff8c105 (diff) | |
| download | gitlab-ce-0d5cbd16ee3b8eac49d134af063b1827748f2b6d.tar.gz | |
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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | Gemfile.rails4.lock | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index d7ef3b114d3..27730fa2cc3 100644 --- a/Gemfile.lock +++ b/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) diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index ea248dfdabe..2cd0ef3d97a 100644 --- a/Gemfile.rails4.lock +++ b/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) |