Fix layer switcher CSS

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 7679a6ccba333de324c9563523071445aa779a90..993b08aa7cccb919b5499c96d5c6f721303d2586 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -43,7 +43,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.2)
       coffee-script-source
       execjs
     coffee-script-source (1.6.2)

-    composite_primary_keys (5.0.12)
+    composite_primary_keys (5.0.13)

       activerecord (~> 3.2.0, >= 3.2.9)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
       activerecord (~> 3.2.0, >= 3.2.9)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)


@@ -53,7 +53,7 @@ GEM
       multi_json (~> 1.0)
     faraday (0.8.7)
       multipart-post (~> 1.1)
       multi_json (~> 1.0)
     faraday (0.8.7)
       multipart-post (~> 1.1)

-    hike (1.2.1)
+    hike (1.2.3)

     htmlentities (4.3.1)
     http_accept_language (1.0.2)
     httpauth (0.2.0)
     htmlentities (4.3.1)
     http_accept_language (1.0.2)
     httpauth (0.2.0)


@@ -63,10 +63,10 @@ GEM
       i18n
     iconv (0.1)
     journey (1.0.4)
       i18n
     iconv (0.1)
     journey (1.0.4)

-    jquery-rails (2.2.1)
+    jquery-rails (3.0.1)

       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)

-    json (1.7.7)
+    json (1.8.0)

     jsonify (0.3.1)
       multi_json (~> 1.0)
     jsonify-rails (0.3.2)
     jsonify (0.3.1)
       multi_json (~> 1.0)
     jsonify-rails (0.3.2)


@@ -80,22 +80,24 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)

-    memcached (1.5.0)
-    mime-types (1.21)
-    minitest (4.7.0)
-    multi_json (1.7.2)
-    multi_xml (0.5.3)
+    memcached (1.6.1)
+    mime-types (1.23)
+    mini_portile (0.5.0)
+    minitest (4.7.5)
+    multi_json (1.7.7)
+    multi_xml (0.5.4)

     multipart-post (1.2.0)
     multipart-post (1.2.0)

-    nokogiri (1.5.9)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)

     oauth (0.4.7)
     oauth-plugin (0.4.1)
       multi_json
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
     oauth (0.4.7)
     oauth-plugin (0.4.1)
       multi_json
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack

-    oauth2 (0.9.1)
+    oauth2 (0.9.2)

       faraday (~> 0.8)
       faraday (~> 0.8)

-      httpauth (~> 0.1)
+      httpauth (~> 0.2)

       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       multi_xml (~> 0.5)
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       multi_xml (~> 0.5)


@@ -107,13 +109,14 @@ GEM
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types

-    pg (0.15.0)
+    pg (0.15.1)

     polyglot (0.3.3)
     polyglot (0.3.3)

-    r2 (0.1.0)
+    psych (2.0.0)
+    r2 (0.2.1)

     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)

-    rack-cors (0.2.7)
+    rack-cors (0.2.8)

       rack
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       rack
     rack-openid (1.3.1)
       rack (>= 1.1.0)


@@ -139,15 +142,15 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)

-    rake (10.0.4)
+    rake (10.1.0)

     rdoc (3.12.2)
       json (~> 1.4)
     rdoc (3.12.2)
       json (~> 1.4)

-    redcarpet (2.2.2)
-    rinku (1.7.2)
+    redcarpet (2.3.0)
+    rinku (1.7.3)

     ruby-openid (2.2.3)
     ruby-openid (2.2.3)

-    sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
-    sass (3.2.7)
+    sanitize (2.0.4)
+      nokogiri (~> 1.6.0)
+    sass (3.2.9)

     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)


@@ -159,24 +162,25 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
       tilt (~> 1.1, != 1.3.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)

-    thor (0.18.0)
-    tilt (1.3.6)
+    thor (0.18.1)
+    tilt (1.4.1)

     timecop (0.6.1)
     timecop (0.6.1)

-    treetop (1.4.12)
+    treetop (1.4.14)

       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)

-    uglifier (1.3.0)
+    uglifier (2.1.1)

       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     validates_email_format_of (1.5.3)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     validates_email_format_of (1.5.3)

+    vendorer (0.1.14)

 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)

-  bigdecimal
+  bigdecimal (~> 1.1.0)

   coffee-rails (~> 3.2.1)
   composite_primary_keys (>= 5.0.10)
   deadlock_retry (>= 1.2.0)
   coffee-rails (~> 3.2.1)
   composite_primary_keys (>= 5.0.10)
   deadlock_retry (>= 1.2.0)


@@ -191,11 +195,12 @@ DEPENDENCIES
   jsonify-rails
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)
   jsonify-rails
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)

-  minitest
+  minitest (~> 4.7.0)

   oauth-plugin (>= 0.4.1)
   open_id_authentication (>= 1.1.0)
   paperclip (~> 2.0)
   pg
   oauth-plugin (>= 0.4.1)
   open_id_authentication (>= 1.1.0)
   paperclip (~> 2.0)
   pg

+  psych

   r2
   rack-cors
   rails (= 3.2.12)
   r2
   rack-cors
   rails (= 3.2.12)


@@ -209,3 +214,4 @@ DEPENDENCIES
   timecop
   uglifier (>= 1.0.3)
   validates_email_format_of (>= 1.5.1)
   timecop
   uglifier (>= 1.0.3)
   validates_email_format_of (>= 1.5.1)

+  vendorer