From 211521df4f207156531c64f022654c3ef928c773 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 15 Jan 2016 11:30:02 -0500
Subject: [PATCH] SECURITY: Upgrade Ember to fix CVE-2015-7565

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index fdf24d76f9..2ae2cbd48f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,7 @@ gem 'active_model_serializers', '~> 0.8.3'
 gem 'onebox'
 
 gem 'ember-rails'
-gem 'ember-source', '1.12.1'
+gem 'ember-source', '1.12.2'
 gem 'barber'
 gem 'babel-transpiler'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f480eb6eb4..f6bfb131f5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,7 +90,7 @@ GEM
       ember-source (>= 1.1.0)
       jquery-rails (>= 1.0.17)
       railties (>= 3.1)
-    ember-source (1.12.1)
+    ember-source (1.12.2)
     erubis (2.7.0)
     eventmachine (1.0.8)
     excon (0.45.4)
@@ -415,7 +415,7 @@ DEPENDENCIES
   discourse-qunit-rails
   discourse_email_parser
   ember-rails
-  ember-source (= 1.12.1)
+  ember-source (= 1.12.2)
   excon
   fabrication (= 2.9.8)
   fakeweb (~> 1.3.0)