aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Generate appropriate error more judiciouslyMarc-Andre Lafortune2012-04-292-2/+18
|
* Fix error message:Marc-Andre Lafortune2012-04-281-3/+3
| | | | | - can pass the class, not the instance - "instance method" is confusing, use "method :instance" instead
* 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
| | | | | | | | | | | | | | | | | | | | | | | This may break existing tests that are asserting the whole session contents but should not break existing tests that are asserting individual keys - e.g: class SomeControllerTest < ActionController::TestCase setup do session['user_id'] = 1 end test "some test" do get :some_action, nil, { 'another_var' => 2 } # This assertion will now fail assert_equal({ 'another_var' => 2 }, session) # This assertion will still pass assert_equal 2, session['another_var] end end Fixes #1529.
* Merge pull request #6028 from sikachu/master-fix_plpgsqlAaron Patterson2012-04-281-21/+29
|\ | | | | Create plpgsql language if not available
| * Create plpgsql language if not availablePrem Sichanugrist2012-04-271-21/+29
| | | | | | | | | | This should fix the problem in Travis CI server. (http://travis-ci.org/#!/rails/rails/jobs/1194988)
* | Merge pull request #6035 from carlosantoniodasilva/amo-translation-refactorJosé Valim2012-04-283-12/+17
|\ \ | | | | | | Refactor AMo::Translation, avoid changing options in human attr name
| * | 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 ↵José Valim2012-04-287-7/+15
| | | | | | | | consumers around stdlib's Queue
* | Merge pull request #6025 from carlosantoniodasilva/amo-errors-refactorJosé Valim2012-04-281-7/+7
|\ \ | | | | | | Refactor AMo::Errors
| * | Refactor AMo::ErrorsCarlos Antonio da Silva2012-04-271-7/+7
| | | | | | | | | | | | | | | * Use merge!, remove reverse_merge * Use case statement instead of is_a? checks
* | | Merge pull request #6024 from carlosantoniodasilva/amo-dirty-refactorJosé Valim2012-04-281-1/+3
|\ \ \ | | | | | | | | Improve AMo::Dirty *_will_change! method
| * | | Return earlier if attribute already changed in *_will_change! methodsCarlos Antonio da Silva2012-04-271-1/+3
| |/ / | | | | | | | | | Avoid obtaining the value and duplicating it when possible.
* | | Merge pull request #6029 from aderyabin/fix_deprJosé Valim2012-04-282-3/+3
|\ \ \ | |_|/ |/| | removed deprecation warnings
| * | 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 warning
| * 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 related to TestQueue
| * 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 ThreadConsumer
| * Log the exception from the ThreadConsumerPrem Sichanugrist2012-04-272-1/+21
| | | | | | | | This will make sure you know when there's an exception occur.
* | 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
|/ | | | jobs.
* 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
|\ | | | | Rails::Queueing::TestQueue run order
| * 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
|\ \
| * \ Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-04-2710-16/+16
| |\ \
| | * | find_by_sql actually triggers after_findBernat Foj Capell2012-04-271-1/+1
| | | |
| | * | Fix it's -> itsMark Rushakoff2012-04-271-1/+1
| | | |
| | * | Use <tt>Foo::Bar</tt> instead of +Foo::Bar+Mark Rushakof2012-04-276-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter doesn't render as code in HTML output. Regex used in Rubymine to locate the latter form: (\+)(:*\w+:(?::|\w)+)(\+)
| | * | Active Support Core Extensions guide: reworded "on one hand" and similar to ↵Rory O’Kane2012-04-261-1/+1
| | | | | | | | | | | | | | | | "for one thing"
| | * | Minor typo.Jonathan Roes2012-04-261-1/+1
| | | |
| | * | Fix misprints in assert_file & assert_instance_method docsAlexey Vakhov2012-04-261-4/+4
| | | |
| * | | Add delete post section to Getting Started guideOscar Del Ben2012-04-275-1/+80
| |/ /
| * | minor docs improvementsOscar Del Ben2012-04-262-4/+4
| | |
| * | Add documentation for validate optionsOscar Del Ben2012-04-261-0/+13
| | |
| * | Enhance validations documentationOscar Del Ben2012-04-261-1/+1
| | |
| * | Merge branch 'master' of github.com:lifo/docrailsLes Nightingill2012-04-255-5/+105
| |\ \
| | * | Copy EditJames Strocel2012-04-251-1/+1
| | | |
| | * | Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-04-2595-667/+873
| | |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 08:17:25 +0000