aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* distance_of_time_in_words: 45-60 days is about 2 months, not about 1 monthElliot Winkler2012-04-302-3/+6
|
* Merge pull request #5175 from jasonnoble/rake_notes_directoriesJeremy Kemper2012-04-303-2/+90
|\ | | | | Custom directories for rake notes
| * Remove empty lines.Jason Noble2012-04-301-4/+0
| |
| * Fixed styling issues brought up by @jeremyJason Noble2012-04-302-3/+2
| |
| * Add documentation to command_line.textile explaining how to use additional ↵Jason Noble2012-04-301-0/+13
| | | | | | | | notes directories
| * Add ability to specify custom annotation directoriesJason Noble & Ralph Shnelvar2012-04-302-1/+46
| | | | | | | | | | | | | | | | | | SOURCE_ANNOTATION_DIRECTORIES='dir1,dir2' bundle exec rake notes Searches app, config, lib, script, test (default) Also searches dir1, dir2 References: #4536, #4540
| * Add test coverage for rake notesJason Noble & Ralph Shnelvar2012-04-301-1/+36
|/ | | | | Add separate tests to verify directories covered Add tests to verify file_types
* Merge pull request #5705 from lest/patch-3Jeremy Kemper2012-04-302-1/+10
|\ | | | | split CDATA end token in cdata_section helper
| * split CDATA end token in cdata_section helperSergey Nartimov2012-04-302-1/+10
| |
* | Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_storesJosé Valim2012-04-302-0/+14
|\ \ | | | | | | Support cookie jar options for all cookie stores
| * | Support cookie jar options for all cookie storesbrainopia2012-04-302-0/+14
| | |
* | | Merge pull request #6082 from brainopia/smarter_cookie_jarJosé Valim2012-04-302-15/+46
|\ \ \ | | | | | | | | Stream cookies only if needed
| * | | Dont stream back cookie value if it was set to the same valuebrainopia2012-04-302-4/+18
| | | |
| * | | Dont set cookie header for deletion of unexisting databrainopia2012-04-302-9/+26
| | | |
| * | | Simplify matching with array of possible domainsbrainopia2012-04-301-1/+1
| | | |
| * | | Use more appropriate one-liner for class declarationbrainopia2012-04-301-1/+1
| | | |
* | | | Merge pull request #6083 from brainopia/remove_unused_closed_ivarsJosé Valim2012-04-302-2/+0
|\ \ \ \ | |_|_|/ |/| | | Remove a couple of unused ivars left from previous refactoring
| * | | Remove unused ivars left from close checksbrainopia2012-04-302-2/+0
| | |/ | |/| | | | | | | These ivars were missed in d142572567 when close checks were removed
* | | Merge pull request #3726 from JanDupal/fix-date-helper-hiddenJosé Valim2012-04-302-0/+34
|\ \ \ | |_|/ |/| | fix Helpers::DateHelper with :use_hidden - hide separators
| * | fix Helpers::DateHelper with :use_hidden - hide separatorsJan Dupal2011-11-222-0/+34
| | |
* | | Merge pull request #5838 from IamNaN/patch-1Andrew White2012-04-301-2/+4
|\ \ \ | | | | | | | | Incorporating Pacific Island zone changes circa Dec 31 2011
| * | | Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. ↵Dave Gerton2012-04-131-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.
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 18:40:13 +0000