Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump haml from 3.1.4 to 5.0.0 #27

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.3)
coffee-script-source (1.12.2)
columnize (0.3.5)
daemons (1.1.4)
devise (1.5.2)
Expand All @@ -58,7 +58,9 @@ GEM
rails (~> 3.0)
friendly_id (4.0.0.beta14)
gem_plugin (0.2.3)
haml (3.1.4)
haml (5.0.0)
temple (>= 0.8.0)
tilt
hike (1.2.1)
hpricot (0.8.5)
i18n (0.6.0)
Expand All @@ -82,7 +84,6 @@ GEM
fastthread (>= 1.0.1)
gem_plugin (>= 0.2.3)
multi_json (1.0.4)
mysql2 (0.3.11)
nifty-generators (0.4.6)
orm_adapter (0.0.5)
pakunok (0.0.3)
Expand Down Expand Up @@ -146,6 +147,8 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.4.1)
temple (0.8.2)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
Expand Down Expand Up @@ -175,7 +178,6 @@ DEPENDENCIES
json
mixlib-authentication
mongrel
mysql2
nifty-generators
pakunok
rack-cache
Expand All @@ -186,5 +188,6 @@ DEPENDENCIES
ruby_parser
sass-rails (~> 3.1.5)
spice
sqlite3
uglifier (>= 1.0.3)
yajl-ruby