From ff156351cccf88e65ce434a784615cd5aac7ccd8 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Sun, 24 Nov 2013 23:06:30 -0500
Subject: [PATCH] Bump mongoid

---
 Gemfile      |  1 +
 Gemfile.lock | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index eab991f..84aeb97 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,7 @@ gem 'actionmailer', RAILS_VERSION
 gem 'actionpack', RAILS_VERSION
 gem 'railties', RAILS_VERSION
 
+gem 'moped', github: 'mongoid/moped'
 gem 'mongoid', github: 'mongoid/mongoid'
 
 gem 'mongoid_rails_migrations'
diff --git a/Gemfile.lock b/Gemfile.lock
index b620203..22024ef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,6 +8,15 @@ GIT
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
 
+GIT
+  remote: git://github.com/mongoid/moped.git
+  revision: e238b4a757d64d980e3137c5b57a37a1729733a9
+  specs:
+    moped (2.0.0.beta6)
+      bson (~> 2.2)
+      connection_pool (~> 1.2)
+      optionable (~> 0.2.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -48,7 +57,7 @@ GEM
       builder
       json
     arel (4.0.2)
-    atomic (1.1.14)
+    atomic (1.1.16)
     bcrypt-ruby (3.1.2)
     better_errors (1.0.1)
       coderay (>= 1.0.0)
@@ -215,10 +224,6 @@ GEM
       bundler (>= 1.0.0)
       rails (>= 3.2.0)
       railties (>= 3.2.0)
-    moped (2.0.0.beta6)
-      bson (~> 2.2)
-      connection_pool (~> 1.2)
-      optionable (~> 0.2.0)
     multi_json (1.9.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
@@ -366,8 +371,8 @@ GEM
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    thread_safe (0.1.3)
-      atomic
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
     timecop (0.6.3)
     tins (0.12.0)
@@ -441,6 +446,8 @@ DEPENDENCIES
   mongoid!
   mongoid-rspec
   mongoid_rails_migrations
+  moped!
+  octokit (~> 2.0)
   omniauth-github
   pjax_rails
   poltergeist
--
libgit2 0.21.2