Merge branch 'feature-kerberos'

Gemfile

@@ -10,9 +10,8 @@ gem 'sqlite3'
 gem 'thin'
 
 gem 'devise'
-gem 'devise_pam_authenticatable',
-  :git      => 'git://github.com/atomaka/devise_pam_authenticatable.git',
-  :branch   => 'ruby19-update'
+gem 'devise-kerberos-authenticatable',
+  :git => 'git://github.com/atomaka/devise-kerberos-authenticatable.git'
 gem 'cancan'
 
 

Gemfile.lock

@@ -1,10 +1,10 @@
 GIT
-  remote: git://github.com/atomaka/devise_pam_authenticatable.git
-  revision: 0f735fbb3926a46b649c5ef1fa35a7dcd0d6d1f8
-  branch: ruby19-update
+  remote: git://github.com/atomaka/devise-kerberos-authenticatable.git
+  revision: a1ec781b8e982d37c31da6834b124663d377954d
   specs:
-    devise_pam_authenticatable (1.0.3)
-      rpam-ruby19
+    devise-kerberos-authenticatable (0.1.0)
+      devise (~> 2.2.3)
+      timfel-krb5-auth (~> 0.8)
 
 GEM
   remote: https://rubygems.org/
@@ -79,7 +79,7 @@ GEM
     fastercsv (1.5.5)
     haml (4.0.2)
       tilt
-    highline (1.6.16)
+    highline (1.6.18)
     hike (1.2.2)
     i18n (0.6.4)
     journey (1.0.4)
@@ -87,9 +87,9 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.7)
-    less (2.3.1)
+    less (2.3.2)
       commonjs (~> 0.2.6)
-    less-rails (2.3.2)
+    less-rails (2.3.3)
       actionpack (>= 3.1)
       less (~> 2.3.1)
     libv8 (3.3.10.4)
@@ -100,7 +100,7 @@ GEM
     meta_request (0.2.3)
       rack-contrib
       railties
-    mime-types (1.22)
+    mime-types (1.23)
     multi_json (1.7.2)
     orm_adapter (0.4.0)
     polyglot (0.3.3)
@@ -135,7 +135,6 @@ GEM
     rake (10.0.4)
     rdoc (3.12.2)
       json (~> 1.4)
-    rpam-ruby19 (1.2.1)
     ruby2ruby (2.0.3)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
@@ -156,7 +155,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
-    temple (0.6.3)
+    temple (0.6.4)
     terminal-table (1.4.5)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
@@ -166,6 +165,7 @@ GEM
       rack (>= 1.0.0)
     thor (0.18.1)
     tilt (1.3.7)
+    timfel-krb5-auth (0.8)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -190,7 +190,7 @@ DEPENDENCIES
   cancan
   coffee-rails (~> 3.2.1)
   devise
-  devise_pam_authenticatable!
+  devise-kerberos-authenticatable!
   jquery-rails
   less-rails
   meta_request

app/models/user.rb

@@ -3,7 +3,7 @@ class User < ActiveRecord::Base
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :rememberable, :trackable, :validatable,
-    :pam_authenticatable
+    :kerberos_authenticatable
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me