From fbf4fe10311a0474f94232f205e4cc6726271718 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Wed, 30 Nov 2016 15:42:06 +0100
Subject: [PATCH] emergency shallow tested fixes for server down

---
 Gemfile      |  9 +++++----
 Gemfile.lock | 15 +++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9b02172b..41574625 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.2.3'
+gem 'rails', '~> 4.2.6'
 gem 'rack-cors', require: 'rack/cors'
 
 # Bundle edge Rails instead:
@@ -15,7 +15,7 @@ gem 'slim-rails'
 gem 'jsonapi-serializers', github: 'bterkuile/jsonapi-serializers'
 group :assets do
   gem 'jquery-rails'
-  gem 'jquery-ui-rails'
+  gem 'jquery-ui-rails', '~> 5.0.5' # https://github.com/joliss/jquery-ui-rails/issues/108
   gem 'sass-rails' #, '~> 5.0.0'
   gem 'coffee-rails' #, '~> 3.2.1'
   #gem 'twitter-bootstrap-rails'
@@ -32,8 +32,9 @@ group :assets do
 
   gem 'uglifier', '>= 1.0.3'
 
-  #gem 'ember-source', '~> 2.5.1'
-  #gem 'ember-data-source', '~> 2.5.3'
+  gem 'ember-source', '~> 2.5.1'
+  gem 'ember-data-source', '~> 2.5.3'
+  gem "barber", "0.11.1"
   gem 'ember-rails'
 
   gem 'ember-validations-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7eca81e7..dad249f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,7 +95,7 @@ GEM
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
-    barber (0.11.2)
+    barber (0.11.1)
       ember-source (>= 1.0, < 3)
       execjs (>= 1.2, < 3)
     bcrypt (3.1.11)
@@ -179,7 +179,7 @@ GEM
     email_validator (1.6.0)
       activemodel
     ember-cli-assets (0.0.35)
-    ember-data-source (2.10.0)
+    ember-data-source (2.5.5)
       ember-source (>= 2, < 3.0)
     ember-emblem-template (0.4.0)
       ember-handlebars-template (~> 0.7.0)
@@ -200,7 +200,7 @@ GEM
       ember-source (>= 1.8.0)
       jquery-rails (>= 1.0.17)
       railties (>= 3.1)
-    ember-source (2.10.0)
+    ember-source (2.5.1)
     ember-validations-rails (1.0.0)
       railties
     erubis (2.7.0)
@@ -251,7 +251,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.0)
+    jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     js-routes (1.3.1)
       railties (>= 3.2)
@@ -470,6 +470,7 @@ DEPENDENCIES
   active_attr
   active_decorator
   airbrussh
+  barber (= 0.11.1)
   bourbon
   cancancan
   capistrano
@@ -483,9 +484,11 @@ DEPENDENCIES
   devise
   devise-i18n
   devise_simply_stored!
+  ember-data-source (~> 2.5.3)
   ember-emblem-template
   ember-handlebars-template
   ember-rails
+  ember-source (~> 2.5.1)
   ember-validations-rails
   exception_notification
   factory_girl_rails
@@ -496,7 +499,7 @@ DEPENDENCIES
   fuubar
   iso_country_codes
   jquery-rails
-  jquery-ui-rails
+  jquery-ui-rails (~> 5.0.5)
   js-routes
   jsonapi-serializers!
   kaminari
@@ -514,7 +517,7 @@ DEPENDENCIES
   puma
   quiet_assets
   rack-cors
-  rails (~> 4.2.3)
+  rails (~> 4.2.6)
   rails-assets-ember-qunit!
   rails-assets-qunit!
   rqrcode