Commit 21aaf79a

@@ -13,6 +13,7 @@ gem 'carrierwave'
 gem 'RedCloth', '>= 4.1.1'
 gem 'omniauth'
 gem 'rmagick'
+gem 'bcrypt-ruby'
 
 # Use unicorn as the web server
 # gem 'unicorn'

@@ -29,14 +29,14 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.5)
+    addressable (2.2.4)
     arel (2.0.9)
     bcrypt-ruby (2.1.4)
     builder (2.1.2)
     carrierwave (0.5.3)
       activesupport (~> 3.0)
     configuration (1.2.0)
-    devise (1.3.3)
+    devise (1.3.4)
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
@@ -46,15 +46,15 @@ GEM
     faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
-    heroku (2.0.4)
+      rack (< 2, >= 1.1.0)
+    heroku (2.1.4)
       launchy (>= 0.3.2)
-      rest-client (>= 1.4.0, < 1.7.0)
+      rest-client (~> 1.6.1)
       term-ansicolor (~> 1.0.5)
     i18n (0.5.0)
-    jquery-rails (0.2.7)
-      rails (~> 3.0)
-      thor (~> 0.14.4)
+    jquery-rails (1.0.2)
+      railties (~> 3.0)
+      thor (~> 0.14)
     launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
@@ -64,56 +64,55 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    multi_json (0.0.5)
-    multipart-post (1.1.0)
-    net-ldap (0.1.1)
+    multi_json (1.0.2)
+    multi_xml (0.2.2)
+    multipart-post (1.1.1)
+    net-ldap (0.2.2)
     nokogiri (1.4.4)
-    oa-basic (0.2.3)
-      multi_json (~> 0.0.2)
-      nokogiri (~> 1.4.2)
-      oa-core (= 0.2.3)
+    oa-basic (0.2.5)
+      oa-core (= 0.2.5)
       rest-client (~> 1.6.0)
-    oa-core (0.2.3)
-      rack (~> 1.1)
-    oa-enterprise (0.2.3)
-      net-ldap (~> 0.1.1)
+    oa-core (0.2.5)
+    oa-enterprise (0.2.5)
+      addressable (= 2.2.4)
+      net-ldap (~> 0.2.2)
       nokogiri (~> 1.4.2)
-      oa-core (= 0.2.3)
+      oa-core (= 0.2.5)
       pyu-ruby-sasl (~> 0.0.3.1)
       rubyntlm (~> 0.1.1)
-    oa-more (0.2.3)
-      multi_json (~> 0.0.2)
-      oa-core (= 0.2.3)
+    oa-more (0.2.5)
+      multi_json (~> 1.0.0)
+      oa-core (= 0.2.5)
       rest-client (~> 1.6.0)
-    oa-oauth (0.2.3)
+    oa-oauth (0.2.5)
       faraday (~> 0.6.1)
-      multi_json (>= 0.0.5)
-      nokogiri (~> 1.4.2)
-      oa-core (= 0.2.3)
+      multi_json (~> 1.0.0)
+      multi_xml (~> 0.2.2)
+      oa-core (= 0.2.5)
       oauth (~> 0.4.0)
-      oauth2 (~> 0.3.0)
-    oa-openid (0.2.3)
-      oa-core (= 0.2.3)
-      rack-openid (~> 1.2.0)
-      ruby-openid-apps-discovery
+      oauth2 (~> 0.4.1)
+    oa-openid (0.2.5)
+      oa-core (= 0.2.5)
+      rack-openid (~> 1.3.1)
+      ruby-openid-apps-discovery (~> 1.2.0)
     oauth (0.4.4)
-    oauth2 (0.3.0)
-      faraday (~> 0.6.0)
-      multi_json (~> 0.0.4)
-    omniauth (0.2.3)
-      oa-basic (= 0.2.3)
-      oa-core (= 0.2.3)
-      oa-enterprise (= 0.2.3)
-      oa-more (= 0.2.3)
-      oa-oauth (= 0.2.3)
-      oa-openid (= 0.2.3)
-    orm_adapter (0.0.4)
+    oauth2 (0.4.1)
+      faraday (~> 0.6.1)
+      multi_json (>= 0.0.5)
+    omniauth (0.2.5)
+      oa-basic (= 0.2.5)
+      oa-core (= 0.2.5)
+      oa-enterprise (= 0.2.5)
+      oa-more (= 0.2.5)
+      oa-oauth (= 0.2.5)
+      oa-openid (= 0.2.5)
+    orm_adapter (0.0.5)
     polyglot (0.3.1)
     pyu-ruby-sasl (0.0.3.2)
     rack (1.2.2)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-openid (1.2.0)
+    rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.5.7)
@@ -135,19 +134,19 @@ GEM
     rest-client (1.6.1)
       mime-types (>= 1.16)
     rmagick (2.13.1)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.0)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.5.0)
+      rspec (~> 2.6.0)
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
@@ -160,8 +159,8 @@ GEM
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.27)
-    warden (1.0.3)
-      rack (>= 1.0.0)
+    warden (1.0.4)
+      rack (>= 1.0)
     webrat (0.7.3)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
@@ -172,6 +171,7 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth (>= 4.1.1)
+  bcrypt-ruby
   carrierwave
   devise
   heroku