added lockfile gem

dce3bbc8 · Francisco Juan · a23cc6ac · dce3bbc8 · dce3bbc8
Commit dce3bbc8 authored Mar 14, 2012 by Francisco Juan
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

Gemfile Gemfile +4 -0

Gemfile.lock Gemfile.lock +2 -0

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -21,6 +21,10 @@ group :rmagick do
  gem "rmagick", ">= 1.15.17"
 end

+#Required by gitolite
+gem "lockfile"
+
+
 # Use the commented pure ruby gems, if you have not the needed prerequisites on
 # board to compile the native ones.  Note, that their use is discouraged, since
 # their integration is propbably not that well tested and their are slower in

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,6 +15,7 @@ GEM
    edavis10-object_daddy (0.4.3)
    i18n (0.4.2)
    json (1.6.5)
+    lockfile (2.1.0)
    metaclass (0.0.1)
    mocha (0.10.5)
      metaclass (~> 0.0.1)
@@ -47,6 +48,7 @@ DEPENDENCIES
  edavis10-object_daddy
  i18n (~> 0.4.2)
  jruby-openssl
+  lockfile
  mocha
  pg (~> 0.9.0)
  rails (= 2.3.12)