diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-12 21:11:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-12 21:11:03 +0300 |
| commit | 141ef7e93971ca11f404065554f6cc1e43e46a80 (patch) | |
| tree | f34b72081b7cb7eb25dbf7dc7900bb95c98606d4 /Gemfile | |
| parent | 84dd3070dff9e36897345bbfd8dc1bf3470376ae (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -84,9 +84,7 @@ gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap', '~> 0.16.3' # API -# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged -# Remove config/initializers/grape_patch.rb -gem 'grape', '= 1.4.0' +gem 'grape', '~> 1.5.1' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' |