ignore for .idea + update gems

This commit is contained in:
Alexander Negoda 2012-07-20 23:57:24 +04:00
parent b8a14725ee
commit 3ae36b6689
2 changed files with 18 additions and 17 deletions

3
.gitignore vendored
View file

@ -13,4 +13,5 @@ config/deploy
Capfile
public/thumbs
public/uploads
vendor/cache
vendor/cache
.idea

View file

@ -29,18 +29,18 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
authlogic (3.1.0)
activerecord (>= 3.0.7)
activerecord (>= 3.0.7)
authlogic (3.1.3)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
builder (3.0.0)
carrierwave (0.6.1)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
erubis (2.7.0)
excon (0.13.4)
fog (1.3.1)
excon (0.14.3)
fog (1.4.0)
builder
excon (~> 0.13.0)
excon (~> 0.14.0)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
@ -48,25 +48,25 @@ GEM
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0)
ruby-hmac
formatador (0.2.1)
formatador (0.2.3)
hike (1.2.1)
i18n (0.6.0)
journey (1.0.3)
json (1.6.6)
journey (1.0.4)
json (1.7.3)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.18)
mini_exiftool (1.4.2)
mime-types (1.19)
mini_exiftool (1.6.0)
mini_magick (3.4)
subexec (~> 0.2.1)
multi_json (1.3.2)
multi_json (1.3.6)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.3.0)
nokogiri (1.5.2)
pg (0.13.2)
net-ssh (2.5.2)
nokogiri (1.5.5)
pg (0.14.0)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
@ -94,7 +94,7 @@ GEM
rdoc (3.12)
json (~> 1.4)
ruby-hmac (0.4.0)
sprockets (2.1.2)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)