diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-19 17:17:18 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-19 17:17:18 +0400 |
| commit | 6298e55795f4cfa624bfd91bfe716cc21beb8544 (patch) | |
| tree | e6c5fec1e8c3d54c93f7dd65fc41c1bc32526aea /Gemfile.lock | |
| parent | aca574d0f414821a9a1bbdd0efe53b97cd42ca57 (diff) | |
| parent | ce7e6e61ef8e73cbe00ab63513e84eb1506e6bde (diff) | |
Merge branch 'simplecpov-update-0.9.0' of https://gitlab.com/twk3/gitlab-ce into 7-4-pre
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e9be030a8fa..62285e69b3f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,7 +106,7 @@ GEM devise (~> 3.2) diff-lcs (1.2.5) diffy (3.0.3) - docile (1.1.1) + docile (1.1.5) dotenv (0.9.0) dropzonejs-rails (0.4.14) rails (> 3.1) @@ -471,7 +471,7 @@ GEM redis (>= 3.0.4) redis-namespace (>= 1.3.1) simple_oauth (0.1.9) - simplecov (0.8.2) + simplecov (0.9.0) docile (~> 1.1.0) multi_json simplecov-html (~> 0.8.0) |