From 00a025d9ce536f8d44a456a37bc3441f15ca28d8 Mon Sep 17 00:00:00 2001
From: Philipp Fischbeck <philipp.fischbeck@student.hpi.uni-potsdam.de>
Date: Sat, 31 Jan 2015 11:27:31 +0100
Subject: [PATCH] Install devise, update gems

---
 Gemfile      |  2 ++
 Gemfile.lock | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/Gemfile b/Gemfile
index c687f7e..966284a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,6 +38,8 @@ gem 'will_paginate-bootstrap'
 
 gem 'mathjax-rails'
 
+gem 'devise', '~> 3.4.1'
+
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 1af7ade..913f1ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,6 +39,7 @@ GEM
     arel (6.0.0)
     autoprefixer-rails (4.0.2.2)
       execjs
+    bcrypt (3.1.10)
     bh (1.2.0)
       actionpack
       activesupport
@@ -61,6 +62,13 @@ GEM
       term-ansicolor (= 1.2.2)
       thor (= 0.18.1)
     debug_inspector (0.0.2)
+    devise (3.4.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      responders
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
     docile (1.1.5)
     erubis (2.7.0)
     execjs (2.2.2)
@@ -88,6 +96,7 @@ GEM
     multi_json (1.10.1)
     nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
+    orm_adapter (0.5.0)
     rack (1.6.0)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -118,6 +127,8 @@ GEM
     rake (10.4.2)
     rdoc (4.2.0)
       json (~> 1.4)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     sass (3.4.9)
@@ -160,6 +171,8 @@ GEM
     uglifier (2.6.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    warden (1.2.3)
+      rack (>= 1.0)
     web-console (2.0.0)
       activemodel (~> 4.0)
       binding_of_caller (>= 0.7.2)
@@ -178,6 +191,7 @@ DEPENDENCIES
   bootstrap-sass (~> 3.3.1)
   coffee-rails (~> 4.1.0)
   coveralls (~> 0.7.2)
+  devise (~> 3.4.1)
   jbuilder (~> 2.0)
   jquery-rails
   mathjax-rails