diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-14 15:42:10 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-14 15:42:10 +0100 |
| commit | 302e855f52b5d914e64bf6fbcc7e6544904c4e77 (patch) | |
| tree | 10ec4d64d0136080685a8d93e5c0d0c324c54f23 /Gemfile.lock | |
| parent | 72fefba4c18e2464725231b3426ec2e3b0eda9c4 (diff) | |
| parent | 3c9318a8c58f638f57cfe86cb2f84625445996c8 (diff) | |
| download | gitlab-ce-302e855f52b5d914e64bf6fbcc7e6544904c4e77.tar.gz | |
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index eeec4b67764..ca4084e18a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -336,7 +336,7 @@ GEM grape-entity (0.6.0) activesupport multi_json (>= 1.3.2) - grpc (1.2.2) + grpc (1.1.2) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) @@ -352,6 +352,8 @@ GEM tilt hashdiff (0.3.2) hashie (3.5.5) + hashie-forbidden_attributes (0.1.1) + hashie (>= 3.0) health_check (2.6.0) rails (>= 4.0) hipchat (1.5.2) @@ -925,6 +927,7 @@ DEPENDENCIES grape-entity (~> 0.6.0) haml_lint (~> 0.21.0) hamlit (~> 2.6.1) + hashie-forbidden_attributes health_check (~> 2.6.0) hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) |