diff --git a/Gemfile.lock b/Gemfile.lock index b85cb39..c96e8dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,6 +6,15 @@ GIT kaminari (>= 0.13) rails (>= 3.1) +GIT + remote: git://github.com/rgrove/sanitize + revision: c62e83b34296f6433213cc008af8dee1421c5d1e + specs: + sanitize (3.0.2) + crass (~> 0.2.0) + nokogiri (>= 1.4.4) + nokogumbo (= 1.1.12) + GEM remote: https://rubygems.org/ specs: @@ -56,7 +65,6 @@ GEM activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) - charlock_holmes (0.6.9.4) climate_control (0.0.3) activesupport (>= 3.0) cocaine (0.5.3) @@ -68,6 +76,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) + crass (0.2.1) devise (2.2.8) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -97,25 +106,12 @@ GEM formtastic-bootstrap (3.0.0) formtastic (>= 2.2) git (1.2.6) - github-markup (0.7.5) - gitlab-grit (2.6.0) - charlock_holmes (~> 0.6.9) - diff-lcs (~> 1.1) - mime-types (~> 1.15) - posix-spawn (~> 0.3.6) globalize (3.0.4) activemodel (>= 3.0.0, < 4.0.0) activerecord (>= 3.0.0, < 4.0.0) globalize-versioning (0.1.0.alpha.1) globalize (>= 3, < 5) paper_trail (~> 3.0.0) - gollum-lib (2.0.0) - github-markup (>= 0.7.5, < 1.0.0) - gitlab-grit (= 2.6.0) - nokogiri (~> 1.6.0) - rouge (~> 1.3.1) - sanitize (~> 2.0.6) - stringex (~> 2.1.0) haml (4.0.5) tilt hashie (2.0.5) @@ -146,13 +142,15 @@ GEM meta-tags (2.0.0) actionpack (>= 3.0.0) mime-types (1.25.1) - mini_portile (0.5.2) + mini_portile (0.6.0) multi_json (1.8.4) multipart-post (1.2.0) mysql2 (0.3.14) net-ldap (0.3.1) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) + nokogiri (1.6.3.1) + mini_portile (= 0.6.0) + nokogumbo (1.1.12) + nokogiri oauth2 (0.8.1) faraday (~> 0.8) httpauth (~> 0.1) @@ -183,7 +181,6 @@ GEM cocaine (~> 0.5.0) mime-types polyglot (0.3.3) - posix-spawn (0.3.8) pyu-ruby-sasl (0.0.3.3) rack (1.4.5) rack-cache (1.2) @@ -220,7 +217,6 @@ GEM rinku (1.7.3) rmagick (2.13.2) rolify (3.2.0) - rouge (1.3.4) rspec-core (2.14.7) rspec-expectations (2.14.4) diff-lcs (>= 1.1.3, < 2.0) @@ -235,8 +231,6 @@ GEM rspec-mocks (~> 2.14.0) rubyntlm (0.1.1) rubyzip (1.1.6) - sanitize (2.0.6) - nokogiri (>= 1.4.4) sass (3.2.13) sass-rails (3.2.6) railties (~> 3.2.0) @@ -251,7 +245,6 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.8) - stringex (2.1.2) themes_for_rails (0.5.1) rails (>= 3.0.0) therubyracer (0.12.0) @@ -300,7 +293,6 @@ DEPENDENCIES git globalize (~> 3.0.4) globalize-versioning - gollum-lib haml jquery-datetimepicker-rails jquery-fileupload-rails @@ -319,7 +311,7 @@ DEPENDENCIES rolify rspec-rails rubyzip - sanitize + sanitize! sass-rails (~> 3.2) seed_dump (~> 0.5.3) simple_calendar (~> 0.1.9)