aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6080 from carlosantoniodasilva/as-changelog-updateXavier Noria2012-04-301-1/+1
|\ | | | | Improve changelog of new :silence deprecation behavior
| * Improve changelog of new :silence deprecation behaviorCarlos Antonio da Silva2012-04-301-1/+1
|/
* Merge pull request #6079 from arunagw/build_fix_master_observing_testJosé Valim2012-04-301-1/+1
|\ | | | | build fix for observing_test.rb
| * build fix for observing_test.rbArun Agrawal2012-04-301-1/+1
|/ | | introduced here 17c990b153f8635874c006a7460ee95817543fc1
* Merge pull request #6077 from ↵José Valim2012-04-305-65/+98
|\ | | | | | | | | dmitriy-kiriyenko/improve_signature_of_time_in_words_helper Replace boolean argument with an options hash.
| * Replace boolean argument with an options hash.Dmitriy Kiriyenko2012-04-305-65/+98
| | | | | | | | | | | | | | | | This replaces `include_seconds` argument with an option key `include_seconds => true` in options hash. Also `time_ago_in_words` now passes options hash, including a `locale` key, which makes in compatible with `distance_of_time_in_words`.
* | Merge pull request #5530 from ↵José Valim2012-04-303-0/+15
|\ \ | | | | | | | | | | | | malclocke/add_option_to_skip_index.html_on_rails_generate Added a generator option to skip the public/index.html file
| * | Added a generator option to remove the public/index.html file when ↵Ivan Vanderbyl2012-03-213-0/+15
| | | | | | | | | | | | | | | | | | | | | generating a new Rails application The option is: -i, [--skip-index-html] # Skip public/index.html file
* | | Merge pull request #6078 from lest/patch-4José Valim2012-04-302-18/+23
|\ \ \ | | | | | | | | allow send_file/send_data to skip disposition header, closes #2973
| * | | no need to dup options in send_dataSergey Nartimov2012-04-301-1/+1
| | | | | | | | | | | | | | | | options aren't modified inside send_file_headers!
| * | | allow send_file/send_data to skip disposition header, closes #2973Sergey Nartimov2012-04-302-17/+22
| | |/ | |/|
* | | Update activesupport/CHANGELOG.mdJosé Valim2012-04-301-0/+2
| | |
* | | Failing test for #6034Piotr Sarnacki2012-04-301-0/+20
| | |
* | | Merge pull request #6034 from ↵Piotr Sarnacki2012-04-302-7/+3
|\ \ \ | | | | | | | | | | | | | | | | willbryant/flash_must_not_load_session_on_every_request_master Fix the Flash middleware loading the session on every request
| * | | fix the Flash middleware loading the session on every request (very ↵Will Bryant2012-04-282-7/+3
| | | | | | | | | | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called
* | | | Merge pull request #6072 from marcandre/observer_simplify_testSantiago Pastorino2012-04-301-11/+4
|\ \ \ \ | | | | | | | | | | Observer: simplify tests
| * | | | Observer: simplify testsMarc-Andre Lafortune2012-04-291-11/+4
| | | | |
* | | | | Merge pull request #5177 from cap10morgan/fix-gh-issue-4374José Valim2012-04-302-5/+7
|\ \ \ \ \ | | | | | | | | | | | | fix inflector bug where -ice gets singularized into -ouse
| * | | | | fix inflector bug where -ice gets pluralized into -ouseWes Morgan2012-02-252-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | This should happen for mouse or louse, but not slice or pumice.
* | | | | | Merge pull request #6076 from arunagw/build_fix_observed_classesJosé Valim2012-04-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Build fix for observed_classes
| * | | | | | Build fix for observed_classesArun Agrawal2012-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introduced here bad44e4f8f690039bd0db92ac25f10af536c6e71
* | | | | | | Merge pull request #6032 from lest/patch-2José Valim2012-04-303-1/+41
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | wrap translate defaults to use translate helper features
| * | | | | | wrap translate defaults to use translate helper features, closes #1102Sergey Nartimov2012-04-303-1/+41
|/ / / / / /
* / / / / / Add note about using 303 See Other for XHR requests other than GET/POSTAndrew White2012-04-301-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
* | | | | Merge pull request #5923 from rafaelfranca/remove_javascript_helpersJeremy Kemper2012-04-294-65/+3
|\ \ \ \ \ | | | | | | | | | | | | Remove button_to_function and link_to_function helpers
| * | | | | Remove `button_to_function` and `link_to_function` helpersRafael Mendonça França2012-04-303-65/+2
| | | | | |
| * | | | | Add missing require when helpers are used in isolationRafael Mendonça França2012-04-301-0/+1
|/ / / / /
* | | | | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-299-15/+7
|\ \ \ \ \ | | | | | | | | | | | | Remove some unused variable assignments
| * | | | | Remove unused assignmentsMark Rushakoff2012-04-294-8/+4
| | | | | |
| * | | | | Remove unused assignment in actionpack date helper testMark Rushakoff2012-04-291-1/+1
| | | | | |
| * | | | | Remove unused assignments from activerecord testsMark Rushakoff2012-04-294-6/+2
| | | | | |
* | | | | | Merge pull request #6075 from arunagw/warning_removed_unused_variableJeremy Kemper2012-04-291-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | railties variable is not required here.
| * | | | | | railties variable is not required here.Arun Agrawal2012-04-301-1/+0
| | | | | | |
* | | | | | | Merge pull request #6071 from marcandre/observer_redefJeremy Kemper2012-04-292-3/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix Observer by acting on singleton class. Fixes #3505.
| * | | | | | Fix Observer by acting on singleton class [#3505]Marc-Andre Lafortune2012-04-292-3/+14
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Also [issue #1034] [pull #6068]
* | | | | | Merge pull request #5942 from ↵Aaron Patterson2012-04-297-11/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcardarella/confirmation_error_message_on_confirmation_attribute confirmation validation error attribute
| * | | | | | Support i18n attributes for confirmationBrian Cardarella2012-04-243-3/+23
| | | | | | |
| * | | | | | Reordered changelog entryBrian Cardarella2012-04-231-2/+2
| | | | | | |
| * | | | | | Updated CHANGELOGBrian Cardarella2012-04-231-0/+2
| | | | | | |
| * | | | | | confirmation validation error attributeBrian Cardarella2012-04-236-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will render the error message on :#{attribute}_confirmation instead of on attribute itself. When rendering confirmation errors inline on the form with form builders such as SimpleForm and Formtastic it is confusing to the ender user to see the confirmation error message on the attribute element. Instead it makes more sense to have this validation error render on the confirmation field instead. The i18n message has been updated for the confirmation validator error message to include the original attribute name.
* | | | | | | Merge pull request #6067 from Locke23rus/patch-2Aaron Patterson2012-04-291-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix typo
| * | | | | | | Fix typoKirill Nikitin2012-04-301-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #5999 from bogdan/callbacksJeremy Kemper2012-04-291-7/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | AS::Callbacks#run_callbacks optimized to reduce backtrace
| * | | | | | | AS::Callbacks optimized to reduce call backtraceBogdan Gusiev2012-04-271-7/+7
| | | | | | | |
* | | | | | | | Merge pull request #6036 from carlosantoniodasilva/routes-reloader-refactorSantiago Pastorino2012-04-294-8/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove some warnings and minor refactor in RoutesReloader
| * | | | | | | | Refactor RoutesReloader a bit to avoid creating extra hash objectsCarlos Antonio da Silva2012-04-281-3/+2
| | | | | | | | |
| * | | | | | | | Remove Declarative module extending, it is already part of AS::TestCaseCarlos Antonio da Silva2012-04-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes method redefined warning.
| * | | | | | | | Define only writer method for queue, as reader is declaredCarlos Antonio da Silva2012-04-282-3/+2
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Remove deprecation warning of method redefined.
* | | | | | | | Restore interpolation of path option in redirect routesAndrew White2012-04-292-1/+42
| | | | | | | |
* | | | | | | | Merge pull request #6062 from marcandre/tweak_observerAaron Patterson2012-04-292-5/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Tweak observer
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 23:46:04 +0000