Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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: rails/rails
...
head fork: rails/rails
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Dec 28, 2007
@jeremy jeremy Branching for stable 2.0.x line of development just before addition o…
…f native mongrel handler.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8495 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
9bd987f
@jeremy jeremy Merge r8497 from trunk: ensure that test case setup is run even if ov…
…erridden. References #10382.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8498 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
c48a1fc
Commits on Jan 02, 2008
@jeremy jeremy Merge [8519] from trunk: SQLite: db:drop:all doesn't fail silently if…
… the database is already open. References #10577.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8520 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
131acec
Commits on Jan 03, 2008
@NZKoz NZKoz Merge CSV compat changes to stable, closes #10673
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8545 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
fa7e937
Commits on Jan 07, 2008
@NZKoz NZKoz Catchup Backport to 2.0 of the following Changesets:
[8489]
[8491]
[8496]
[8502]
[8503]
[8504]
[8505]
[8506]
[8508]
[8516]
[8521]
[8522]
[8525]
[8526]
[8527]
[8528]
[8529]
[8531]
[8532]
[8533]
[8534]
[8535]
[8536]
[8539]
[8541]
[8543]
[8554]
[8556]
[8558]
[8560]
[8561]
[8562]
[8576]
[8577]
[8581]
[8583]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8585 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
083b0b7
@technoweenie technoweenie Doc fixes for #atom_feed_helper. #10715 [hasmanyjosh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8592 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
24abd43
Commits on Jan 08, 2008
@NZKoz NZKoz Merge classify documentation. Closes #10615 [kris_chambers]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8599 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
274ef21
@NZKoz NZKoz Merge labelled_form_for example. Closes #10738 [justinfrench, Koz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8600 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b2eca73
@NZKoz NZKoz Don't append the forgery token to an ajax request if it's serializing…
… a form, prevents duplicate tokens. References #10684 [macournoyer]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8601 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
002e73a
Commits on Jan 09, 2008
@jeremy jeremy Merge [8602] to stable: observed_subclasses gives [] if there are no …
…observed classes

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8603 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
9b31893
@jeremy jeremy Merge [8604] to stable: fix up Enumerable#group_by
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8605 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
09b1021
@jeremy jeremy Merge [8606] to stable: document date and time to_formatted_s. Refere…
…nces #10747.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8607 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
3328171
@jeremy jeremy Merge [8608] to stable: simplify to_formatted_s docs. References #10747.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8609 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
3006870
Commits on Jan 10, 2008
@jeremy jeremy Merge [8615] to stable: resurrect WordNet synonym lookups. References #…
…10710.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e2ce901
@jeremy jeremy Merge [8616] to stable: UrlWriter respects relative_url_root. Referen…
…ces #10748.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8618 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ca66f44
Commits on Jan 11, 2008
@technoweenie technoweenie Updated TMail to version 1.2.1 (2.0 stable) [raasdnil]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8621 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
3a90e72
@jeremy jeremy Merge [8622] to stable. References #10766.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8623 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
207473b
Commits on Jan 12, 2008
@NZKoz NZKoz Merge [8627] fix to stable.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8631 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1752dcc
@NZKoz NZKoz Merge the fix for redirecting to nil. References #10272 [farleyknight]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8634 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f3b3826
Commits on Jan 14, 2008
@NZKoz NZKoz Correct docs on caching and all.js. Merging [8641]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8642 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6997918
Commits on Feb 02, 2008
@jeremy jeremy Merge r8774 from trunk: fix number_to_human_size incorrectly removing…
… trailing zeros. References #10099.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8775 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f09a529
@jeremy jeremy Merge r8778 from trunk: fix calculations on associations with custom …
…:foreign_key. References #8117.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8779 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
c31a04a
@jeremy jeremy Merge r8782 from trunk: TestSession supports indifferent access. Refe…
…rences #7372.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8783 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
36fa00a
Commits on Feb 04, 2008
@NZKoz NZKoz Ensure that assert_redirected_to to top-level named route from namesp…
…aced controller work. Closes #10812 [dasil003]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8801 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2a07886
Commits on Feb 07, 2008
@technoweenie technoweenie Apply [8810], [8811], [8812], and [8813] to 2.0 stable
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8814 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
569a78c
Commits on Feb 10, 2008
@NZKoz NZKoz 2-0-stable: Ensure that modifying has_and_belongs_to_many actions cle…
…ar the query cache. References #10840 [john.andrews]  Merging [8653]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8828 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
68477ad
@NZKoz NZKoz 2-0-stable: Ensure mime types can be compared with symbols. References
…#10796 [bscofield]

