Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #5181 from mcmire/issue_3560 | Jeremy Kemper | 2012-04-30 | 2 | -20/+37 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | distance_of_time_in_words: Add/tweak comments to understand time intervals be... | Elliot Winkler | 2012-04-30 | 2 | -18/+32 | |
| * | | | | | | | | | distance_of_time_in_words: 45-60 days is about 2 months, not about 1 month | Elliot Winkler | 2012-04-30 | 2 | -3/+6 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #6091 from twinturbo/add-ids | Yehuda Katz | 2012-04-30 | 2 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add ActiveRecord::Base#ids | twinturbo | 2012-04-30 | 2 | -0/+14 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5175 from jasonnoble/rake_notes_directories | Jeremy Kemper | 2012-04-30 | 3 | -2/+90 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Remove empty lines. | Jason Noble | 2012-04-30 | 1 | -4/+0 | |
| * | | | | | | | Fixed styling issues brought up by @jeremy | Jason Noble | 2012-04-30 | 2 | -3/+2 | |
| * | | | | | | | Add documentation to command_line.textile explaining how to use additional no... | Jason Noble | 2012-04-30 | 1 | -0/+13 | |
| * | | | | | | | Add ability to specify custom annotation directories | Jason Noble & Ralph Shnelvar | 2012-04-30 | 2 | -1/+46 | |
| * | | | | | | | Add test coverage for rake notes | Jason Noble & Ralph Shnelvar | 2012-04-30 | 1 | -1/+36 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #5705 from lest/patch-3 | Jeremy Kemper | 2012-04-30 | 2 | -1/+10 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | split CDATA end token in cdata_section helper | Sergey Nartimov | 2012-04-30 | 2 | -1/+10 | |
* | | | | | | | | Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores | José Valim | 2012-04-30 | 2 | -0/+14 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Support cookie jar options for all cookie stores | brainopia | 2012-04-30 | 2 | -0/+14 | |
* | | | | | | | | | Merge pull request #6082 from brainopia/smarter_cookie_jar | José Valim | 2012-04-30 | 2 | -15/+46 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Dont stream back cookie value if it was set to the same value | brainopia | 2012-04-30 | 2 | -4/+18 | |
| * | | | | | | | | | Dont set cookie header for deletion of unexisting data | brainopia | 2012-04-30 | 2 | -9/+26 | |
| * | | | | | | | | | Simplify matching with array of possible domains | brainopia | 2012-04-30 | 1 | -1/+1 | |
| * | | | | | | | | | Use more appropriate one-liner for class declaration | brainopia | 2012-04-30 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #6083 from brainopia/remove_unused_closed_ivars | José Valim | 2012-04-30 | 2 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Remove unused ivars left from close checks | brainopia | 2012-04-30 | 2 | -2/+0 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #3726 from JanDupal/fix-date-helper-hidden | José Valim | 2012-04-30 | 2 | -0/+34 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | fix Helpers::DateHelper with :use_hidden - hide separators | Jan Dupal | 2011-11-22 | 2 | -0/+34 | |
* | | | | | | | | | Merge pull request #5838 from IamNaN/patch-1 | Andrew White | 2012-04-30 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. Fu... | Dave Gerton | 2012-04-13 | 1 | -2/+4 | |
* | | | | | | | | | | Merge pull request #6080 from carlosantoniodasilva/as-changelog-update | Xavier Noria | 2012-04-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Improve changelog of new :silence deprecation behavior | Carlos Antonio da Silva | 2012-04-30 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #6079 from arunagw/build_fix_master_observing_test | José Valim | 2012-04-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | build fix for observing_test.rb | Arun Agrawal | 2012-04-30 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #6077 from dmitriy-kiriyenko/improve_signature_of_time_in_... | José Valim | 2012-04-30 | 5 | -65/+98 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Replace boolean argument with an options hash. | Dmitriy Kiriyenko | 2012-04-30 | 5 | -65/+98 | |
* | | | | | | | | | | | Merge pull request #5530 from malclocke/add_option_to_skip_index.html_on_rail... | José Valim | 2012-04-30 | 3 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Added a generator option to remove the public/index.html file when generating... | Ivan Vanderbyl | 2012-03-21 | 3 | -0/+15 | |
* | | | | | | | | | | | | Merge pull request #6078 from lest/patch-4 | José Valim | 2012-04-30 | 2 | -18/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | no need to dup options in send_data | Sergey Nartimov | 2012-04-30 | 1 | -1/+1 | |
| * | | | | | | | | | | | | allow send_file/send_data to skip disposition header, closes #2973 | Sergey Nartimov | 2012-04-30 | 2 | -17/+22 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Update activesupport/CHANGELOG.md | José Valim | 2012-04-30 | 1 | -0/+2 | |
* | | | | | | | | | | | | Failing test for #6034 | Piotr Sarnacki | 2012-04-30 | 1 | -0/+20 | |
* | | | | | | | | | | | | Merge pull request #6034 from willbryant/flash_must_not_load_session_on_every... | Piotr Sarnacki | 2012-04-30 | 2 | -7/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | fix the Flash middleware loading the session on every request (very dangerous... | Will Bryant | 2012-04-28 | 2 | -7/+3 | |
* | | | | | | | | | | | | | Merge pull request #6072 from marcandre/observer_simplify_test | Santiago Pastorino | 2012-04-30 | 1 | -11/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Observer: simplify tests | Marc-Andre Lafortune | 2012-04-29 | 1 | -11/+4 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #5177 from cap10morgan/fix-gh-issue-4374 | José Valim | 2012-04-30 | 2 | -5/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | fix inflector bug where -ice gets pluralized into -ouse | Wes Morgan | 2012-02-25 | 2 | -5/+7 | |
* | | | | | | | | | | | | | | Merge pull request #6076 from arunagw/build_fix_observed_classes | José Valim | 2012-04-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Build fix for observed_classes | Arun Agrawal | 2012-04-30 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge pull request #6032 from lest/patch-2 | José Valim | 2012-04-30 | 3 | -1/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | wrap translate defaults to use translate helper features, closes #1102 | Sergey Nartimov | 2012-04-30 | 3 | -1/+41 | |
|/ / / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / | Add note about using 303 See Other for XHR requests other than GET/POST | Andrew White | 2012-04-30 | 1 | -0/+10 | |
|/ / / / / / / / / / / / / |