Cherry picking encoding for 3.1 #1713

Merged
merged 3 commits into from Jun 15, 2011

Conversation

Projects
None yet
4 participants
Contributor

dmathieu commented Jun 15, 2011

josevalim added a commit that referenced this pull request Jun 15, 2011

Merge pull request #1713 from dmathieu/3-1-cherry
Cherry picking encoding for 3.1

@josevalim josevalim merged commit 1f813d9 into rails:3-1-stable Jun 15, 2011

@@ -12,6 +12,13 @@ module ActionDispatch
uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
assert_equal 'foo', uf.original_filename
end
+
@pixeltrix

pixeltrix Jun 15, 2011

Owner

Watch the extra whitespace :-)

@dmathieu

dmathieu Jun 15, 2011

Contributor

That would be textmate adding them automatically. You want me to remove them ?

@pixeltrix

pixeltrix Jun 15, 2011

Owner

Leave them for the moment

@pixeltrix

pixeltrix Jun 15, 2011

Owner

In future when cherry picking a bunch of small edits like this it's cleaner to git cherry-pick -x them all and then git rebase --interactive to squash them into a single commit with the original commits referenced in the squashed commit message.

@@ -30,6 +30,16 @@ module ActionDispatch
def size
@tempfile.size
end
+
@pixeltrix

pixeltrix Jun 15, 2011

Owner

Extra whitespace here too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment