diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-11 23:22:20 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-11 23:22:20 -0700 |
| commit | 07f8105f9786493d327716026a37875f7c7ef0d6 (patch) | |
| tree | d417d106e27b831e7c26bd44377af877c41a7e5f /Gemfile | |
| parent | 7b70d01279ea7de784b63ce41c52d460b93afbf9 (diff) | |
| parent | 2b950014c35534c817c58ebf43dcbf4bbf490b9e (diff) | |
| download | gitlab-ce-07f8105f9786493d327716026a37875f7c7ef0d6.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -64,7 +64,7 @@ gem 'gpgme' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.0.3', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' gem 'net-ldap' # Git Wiki @@ -402,7 +402,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly', '~> 0.26.0' +gem 'gitaly', '~> 0.27.0' gem 'toml-rb', '~> 0.3.15', require: false |