aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-292-8/+58
* Merge pull request #5986 from carlosantoniodasilva/deprecation-behavior-silenceJosé Valim2012-04-293-2/+32
|\
| * Add test for default silence and stderr deprecation behaviorsCarlos Antonio da Silva2012-04-281-0/+20
| * Document #behavior= and update CHANGELOGtwinturbo2012-04-282-0/+9
| * Add a "silence" behavior to completely turn off deprecation warnings.Adam Hawkins2012-04-281-2/+3
* | Avoid calling content type multiple timesJosé Valim2012-04-291-4/+6
* | Merge pull request #2321 from omjokine/masterJosé Valim2012-04-292-2/+5
|\ \
| * \ Merge remote-tracking branch 'upstream/master'Olli Jokinen2011-12-01745-24065/+35303
| |\ \
| * | | fixed test case test_render_json_with_callback to use content_type applicatio...Olli Jokinen2011-07-281-1/+1
| * | | Change mimetype to Mime::JS if JSONP is usedOlli Jokinen2011-07-281-1/+4
* | | | Lazy load `default_form_builder` if it's passed as a stringPiotr Sarnacki2012-04-284-2/+27
* | | | Merge pull request #5996 from gazay/remove_excess_selfsJeremy Kemper2012-04-2841-324/+473
|\ \ \ \
| * | | | String quotes and trailing spacesAlexey Gaziev2012-04-2921-126/+126
| * | | | Indentation for private methodsAlexey Gaziev2012-04-292-20/+18
| * | | | AS core_ext refactoring pt.2Alexey Gaziev2012-04-2920-86/+110
| * | | | AS core_ext refactoringAlexey Gaziev2012-04-2915-93/+220
* | | | | Allow Thor 0.15 and 1.0, to be released shortlytomhuda2012-04-281-1/+5
* | | | | Don't create new directory for testsPiotr Sarnacki2012-04-282-26/+24
* | | | | Fix Engine#routes to not call draw_paths multiple timesPiotr Sarnacki2012-04-282-2/+14
* | | | | Engine#routes? method has been fixedRoman V. Babenko2012-04-281-1/+1
* | | | | Add a failing test for #5764Piotr Sarnacki2012-04-281-0/+16
* | | | | Merge session arg with existing session instead of overwritingAndrew White2012-04-283-1/+28
* | | | | Merge pull request #6028 from sikachu/master-fix_plpgsqlAaron Patterson2012-04-281-21/+29
|\ \ \ \ \
| * | | | | Create plpgsql language if not availablePrem Sichanugrist2012-04-271-21/+29
* | | | | | Merge pull request #6035 from carlosantoniodasilva/amo-translation-refactorJosé Valim2012-04-283-12/+17
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Refactor human attribute nameCarlos Antonio da Silva2012-04-282-7/+7
| * | | | | Do not modify options hash in human_attribute_name, remove reverse_mergeCarlos Antonio da Silva2012-04-282-5/+10
|/ / / / /
* | | | | Use Rails::Queueing::Queue instead of Queue so people can build their own con...José Valim2012-04-287-7/+15
* | | | | Merge pull request #6025 from carlosantoniodasilva/amo-errors-refactorJosé Valim2012-04-281-7/+7
|\ \ \ \ \
| * | | | | Refactor AMo::ErrorsCarlos Antonio da Silva2012-04-271-7/+7
* | | | | | Merge pull request #6024 from carlosantoniodasilva/amo-dirty-refactorJosé Valim2012-04-281-1/+3
|\ \ \ \ \ \
| * | | | | | Return earlier if attribute already changed in *_will_change! methodsCarlos Antonio da Silva2012-04-271-1/+3
| |/ / / / /
* | | | | | Merge pull request #6029 from aderyabin/fix_deprJosé Valim2012-04-282-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | removed deprecation warningsAndrey Deryabin2012-04-282-3/+3
|/ / / / /
* | | | | Merge pull request #6026 from sikachu/master-fix_warningSantiago Pastorino2012-04-271-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add parentheses to hide Ruby warningPrem Sichanugrist2012-04-271-1/+1
|/ / / /
* | | | Merge pull request #6023 from carlosantoniodasilva/fix-queue-testAaron Patterson2012-04-272-2/+2
|\ \ \ \
| * | | | Fix failing test, TestQueue#contents is not #jobsCarlos Antonio da Silva2012-04-272-2/+2
|/ / / /
* | | | Merge pull request #6021 from sikachu/log_exceptionJosé Valim2012-04-272-1/+21
|\ \ \ \
| * | | | Log the exception from the ThreadConsumerPrem Sichanugrist2012-04-272-1/+21
* | | | | ensure that draining the queue will raise exceptionsAaron Patterson2012-04-271-0/+5
* | | | | adding the `jobs` method to the test queue for getting a list of testAaron Patterson2012-04-272-0/+14
|/ / / /
* | | | oops!Aaron Patterson2012-04-271-1/+0
* | | | Extend stdlib queue for the test queueAaron Patterson2012-04-272-28/+12
* | | | do not depend on timeAaron Patterson2012-04-271-4/+4
* | | | Merge pull request #6020 from 7even/test_queue_orderAaron Patterson2012-04-272-1/+14
|\ \ \ \
| * | | | clean up empty linesVsevolod Romashov2012-04-281-3/+3
| * | | | fixes run order in Rails::Queueing::TestQueueVsevolod Romashov2012-04-282-1/+14
* | | | | made a few changes and fixes in getting started guide [ci skip]Vijay Dev2012-04-281-10/+6
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-2820-27/+219
|\ \ \ \ \