aboutsummaryrefslogtreecommitdiffstats
path: root/spec/relations
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2010-05-27 10:07:51 -0300
committerEmilio Tagua <miloops@gmail.com>2010-05-27 10:07:51 -0300
commita158a736c821703682fc89bb83d7990e4618b08c (patch)
tree832aa0281b0eaa932eda77f6e6da0be194db97ae /spec/relations
parent43bfd3fae496a2a859aad0a654a91437357c3450 (diff)
parent2ee391231842eec5ce75517c0b24576c1e2a3261 (diff)
downloadrails-a158a736c821703682fc89bb83d7990e4618b08c.tar.gz
rails-a158a736c821703682fc89bb83d7990e4618b08c.tar.bz2
rails-a158a736c821703682fc89bb83d7990e4618b08c.zip
Merge branch 'master' of github.com:brynary/arel
Diffstat (limited to 'spec/relations')
-rw-r--r--spec/relations/join_spec.rb2
-rw-r--r--spec/relations/relation_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/relations/join_spec.rb b/spec/relations/join_spec.rb
index b5ead51053..b4a46fae97 100644
--- a/spec/relations/join_spec.rb
+++ b/spec/relations/join_spec.rb
@@ -39,4 +39,4 @@ describe "Arel" do
it_should_behave_like 'A Relation'
end
-end \ No newline at end of file
+end
diff --git a/spec/relations/relation_spec.rb b/spec/relations/relation_spec.rb
index b5b73e2205..cfc1c1410b 100644
--- a/spec/relations/relation_spec.rb
+++ b/spec/relations/relation_spec.rb
@@ -28,4 +28,4 @@ describe "Arel" do
end
end
end
-end \ No newline at end of file
+end