From e07bc6a5486dfcc24deb52aef1357a48505ae56d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 28 Dec 2012 17:52:11 +0100
Subject: [PATCH] bump nokogiri
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index 66bdf0ecfa..a5e7153ad8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,7 +76,7 @@ gem 'rails-i18n', '0.7.2'
# parsing
-gem 'nokogiri', '1.5.5'
+gem 'nokogiri', '1.5.6'
gem 'redcarpet', "2.2.2"
gem 'roxml', :git => 'https://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0'
gem 'ruby-oembed', '0.8.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index df902a62c0..e70b6b40af 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -233,7 +233,7 @@ GEM
net-ssh (2.6.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- nokogiri (1.5.5)
+ nokogiri (1.5.6)
oauth (0.4.7)
oauth2 (0.8.0)
faraday (~> 0.8)
@@ -454,7 +454,7 @@ DEPENDENCIES
mini_magick (= 3.4)
mobile-fu (= 1.1.1)
mysql2 (= 0.3.11)
- nokogiri (= 1.5.5)
+ nokogiri (= 1.5.6)
omniauth (= 1.1.1)
omniauth-facebook (= 1.4.1)
omniauth-tumblr (= 1.1)
--
GitLab