aboutsummaryrefslogtreecommitdiffstats
path: root/Thorfile
diff options
context:
space:
mode:
Diffstat (limited to 'Thorfile')
-rw-r--r--Thorfile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Thorfile b/Thorfile
index edc39a16b0..982a959e82 100644
--- a/Thorfile
+++ b/Thorfile
@@ -29,7 +29,10 @@ and query generation.
s.has_rdoc = true
s.extra_rdoc_files = %w[README.markdown]
- s.add_dependency "activerecord", ">= 3.0pre"
+ # Arel required ActiveRecord, but we're not declaring it to avoid a
+ # circular dependency chain. The solution is for ActiveRecord to release
+ # the connection adapters which Arel uses in a separate gem
+ # s.add_dependency "activerecord", ">= 3.0pre"
s.add_dependency "activesupport", ">= 3.0pre"
end
end