| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge pull request #6095 from route/assets_precompile_task | Jeremy Kemper | 2012-05-02 | 2 | -0/+12 | |
| |\ \ \ | | | | | | | | | Fix that asset precompile didn't respect the index.js convention. Fixes #3993. | |||||
| | * | | | Added test for assets:precompile for index files | Dmitry Vorotilin | 2012-05-01 | 1 | -0/+9 | |
| | | | | | ||||||
| | * | | | Fix #3993 assets:precompile task does not detect index files | Dmitry Vorotilin | 2012-05-01 | 1 | -0/+3 | |
| | | | | | ||||||
| * | | | | Deprecate remove_column with array as an argument | Piotr Sarnacki | 2012-05-02 | 3 | -0/+19 | |
| |/ / / | ||||||
| * | | | Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. | Dave Gerton | 2012-04-30 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011 switching from UTC-11 to UTC+13. American Samoa did not make the change and remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and documentation about the dateline change is in austalasia at IANA. (cherry picked from commit 1d08ce5f56e45fdee41bb16b2d8d4464bc69bf22) | |||||
| * | | | Failing test for #6034 | Piotr Sarnacki | 2012-04-30 | 1 | -0/+20 | |
| | | | | ||||||
| * | | | fix the Flash middleware loading the session on every request (very ↵ | Will Bryant | 2012-04-30 | 2 | -7/+3 | |
| | | | | | | | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called | |||||
| * | | | Add note about using 303 See Other for XHR requests other than GET/POST | Andrew White | 2012-04-30 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IE since version 6 and recently Chrome and Firefox have started following 302 redirects from XHR requests other than GET/POST using the original request method. This can lead to DELETE requests being redirected amongst other things. Although it doesn't directly affect the Rails framework since it doesn't return a 302 redirect to any non-GET/POST request a note has been added to raise awareness of the issue. Some references: Original article from @technoweenie: http://techno-weenie.net/2011/8/19/ie9-deletes-stuff/ Hacker News discussion of the article: http://news.ycombinator.com/item?id=2903493 WebKit bug report: https://bugs.webkit.org/show_bug.cgi?id=46183 Firefox bug report and changeset: https://bugzilla.mozilla.org/show_bug.cgi?id=598304 https://hg.mozilla.org/mozilla-central/rev/9525d7e2d20d Chrome bug report: http://code.google.com/p/chromium/issues/detail?id=56373 HTTPbis bug report and changeset: http://trac.tools.ietf.org/wg/httpbis/trac/ticket/160 http://trac.tools.ietf.org/wg/httpbis/trac/changeset/1428 Roy T. Fielding's history of the issue: http://ftp.ics.uci.edu/pub/ietf/http/hypermail/1997q3/0611.html Automated browser tests for the issue: http://www.mnot.net/javascript/xmlhttprequest/ Fixes #4144 (cherry picked from commit 24f143789a8989f3bccde14ff28067de25cafd87) | |||||
| * | | | Merge pull request #5922 from rafaelfranca/deprecate_javascript_helpers | Jeremy Kemper | 2012-04-29 | 9 | -18/+40 | |
| |\ \ \ | | | | | | | | | Deprecate link_to_function and button_to_function | |||||
| | * | | | Add release data to Rails 3.2.3 | Rafael Mendonça França | 2012-04-30 | 5 | -5/+5 | |
| | | | | | ||||||
| | * | | | Add CHANGELOG entry. | Rafael Mendonça França | 2012-04-30 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | Closes #5886 Closes #3093 | |||||
| | * | | | Deprecate link_to_function and button_to_function helpers | Rafael Mendonça França | 2012-04-30 | 2 | -12/+28 | |
| | | | | | ||||||
| | * | | | Add missing require when helpers are used in isolation | Rafael Mendonça França | 2012-04-30 | 1 | -0/+1 | |
| |/ / / | ||||||
| * | | | Restore interpolation of path option in redirect routes | Andrew White | 2012-04-29 | 2 | -1/+50 | |
| | | | | ||||||
| * | | | Add missing require from b608cdd64c95d0d16eb98d86562e22f3b01be9e3 | Andrew White | 2012-04-29 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Escape interpolated params when redirecting - fixes #5688 | Andrew White | 2012-04-29 | 2 | -1/+34 | |
| | | | | ||||||
| * | | | Merge pull request #6051 from rafaelfranca/fix_build | José Valim | 2012-04-29 | 2 | -3/+3 | |
| |\ \ \ | | | | | | | | | Fix the build | |||||
| | * | | | Remove warning of unused variable | Rafael Mendonça França | 2012-04-29 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Fix the build. | Rafael Mendonça França | 2012-04-29 | 1 | -2/+2 | |
| |/ / / | | | | | | | | | | | | | * The method for persisted records in 3-2-branch is 'PUT' * size is generated by default in inputs | |||||
| * | | | Don't convert params if the request isn't HTML - fixes #5341 | Andrew White | 2012-04-29 | 2 | -8/+58 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7a80b69e00f68e673c6ceb5cc684aa9196ed3d9f) Conflicts: actionpack/test/controller/test_test.rb | |||||
| * | | | Lazy load `default_form_builder` if it's passed as a string | Piotr Sarnacki | 2012-04-28 | 4 | -2/+27 | |
| | | | | | | | | | | | | | closes #3341 | |||||
| * | | | Allow Thor 0.15 and 1.0, to be released shortly | tomhuda | 2012-04-28 | 1 | -1/+5 | |
| |/ / | ||||||
| * | | Merge pull request #6038 from arunagw/warning_removed_3-2-stable | Piotr Sarnacki | 2012-04-28 | 1 | -1/+0 | |
| |\ \ | | | | | | | Warning removed 3 2 stable | |||||
| | * | | Remove circular require of time/zones | Oscar Del Ben | 2012-04-29 | 1 | -1/+0 | |
| |/ / | ||||||
| * | | Merge pull request #6022 from sikachu/3-2-stable-record_tag_backport | Aaron Patterson | 2012-04-27 | 2 | -2/+8 | |
| |\ \ | | | | | | | Do not mutate options hash | |||||
| | * | | Do not mutate options hash | Carlos Antonio da Silva | 2012-04-27 | 2 | -2/+8 | |
| |/ / | ||||||
| * | | Merge pull request #4528 from j-manu/log-tailer-fix | Aaron Patterson | 2012-04-27 | 1 | -3/+7 | |
| | | | | | | | | | Fix for log tailer when the log file doesn't exist. | |||||
| * | | fix number_to_human docs [ci skip] | Vijay Dev | 2012-04-26 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge pull request #5971 from carlosantoniodasilva/fix-build-3-2 | Jeremy Kemper | 2012-04-24 | 1 | -1/+1 | |
| |\ \ | | | | | | | Add extra order clause to fix failing test on Ruby 1.8.7 | |||||
| | * | | Add extra order clause to fix failing test on Ruby 1.8.7 | Carlos Antonio da Silva | 2012-04-24 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge pull request #5968 from sikachu/3-2-stable-backport | Jeremy Kemper | 2012-04-24 | 2 | -3/+9 | |
| |\ \ | | | | | | | Backport workarounds for Mocha behavior changes. | |||||
| | * | | Fix build. It seems that the Mocha's behavior were changed. | kennyj | 2012-04-24 | 2 | -3/+9 | |
| |/ / | ||||||
| * | | Merge pull request #5946 from sikachu/3-2-stable-fix-merge-conflict | Santiago Pastorino | 2012-04-23 | 1 | -9/+11 | |
| |\ \ | | | | | | | Fix broken test from the earlier merge conflict | |||||
| | * | | Fix broken test from the earlier merge conflict | Prem Sichanugrist | 2012-04-23 | 1 | -9/+11 | |
| |/ / | | | | | | | Seriously people, please run the test before submitting pull request. | |||||
| * | | Merge pull request #5866 from tiegz/minor_fixes_3-2-stable | Aaron Patterson | 2012-04-23 | 2 | -42/+27 | |
| |\ \ | | | | | | | Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead | |||||
| | * | | converting some tests to assert_raises, and DRY'ing retrieve_variable changes | Tieg Zaharia | 2012-04-16 | 2 | -47/+23 | |
| | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/test/template/render_test.rb | |||||
| | * | | catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead | Tieg Zaharia | 2012-04-16 | 2 | -1/+10 | |
| | | | | ||||||
| * | | | Merge pull request #5919 from joevandyk/rake-dsl-fix | Jeremy Kemper | 2012-04-23 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Only include Rake::DSL if it's defined (Rake >= 0.9) | |||||
| | * | | | Only include Rake::DSL if it's defined. | Joe Van Dyk | 2012-04-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | rake < 0.9 doesn't define Rake::DSL. | |||||
| * | | | | Merge pull request #5936 from arunagw/other_readme_fixes | Vijay Dev | 2012-04-23 | 6 | -6/+6 | |
| |\ \ \ \ | | | | | | | | | | | Updated other README to point 3-2-stable | |||||
| | * | | | | Updated other README to point 3-2-stable | Arun Agrawal | 2012-04-23 | 6 | -6/+6 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #5935 from arunagw/readme_fixes_3-2-stable | Vijay Dev | 2012-04-23 | 1 | -1/+1 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | As ARes is removed from master then 3-2-stable URL should be in README. | |||||
| | * | | | | ARes URL should be pointed to 3-2-stable tree not master. | Arun Agrawal | 2012-04-23 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #5896 from sferik/revert_5861 | Jeremy Kemper | 2012-04-21 | 2 | -4/+18 | |
| |\ \ \ \ | |/ / / |/| | | | Revert #5861. Feature-detect which MultiJson API to use. | |||||
| | * | | | Use `Object#respond_to?` to determine which MultiJson API to use | Erik Michaels-Ober | 2012-04-18 | 1 | -3/+17 | |
| | | | | | ||||||
| | * | | | Revert "multi_json is restricted to < 1.3 " | Erik Michaels-Ober | 2012-04-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | This reverts commit 9b14e3ff80ee4044cfd89a11effcb5f52eaf888b. | |||||
| * | | | | Be sure to correctly fetch PK name from MySQL even if the PK has some custom ↵ | Akira Matsuda | 2012-04-19 | 2 | -1/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option Backports #5900 Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb | |||||
| * | | | | Merge pull request #5898 from benedikt/3-2-stable | Jeremy Kemper | 2012-04-19 | 6 | -8/+40 | |
| |\ \ \ \ | |/ / / |/| | | | Readds the fix for #5667 and back ports the regression fix from #5718 | |||||
| | * | | | Removes unneeded caching from ActiveRecord::Base.relation | Benedikt Deicke | 2012-04-19 | 1 | -4/+3 | |
| | | | | | ||||||
| | * | | | Revert "Revert "Fix #5667. Preloading should ignore scoping."" | Benedikt Deicke | 2012-04-19 | 2 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1166d49f62ccab789be208112163ad13183224e2. Conflicts: activerecord/test/cases/associations/eager_test.rb | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |