Merge branch 'simplecpov-update-0.9.0' of https://gitlab.com/twk3/gitlab-ce into 7-4-pre

6298e557 · Dmitriy Zaporozhets · aca574d0 · ce7e6e61 · 6298e557
Commit 6298e557 authored Sep 19, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- 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)