Commit 3dfff698

@@ -8,7 +8,7 @@ gem 'heroku'
 gem 'jquery-rails'
 gem 'carrierwave'
 gem 'RedCloth', '>= 4.1.1'
-gem 'omniauth'
+gem 'omniauth', '>=0.2.6'
 gem 'rmagick'
 gem 'bcrypt-ruby'
 gem 'json'
@@ -30,7 +30,6 @@ group :test do
   gem 'guard-livereload'
   gem 'rb-fsevent', :require => false if RUBY_PLATFORM =~ /darwin/i
   gem 'growl', :require => false if RUBY_PLATFORM =~ /darwin/i
-  # linux part is not tested
   gem 'rb-inotify', :require => false if RUBY_PLATFORM =~ /linux/i
   gem 'libnotify', :require => false if RUBY_PLATFORM =~ /linux/i
 end

@@ -30,7 +30,7 @@ GEM
       activesupport (= 3.0.9)
     activesupport (3.0.9)
     acts-as-taggable-on (2.0.6)
-    addressable (2.2.6)
+    addressable (2.2.4)
     arel (2.0.10)
     bcrypt-ruby (2.1.4)
     builder (2.1.2)
@@ -67,20 +67,20 @@ GEM
     factory_girl_rails (1.1.0)
       factory_girl (~> 2.0.0)
       railties (>= 3.0.0)
-    faraday (0.7.4)
-      addressable (~> 2.2.6)
+    faraday (0.6.1)
+      addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
+      rack (< 2, >= 1.1.0)
     ffi (1.0.9)
-    fog (0.10.0)
+    fog (0.9.0)
       builder
-      excon (~> 0.6.5)
-      formatador (~> 0.2.0)
+      excon (~> 0.6.1)
+      formatador (>= 0.1.3)
+      json
       mime-types
-      multi_json (~> 1.0.3)
-      net-scp (~> 1.0.4)
-      net-ssh (~> 2.1.4)
-      nokogiri (~> 1.5.0)
+      net-scp (>= 1.0.4)
+      net-ssh (>= 2.1.4)
+      nokogiri (>= 1.4.4)
       ruby-hmac
     formatador (0.2.0)
     guard (0.5.1)
@@ -109,8 +109,7 @@ GEM
     json_pure (1.5.3)
     kaminari (0.12.4)
       rails (>= 3.0.0)
-    launchy (2.0.5)
-      addressable (~> 2.2.6)
+    launchy (2.0.3)
     libnotify (0.5.7)
     mail (2.2.19)
       activesupport (>= 2.3.6)
@@ -119,7 +118,9 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     multi_json (1.0.3)
+    multi_xml (0.2.2)
     multipart-post (1.1.3)
+    net-ldap (0.2.2)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -127,36 +128,54 @@ GEM
     net-ssh (2.1.4)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    nokogiri (1.5.0)
-    oa-core (0.0.5)
-      rack (~> 1.1)
-    oa-oauth (0.0.1)
-      json
-      nokogiri
-      oa-core (~> 0.0.0)
-      oauth
-      oauth2
-    oa-openid (0.0.5)
-      oa-core (= 0.0.5)
-      rack-openid (~> 1.1.1)
-      ruby-openid-apps-discovery
-    oauth (0.4.5)
-    oauth2 (0.5.0)
-      faraday (>= 0.6.1, < 0.8)
+    nokogiri (1.4.7)
+    oa-basic (0.2.6)
+      oa-core (= 0.2.6)
+      rest-client (~> 1.6.0)
+    oa-core (0.2.6)
+    oa-enterprise (0.2.6)
+      addressable (= 2.2.4)
+      net-ldap (~> 0.2.2)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.2.6)
+      pyu-ruby-sasl (~> 0.0.3.1)
+      rubyntlm (~> 0.1.1)
+    oa-more (0.2.6)
       multi_json (~> 1.0.0)
-    omniauth (0.0.1)
-      oa-core (~> 0.0.0)
-      oa-oauth (~> 0.0.0)
-      oa-openid (~> 0.0.0)
+      oa-core (= 0.2.6)
+      rest-client (~> 1.6.0)
+    oa-oauth (0.2.6)
+      faraday (~> 0.6.1)
+      multi_json (~> 1.0.0)
+      multi_xml (~> 0.2.2)
+      oa-core (= 0.2.6)
+      oauth (~> 0.4.0)
+      oauth2 (~> 0.4.1)
+    oa-openid (0.2.6)
+      oa-core (= 0.2.6)
+      rack-openid (~> 1.3.1)
+      ruby-openid-apps-discovery (~> 1.2.0)
+    oauth (0.4.5)
+    oauth2 (0.4.1)
+      faraday (~> 0.6.1)
+      multi_json (>= 0.0.5)
+    omniauth (0.2.6)
+      oa-basic (= 0.2.6)
+      oa-core (= 0.2.6)
+      oa-enterprise (= 0.2.6)
+      oa-more (= 0.2.6)
+      oa-oauth (= 0.2.6)
+      oa-openid (= 0.2.6)
     orm_adapter (0.0.5)
     pg (0.11.0)
     polyglot (0.3.2)
+    pyu-ruby-sasl (0.0.3.3)
     rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-openid (1.1.2)
-      rack (>= 0.4)
-      ruby-openid (>= 2.0.3)
+    rack-openid (1.3.1)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
     rack-test (0.5.7)
       rack (>= 1.0)
     rails (3.0.9)
@@ -198,6 +217,7 @@ GEM
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
+    rubyntlm (0.1.1)
     rubyzip (0.9.4)
     selenium-webdriver (0.2.2)
       childprocess (>= 0.1.9)
@@ -246,7 +266,7 @@ DEPENDENCIES
   json
   kaminari
   libnotify
-  omniauth
+  omniauth (>= 0.2.6)
   pg
   rails
   rake