Merging [8677]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8829 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
81991d6
@NZKoz NZKoz 2-0-stable: Add label_tag helper for generating elements. References #…
…10802 [DefV]

Merging [8685]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8830 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
c71de03
@NZKoz NZKoz 2-0-stable: Reference to :element option in documentation should be :…
…member. References #10905 [fxn]

Merging [8706]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8831 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
75aef09
@NZKoz NZKoz 2-0-stable: Add tests and documentation for allow_blank. References #…
…10651 [blj]

Merging [8733]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8832 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0f225c0
@NZKoz NZKoz 2-0-stable: Correct documentation for dom_id [jbarnette] References #…
…10775

Merging [8734]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8833 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
291dad2
@NZKoz NZKoz 2-0-stable: Don't repeatedly add relative_url_root to asset sources. …
…References #10767 [tomtoday, Koz]

Merging [8740]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8834 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b1aa674
@NZKoz NZKoz 2-0-stable: Precalculate the Backtrace of a template error to avoid r…
…aising exceptions in TemplateError#backtrace. These will abort the ruby vm. References #10936 [Aleksey Kondratenko]

Merging [8743]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8835 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a9113b8
@NZKoz NZKoz 2-0-stable: Make assert_routing aware of the HTTP method used. Refere…
…nces #8039 [mpalmer]

Merging [8748]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8836 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
8e556e5
@NZKoz NZKoz Rejig strange changelog error
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8837 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e3a39ca
@NZKoz NZKoz 2-0-stable: Make the non inferrable controller message a little frien…
…dlier. [Koz]

Merging [8749]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8838 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0dad92a
@NZKoz NZKoz 2-0-stable: When multiparameter date assignment fails due to an inval…
…id date, fall back to create a Time and convert to_date. References #10556 [leikind]

Merging [8777]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8839 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
8b63dd0
@NZKoz NZKoz 2-0-stable: Less verbose mail logging: just recipients for :info log …
…level; the whole email for :debug only. References #8000.

Merging [8781]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8840 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e1b3a44
@NZKoz NZKoz 2-0-stable: Make the docs reference the correct function. [Tobi Reif]
Merging [8802]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8841 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a77e57f
@NZKoz NZKoz 2-0-stable: Correct inconsistencies in RequestForgeryProtection docs.…
… References #11032 [mislav]

Merging [8807]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8842 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a550d2a
@NZKoz NZKoz Don't split cookies on comma also. References r8505.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8843 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2dbceab
@NZKoz NZKoz 2-0-stable: Add documentation for polymorphic URL helpers, make API c…
…onsistent for polymorphic_path and polymorphic_url.

References #10883 [mislav] References #8782 [gbuesing] References #8720 [gbuesing]

Merging [8741]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8844 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
41adf87
@NZKoz NZKoz 2-0-stable: Show RecordInvalid in the documentation. Closes #10976 [k…
…ampers]

Merging [8845]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8846 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f000028
Commits on Feb 12, 2008
@NZKoz NZKoz 2-0-stable: Remove table quoting; only pull last_insert_id if there's…
… a primary key.

