From 7f92534f767fa20357a11c63f973ae3b79cc5b85 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 12 Jan 2012 00:33:54 +0200 Subject: [PATCH] pybments.rb version up. gitignore improved --- .gitignore | 2 + Gemfile | 2 +- Gemfile.lock | 6 +- db/test.sqlite3-journal | Bin 6704 -> 0 bytes nohup.out | 55305 -------------------------------------- 5 files changed, 6 insertions(+), 55309 deletions(-) delete mode 100644 db/test.sqlite3-journal delete mode 100644 nohup.out diff --git a/.gitignore b/.gitignore index a6828714..74111a22 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .bundle .rbx/ db/*.sqlite3 +db/*.sqlite3-journal log/*.log tmp/ .sass-cache/ @@ -9,3 +10,4 @@ coverage/* public/uploads/ .rvmrc .directory +nohup.out diff --git a/Gemfile b/Gemfile index e240fa65..603ef857 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem "six" gem "therubyracer" gem "faker" gem "seed-fu", "~> 2.1.0" -gem "pygments.rb", "0.2.3" +gem "pygments.rb", "0.2.4" gem "thin" gem "git" gem "acts_as_list" diff --git a/Gemfile.lock b/Gemfile.lock index 86a69981..25b7ee37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -142,8 +142,8 @@ GEM orm_adapter (0.0.5) polyglot (0.3.3) posix-spawn (0.3.6) - pygments.rb (0.2.3) - rubypython (>= 0.5.1) + pygments.rb (0.2.4) + rubypython (~> 0.5.3) rack (1.3.5) rack-cache (1.1) rack (>= 0.4) @@ -300,7 +300,7 @@ DEPENDENCIES kaminari launchy letter_opener - pygments.rb (= 0.2.3) + pygments.rb (= 0.2.4) rails (= 3.1.1) rails-footnotes (~> 3.7.5) rdiscount diff --git a/db/test.sqlite3-journal b/db/test.sqlite3-journal deleted file mode 100644 index 7a141a08c00730220fa4c848bf10e6da9d423889..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6704 zcmZQzK!D?xGv5Pw(hLktK#Bz+G0GawAt1~J^4(~359c@@_1kC&;0yt1xi2zW4&V%; zQHjwI81^9mEeC{nK|URA4-EVG9`)d82w)2VXgR>l%Y21_jd>OW^B3mb%G2dsN z1>}x`(GVC7fdL2s=F<$K5Nm}vm^B%5Q;X75