diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-09-05 11:33:09 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-09-05 11:33:09 -0700 |
| commit | 41e5ec8f74d9909050d54ae957b09a812a398c8e (patch) | |
| tree | 8d07352840703d1421e53c2e8a595cd4da049842 /Gemfile | |
| parent | f045903541ace5cf4fd3c6e4a05ecfd264c1c621 (diff) | |
| parent | 685066cd0e4bb9c2279c1ed43ae445d07c963743 (diff) | |
| download | gitlab-ce-41e5ec8f74d9909050d54ae957b09a812a398c8e.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -349,6 +349,8 @@ group :development, :test do gem 'activerecord_sane_schema_dumper', '0.2' gem 'stackprof', '~> 0.2.10', require: false + + gem 'simple_po_parser', '~> 1.1.2', require: false end group :test do @@ -395,7 +397,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.31.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.32.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false |