Merge pull request #50 from edx/feature/jsa/moped-v121

force moped v1.2.1

Merge pull request #50 from edx/feature/jsa/moped-v121
force moped v1.2.1
993acdab · Jim Abramson · 56a20637 · 7b9ceeed · 993acdab · 993acdab
Commit 993acdab authored Aug 26, 2013 by Jim Abramson
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile
+1 -1

Gemfile.lock
+2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem 'yajl-ruby'
 gem 'ampex'

 gem 'mongo'
-gem 'moped'
+gem 'moped', "1.2.1"
 gem 'mongoid', "~> 3.0"
 gem 'bson_ext'


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,7 +96,7 @@ GEM
      moped (~> 1.1)
      origin (~> 1.0)
      tzinfo (~> 0.3.22)
-    moped (1.2.0)
+    moped (1.2.1)
    multi_json (1.3.6)
    newrelic_rpm (3.4.1)
    nokogiri (1.5.5)
@@ -176,7 +176,7 @@ DEPENDENCIES
  mongoid-tree!
  mongoid_magic_counter_cache!
  mongoid_taggable_with_context!
-  moped
+  moped (= 1.2.1)
  newrelic_rpm
  nokogiri
  pry