Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: ivanacostarubio/rails
...
head fork: ivanacostarubio/rails
Commits on Feb 17, 2012
@arunagw arunagw fixed failing test in ruby-1.8.7-p358 0bf4dc8
@spastorino spastorino Merge pull request #5072 from arunagw/fix_failing_test_ruby187_p358_3…
…1stable

Fix failing test ruby187 p358 31stable
fd2b275
@pixeltrix pixeltrix Fix ActionDispatch::Static to serve files with unencoded PCHAR
RFC 3986[1] allows sub-delim characters in path segments unencoded,
however Rack::File requires them to be encoded so we use URI's
unescape method to leave them alone and then escape them again.

Also since the path gets passed to Dir[] we need to escape any glob
characters in the path.

[1]: http://www.ietf.org/rfc/rfc3986.txt
5fcbb94
@pixeltrix pixeltrix Simplify regexp bea34a7
Commits on Feb 18, 2012
@arunagw arunagw fixed assets test 7782a70
@josevalim josevalim Merge pull request #5079 from arunagw/fix_assets_test
Fix assets test
03db636
Commits on Feb 20, 2012
@pixeltrix pixeltrix Remove fixture files with Windows incompatible filenames
Windows doesn't allow `\ / : * ? " < > |` in filenames so create
the fixture files at runtime and ignore the incompatible ones when
running on Windows.
a786236
@tenderlove tenderlove search private / protected methods in trunk ruby da7d0a2
@lest lest fix output safety issue with select options 1be2bbe
Commits on Feb 21, 2012
@amatsuda amatsuda add AS::SafeBuffer#clone_empty baf6903
@amatsuda amatsuda use AS::SafeBuffer#clone_empty for flushing the output_buffer 2d4cdb0
@tenderlove tenderlove Merge pull request #5096 from lawso017/master
Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
Conflicts:

	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
	activerecord/test/cases/adapters/postgresql/schema_test.rb
f468d6e
@tenderlove tenderlove ruby 2.0 makes protected methods return false for respond_to, so pass…
… true as the second param
0032772
@tenderlove tenderlove more ruby 2.0 respond_to? changes 36c8521
@tenderlove tenderlove tag bind params with a bind param object 79f0a9b
Commits on Feb 22, 2012
@tenderlove tenderlove bumping up arel 995d792
@tenderlove tenderlove prepared statements can be disabled f290d6f
@tenderlove tenderlove fixing bad merge: adding bind substitution visitor 967b300
@tenderlove tenderlove updating RAILS_VERSION 8c677e9
Commits on Feb 25, 2012
@arunagw arunagw fixed build for ruby187-p358 406ece4
@fxn fxn Merge pull request #5165 from arunagw/build_fix_ruby187-p358-3-1-stable
Build fix ruby187 p358 3 1 stable
30a528a
@arunagw arunagw assert => assert_equal 6e49b3d
@spastorino spastorino Merge pull request #5171 from arunagw/3-1-stable
assert => assert_equal 3-1-stable
d693bd2
@glitterfang glitterfang Fix typo in match :to docs e6fca55
@noahhendrix noahhendrix Fixed typo in composed_of example with Money#<=>, was comparing amoun…
…t itself instead of other_money.amount
b5418e7
Commits on Feb 26, 2012
@pixeltrix pixeltrix Detect optional glob params when adding non-greedy regexp - closes #4817
.
5c18b99
Commits on Feb 27, 2012
@tenderlove tenderlove Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug
Binary mode window bug
47c3cf1
Commits on Feb 28, 2012
@kennyj kennyj Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. 42592b4
Commits on Feb 29, 2012
@tenderlove tenderlove Merge pull request #5207 from kennyj/fix_5173-31
[3-1-stable] Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931
0d7a507
Commits on Mar 01, 2012
@josevalim josevalim Ensure [] respects the status of the buffer. 3d86727
@arunagw arunagw call binmode on the tempfile for Ruby 1.8 compatibility 63069ec
@josevalim josevalim Merge pull request #5227 from arunagw/build_fix_3-1-stable
Build fix 3 1 stable
4c8679e
@tenderlove tenderlove Merge branch '3-1-stable-security' into 3-1-4
* 3-1-stable-security:
  Ensure [] respects the status of the buffer.
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
d1fc35f
@tenderlove tenderlove bumping to 3.1.4 1aabea6
@tenderlove tenderlove Merge branch '3-1-4' into 3-1-stable
* 3-1-4:
  bumping to 3.1.4
  Ensure [] respects the status of the buffer.
  updating RAILS_VERSION
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
11881ad
Commits on Mar 02, 2012
@carlosantoniodasilva carlosantoniodasilva Stop SafeBuffer#clone_empty from issuing warnings
Logic in clone_empty method was dealing with old @dirty variable, which
has changed by @html_safe in this commit:
rails@139963c

This was issuing a "not initialized variable" warning - related to:
rails#5237

The logic applied by this method is already handled by the [] override,
so there is no need to reset the variable here.
66c6c7f
@tenderlove tenderlove only log an error if there is a logger. fixes #5226
Conflicts:

	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
b1358c8
Commits on Mar 04, 2012
@carlosantoniodasilva carlosantoniodasilva Only run binary type cast test with encode! on Ruby 1.9 24e074f
Commits on Mar 06, 2012
@mikel mikel Increasing minimum version of mail due to security vulnerability foun…
…d in Mail 2.3.0 for sendmail or exim
5aa4f52
@josevalim josevalim Use latest rack-cache. 54621f7
Commits on Mar 07, 2012
@jeremy jeremy Use 1.9 native XML escaping to speed up html_escape and shush regexp …
…warnings

        length      user     system      total        real
before  6      0.010000   0.000000   0.010000 (  0.012378)
after   6      0.010000   0.000000   0.010000 (  0.012866)
before  60     0.040000   0.000000   0.040000 (  0.046273)
after   60     0.040000   0.000000   0.040000 (  0.036421)
before  600    0.390000   0.000000   0.390000 (  0.390670)
after   600    0.210000   0.000000   0.210000 (  0.209094)
before  6000   3.750000   0.000000   3.750000 (  3.751008)
after   6000   1.860000   0.000000   1.860000 (  1.857901)
7cdfd91
@arunagw arunagw Test fix failing in 1.8.7-p358 d024ce1
@spastorino spastorino Merge pull request #5322 from arunagw/test_fix_1.8.7-3-1-stable
Test fix 1.8.7 3 1 stable
7455627
Commits on Mar 12, 2012
@tenderlove tenderlove Merge pull request #5312 from kennyj/fix_3927-31
[3-1-stable] Use 1.9 native XML escaping to speed up html_escape and shush regexp warnings
bccffc9
Commits on Mar 13, 2012
@denisj denisj fix activerecord query_method regression with offset into Fixnum
add test to show offset query_methods on mysql & mysql2

change test to cover public API
b1fe2c6
@josevalim josevalim Merge pull request #5401 from arunagw/issue_4409_3-1-stable
Issue 4409 3 1 stable
cfab216
Commits on Mar 15, 2012
@ivanacostarubio force_ssl redirects taking into account the parameters passed to the url e0e791c
Something went wrong with that request. Please try again.