aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | Update guides - run single test for AR testingAlexey Vakhov2012-04-281-0/+6
| | | * | | | Update contributing guide - run single testAlexey Vakhov2012-04-281-0/+7
| | | * | | | Update AM exampleAlexey Vakhov2012-04-281-3/+3
| | | * | | | More using <tt>x</tt> instead of +x+ when the latter renders improperly.Mark Rushakoff2012-04-273-4/+4
| | * | | | | Add REST section to getting started guideOscar Del Ben2012-04-282-10/+50
| * | | | | | Document exception handling inside resce_from handlerstwinturbo2012-04-281-0/+1
* | | | | | | Merge pull request #2532 from hasclass/as_json__encode_infinite_and_nan_float...Piotr Sarnacki2012-04-302-0/+7
|\ \ \ \ \ \ \
| * | | | | | | JSON: Encode infinite or NaN floats as null to generate valid JSON.Sebi Burkhard2011-08-152-0/+7
* | | | | | | | Merge pull request #6093 from marcandre/observer_publicJeremy Kemper2012-04-302-21/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | notify_observers should be publicMarc-Andre Lafortune2012-04-302-21/+27
|/ / / / / / / /
* | | | | | | | Merge pull request #6063 from marcandre/observer_extra_argsAaron Patterson2012-04-302-11/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow extra arguments for ObserversMarc-Andre Lafortune2012-04-302-11/+26
* | | | | | | | | remove useless assertionsAaron Patterson2012-04-301-10/+3
* | | | | | | | | return value of block is returnedAaron Patterson2012-04-302-3/+14
* | | | | | | | | only yield to finder block if something is foundAaron Patterson2012-04-302-1/+11
* | | | | | | | | Fix PR #6091Andrew White2012-04-302-2/+2
* | | | | | | | | Merge pull request #5181 from mcmire/issue_3560Jeremy Kemper2012-04-302-20/+37
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | distance_of_time_in_words: Add/tweak comments to understand time intervals be...Elliot Winkler2012-04-302-18/+32
| * | | | | | | | | distance_of_time_in_words: 45-60 days is about 2 months, not about 1 monthElliot Winkler2012-04-302-3/+6
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6091 from twinturbo/add-idsYehuda Katz2012-04-302-0/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add ActiveRecord::Base#idstwinturbo2012-04-302-0/+14
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #5175 from jasonnoble/rake_notes_directoriesJeremy Kemper2012-04-303-2/+90
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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 no...Jason Noble2012-04-301-0/+13
| * | | | | | | Add ability to specify custom annotation directoriesJason Noble & Ralph Shnelvar2012-04-302-1/+46
| * | | | | | | Add test coverage for rake notesJason Noble & Ralph Shnelvar2012-04-301-1/+36
|/ / / / / / /
* | | | | | | Merge pull request #5705 from lest/patch-3Jeremy Kemper2012-04-302-1/+10
|\ \ \ \ \ \ \
| * | | | | | | 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 storesbrainopia2012-04-302-0/+14
* | | | | | | | | Merge pull request #6082 from brainopia/smarter_cookie_jarJosé Valim2012-04-302-15/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 unused ivars left from close checksbrainopia2012-04-302-2/+0
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3726 from JanDupal/fix-date-helper-hiddenJosé Valim2012-04-302-0/+34
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. Fu...Dave Gerton2012-04-131-2/+4
* | | | | | | | | | Merge pull request #6080 from carlosantoniodasilva/as-changelog-updateXavier Noria2012-04-301-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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.rbArun Agrawal2012-04-301-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #6077 from dmitriy-kiriyenko/improve_signature_of_time_in_...José Valim2012-04-305-65/+98
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Replace boolean argument with an options hash.Dmitriy Kiriyenko2012-04-305-65/+98
* | | | | | | | | | | Merge pull request #5530 from malclocke/add_option_to_skip_index.html_on_rail...José Valim2012-04-303-0/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added a generator option to remove the public/index.html file when generating...Ivan Vanderbyl2012-03-213-0/+15