aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Bernloehr <Heiko.Bernloehr@FreeIT.de>2013-06-01 17:38:59 +0200
committerHeiko Bernloehr <Heiko.Bernloehr@FreeIT.de>2013-06-01 17:41:18 +0200
commit9282361c2d7a935ee2252fb19b434ea85a22e8d6 (patch)
treef07a55bef6a3f98796c2d7734aba0885c77ae240
parente6a543fc6189d814d50e23db9d604b98adb61aaf (diff)
downloadecs2-9282361c2d7a935ee2252fb19b434ea85a22e8d6.tar.gz
ecs2-9282361c2d7a935ee2252fb19b434ea85a22e8d6.zip
Rails 2.3.18 doesn't work with HAML 4.x
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock6
2 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 35ae1f8..a1fd6bb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,5 +8,7 @@ gem "i18n", '0.3.7'
gem "ruby-debug"
gem 'rake', '~> 0.9.2.2'
gem "rdoc", '~> 3.12'
-gem "haml"
+# rails 2.3.x doesn't work with version 4.x
+gem "haml", '3.1.7'
+
diff --git a/Gemfile.lock b/Gemfile.lock
index 52c29b8..740b8a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,8 +12,7 @@ GEM
activesupport (= 2.3.18)
activesupport (2.3.18)
columnize (0.3.6)
- haml (4.0.3)
- tilt
+ haml (3.1.7)
i18n (0.3.7)
json (1.5.3)
jsonpretty (1.1.0)
@@ -39,13 +38,12 @@ GEM
simple-navigation (3.10.1)
activesupport (>= 2.3.2)
sqlite3 (1.3.7)
- tilt (1.4.1)
PLATFORMS
ruby
DEPENDENCIES
- haml
+ haml (= 3.1.7)
i18n (= 0.3.7)
json (= 1.5.3)
jsonpretty