From a54d473a5f7f5d8df0f66d235ce4d38c43cf16b4 Mon Sep 17 00:00:00 2001
From: Bruno Nocera Zanette <bnzanette@inf.ufpr.br>
Date: Wed, 9 Sep 2015 17:08:07 -0300
Subject: [PATCH] Re-Enable Devises Gems

---
 Gemfile      |  4 ++--
 Gemfile.lock | 26 ++++++++++++++++++--------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7f1efd8f5..697968b70 100644
--- a/Gemfile
+++ b/Gemfile
@@ -55,10 +55,10 @@ group :test do
 end
 
 # authentication
-# gem 'devise'
+gem 'devise'
 
 # enable login via rest
-#gem 'devise_token_auth'
+gem 'devise_token_auth'
 gem 'rack-cors', require: 'rack/cors'
 
 #bootstrap
diff --git a/Gemfile.lock b/Gemfile.lock
index ae09f4cba..6d3cddb59 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,13 +42,14 @@ GEM
       memoizable (~> 0.4.0)
     arel (6.0.3)
     ast (2.1.0)
-    autoprefixer-rails (5.2.1.3)
+    autoprefixer-rails (6.0.2)
       execjs
       json
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    bcrypt (3.1.10)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -79,13 +80,16 @@ GEM
     debug_inspector (0.0.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (3.5.2)
+    devise (3.5.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
+    devise_token_auth (0.1.34)
+      devise (= 3.5.1)
+      rails (~> 4.2)
     diff-lcs (1.2.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
@@ -143,9 +147,10 @@ GEM
       orientdb4r (~> 0.5)
     orientdb4r (0.5.1)
       rest-client (~> 1.7)
+    orm_adapter (0.5.0)
     parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
-    pg (0.18.2)
+    pg (0.18.3)
     procto (0.0.2)
     puma (2.13.4)
     rack (1.6.4)
@@ -183,6 +188,8 @@ GEM
       parser (~> 2.2.0.pre.7)
       rainbow (>= 1.99, < 3.0)
       unparser (~> 0.2.2)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -199,12 +206,12 @@ GEM
       reek (= 1.6.5)
       virtus (~> 1.0)
     sass (3.4.18)
-    sass-rails (5.0.3)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
+      tilt (>= 1.1, < 3)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
@@ -218,14 +225,14 @@ GEM
     spring (1.3.6)
     sprockets (3.3.4)
       rack (~> 1.0)
-    sprockets-rails (2.3.2)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.1)
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
@@ -249,6 +256,8 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
+    warden (1.2.3)
+      rack (>= 1.0)
     web-console (2.2.1)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
@@ -265,8 +274,9 @@ DEPENDENCIES
   byebug
   chart-js-rails
   coffee-rails (~> 4.1.0)
-  dspace_rest_client (~> 1.1.0)
   devise
+  devise_token_auth
+  dspace_rest_client (~> 1.1.0)
   gruff
   jbuilder (~> 2.0)
   jquery-rails
-- 
GitLab