Merging [8663]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8860 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5b714e7
Commits on Feb 14, 2008
@technoweenie technoweenie apply [8865] to 2.0 stable
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8866 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
9d03813
Commits on Feb 20, 2008
@NZKoz NZKoz 2-0-stable: Fix Fixtures for ActionController tests with fixtures. Cl…
…oses #11162 [menno.sman]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8910 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6a386ea
Commits on Feb 29, 2008
@NZKoz NZKoz 2-0-stable: Enumerable#group_by uses ActiveSupport::OrderedHash
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8946 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
833d3e4
@NZKoz NZKoz 2-0-stable: Revert [8866]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8947 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0a1deae
Commits on Mar 03, 2008
@NZKoz NZKoz 2-0-stable: Add OrderedHash#to_hash References #11266 [josh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8973 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0e57097
Commits on Mar 13, 2008
@technoweenie technoweenie port [9018] to 2.0 stable
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@9019 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b96db52
Commits on Mar 18, 2008
@jeremy jeremy Merge [9056] from trunk: Migrations: create_table supports primary_ke…
…y_prefix_type. References #10314.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@9057 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5a5b0b8
Commits on Mar 21, 2008
@jeremy jeremy Merge [9069] from trunk: Fix an edge case with extra periods in Routi…
…ng.normalize_paths. References #11337.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@9070 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1c207df
Commits on Mar 28, 2008
@jeremy jeremy Merge [9124] from trunk: Avoid remote_ip spoofing.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@9125 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2c96f50
Commits on May 06, 2008
@lifo lifo Deprecate ivars in view.
Deprecate use of @logger and @action_name instance variables inside
views. Please use instance methods logger and action_name instead.
63edc02
Commits on May 11, 2008
@fcheung fcheung Deprecate AR::Base#attributes argument
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
642da85
@NZKoz NZKoz Prepare for 2.0.3 44d721c
Commits on Jun 28, 2008
@jeremy jeremy Fix typo in apparently-dead will_unload? method. d356987
Commits on Aug 28, 2008
@larskanis larskanis PostgreSQL: fix quote_string for certain old pg drivers. [#94 state:r…
…esolved]
79c3f73
Commits on Sep 02, 2008
@NZKoz NZKoz Merge rexml-expansion-fix gem into activesupport. 9b251b6
@dhh dhh Prepare for 2.0.4 release e5c52a3
@dhh dhh Tell about the REXML fix in the CHANGELOG a5d2897
@dhh dhh Use personal server as temporary gem testing site until wrath get its…
… shit together
e8bf065
Commits on Sep 04, 2008
@dhh dhh A few updates, still in progress 61faf89
@dhh dhh Use FileUtil for cp 14995e1
@dhh dhh Actually, removing File/FileUtil entirely is the answer e724e3e
Commits on Sep 09, 2008
@NZKoz NZKoz Remove the Version check as it's not always available. ef3ac6e
Commits on Sep 10, 2008
@dhh dhh Account for two different REXML::Version/VERSION constants in version…
… check
0861772
Commits on Sep 22, 2008
@NZKoz NZKoz Bump the Version constants to align with the *next* release rather th…
…an the previous release.

This allows people tracking non-release gems or git submodules to use the constants.
760d525
Commits on Sep 23, 2008
@jonleighton jonleighton Backport offset/limit SQL injection fix to 2-0-stable
Signed-off-by: Michael Koziarski <michael@koziarski.com>
213f315
@NZKoz NZKoz Fix up messed up merge e857799
Commits on Oct 14, 2008
@NZKoz NZKoz Sanitize the URLs passed to redirect_to to prevent a potential respon…
…se spli

CGI.rb and mongrel don't do any sanitization of the contents of HTTP headers
7282ed8
Commits on Oct 19, 2008
@dhh dhh Prepare for release of 2.0.5 5f3f44a
@dhh dhh Use current time as build number c329794
Commits on Jan 15, 2009
@jeremy jeremy Don't append limit to primary key column definition. Freeze some cons…
…tants.
7192691
Commits on Sep 03, 2009
@Manfred Manfred Add methods for string verification and encoding cleanup code.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
e31d29f
@NZKoz NZKoz Clean tag attributes before passing through the escape_once logic.
Addresses CVE-2009-3009
5b8b417
Commits on Sep 11, 2009
@bohford bohford Remove redundant checks for valid character regexp in ActiveSupport::…
…Multibyte#clean and #verify.

[#3181 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
81d828a