From ab481bb7a9fd8a557f7bbf00eff2dbea2cfb8787 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Thu, 13 Nov 2014 08:51:06 +1100
Subject: [PATCH] pull in latest arel

---
 Gemfile             | 1 +
 Gemfile_master.lock | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 590eb13a924..cf663f22a9e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,6 +70,7 @@ end
 gem 'seed-fu', '~> 2.3.3'
 
 if rails_master?
+  gem 'arel', git: 'https://github.com/rails/arel.git'
   gem 'rails', git: 'https://github.com/rails/rails.git'
 else
   gem 'rails'
diff --git a/Gemfile_master.lock b/Gemfile_master.lock
index 282da44494c..7eb60dad50a 100644
--- a/Gemfile_master.lock
+++ b/Gemfile_master.lock
@@ -6,6 +6,12 @@ GIT
     active_model_serializers (0.8.2)
       activemodel (>= 3.0)
 
+GIT
+  remote: https://github.com/rails/arel.git
+  revision: 5035526b534a5d7c9d95eb6b66ade349c3a947f0
+  specs:
+    arel (6.0.0.beta2)
+
 GIT
   remote: https://github.com/rails/rails.git
   revision: 46f172798e56ba5383ba5305e2cce5aad02e8e30
@@ -86,7 +92,6 @@ GEM
     annotate (2.6.5)
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
-    arel (6.0.0.beta2)
     barber (0.4.2)
       ember-source
       execjs
@@ -446,6 +451,7 @@ DEPENDENCIES
   actionpack-action_caching
   active_model_serializers!
   annotate
+  arel!
   barber
   better_errors
   binding_of_caller