aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5821 from Deradon/fix-engine-tasksPiotr Sarnacki2012-05-031-1/+6
|\ | | | | Provided fix for calling rake tasks within mountable engines
| * Provided fix for calling rake tasks within mountable enginesPatrick Helm2012-04-121-1/+6
| |
* | Merge pull request #6012 from avakhov/dbconsole-testPiotr Sarnacki2012-05-031-22/+34
|\ \ | | | | | | Cover Rails::DBConsole with tests
| * | Add Rails::DBConsole testsAlexey Vakhov2012-05-021-22/+34
| | |
* | | Merge pull request #6119 from romanvbabenko/refactor/checking_rubygems_presenceJeremy Kemper2012-05-021-2/+0
|\ \ \ | | | | | | | | Gem const presence checking has been removed
| * | | Gem cont presence checking has been removedRoman V. Babenko2012-05-021-2/+0
| | | |
* | | | Rakefile executable attributes and shebang lines has been removedRoman V. Babenko2012-05-022-2/+0
|/ / /
* / / Use new hash syntax in generated GemfileOscar Del Ben2012-05-021-14/+14
|/ /
* | Merge pull request #4345 from sunaku/patch-1Santiago Pastorino2012-05-011-1/+1
|\ \ | | | | | | gemspec assumes that user kept all generated files
| * | gemspec assumes that user kept all generated files Suraj N. Kurapati2012-01-061-1/+1
| | | | | | | | | | | | | | | This commit allows the user be lazy and not update their gemspec's `files` directive after deleting unwanted files from their generated Rails plugin.
* | | Use :github option in Gemfile and make hashes consistentPiotr Sarnacki2012-05-011-8/+8
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-013-3/+3
|\ \ \
| * | | Revert "Added Short 1 line note about connection pools. "Vijay Dev2012-05-011-2/+0
| | | | | | | | | | | | | | | | This reverts commit c3954baee92446219606621c1b185360553a6d5d.
| * | | Added Short 1 line note about connection pools. Gaurish Sharma2012-04-301-0/+2
| | | | | | | | | | | | I hope its okay to add this here. if not, then please revert back.
| * | | Code-format references to config settingsMark Rushakoff2012-04-273-3/+3
| | | |
* | | | Fixed styling issues brought up by @jeremyJason Noble2012-04-301-1/+1
| | | |
* | | | Add ability to specify custom annotation directoriesJason Noble & Ralph Shnelvar2012-04-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SOURCE_ANNOTATION_DIRECTORIES='dir1,dir2' bundle exec rake notes Searches app, config, lib, script, test (default) Also searches dir1, dir2 References: #4536, #4540
* | | | Merge pull request #5530 from ↵José Valim2012-04-302-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 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-212-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generating a new Rails application The option is: -i, [--skip-index-html] # Skip public/index.html file
* | | | | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-291-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove some unused variable assignments
| * | | | | Remove unused assignmentsMark Rushakoff2012-04-291-1/+0
| | | | | |
* | | | | | Merge pull request #6036 from carlosantoniodasilva/routes-reloader-refactorSantiago Pastorino2012-04-292-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove some warnings and minor refactor in RoutesReloader
| * | | | | | Refactor RoutesReloader a bit to avoid creating extra hash objectsCarlos Antonio da Silva2012-04-281-3/+2
| | | | | | |
| * | | | | | Define only writer method for queue, as reader is declaredCarlos Antonio da Silva2012-04-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecation warning of method redefined.
* | | | | | | Close #3886 - Add THEAD and TBODY to scaffold markuptwinturbo2012-04-291-16/+20
| |/ / / / / |/| | | | |
* | | | | | Fix Engine#routes to not call draw_paths multiple timesPiotr Sarnacki2012-04-281-2/+4
| | | | | |
* | | | | | Engine#routes? method has been fixedRoman V. Babenko2012-04-281-1/+1
|/ / / / /
* | | | | Use Rails::Queueing::Queue instead of Queue so people can build their own ↵José Valim2012-04-285-4/+12
| | | | | | | | | | | | | | | | | | | | consumers around stdlib's Queue
* | | | | Fix failing test, TestQueue#contents is not #jobsCarlos Antonio da Silva2012-04-271-1/+1
| | | | |
* | | | | Merge pull request #6021 from sikachu/log_exceptionJosé Valim2012-04-271-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Log the exception from the ThreadConsumer
| * | | | | Log the exception from the ThreadConsumerPrem Sichanugrist2012-04-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | This will make sure you know when there's an exception occur.
* | | | | | adding the `jobs` method to the test queue for getting a list of testAaron Patterson2012-04-271-0/+8
|/ / / / / | | | | | | | | | | | | | | | jobs.
* | | | | Extend stdlib queue for the test queueAaron Patterson2012-04-271-18/+2
| | | | |
* | | | | Merge pull request #6020 from 7even/test_queue_orderAaron Patterson2012-04-271-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Rails::Queueing::TestQueue run order
| * | | | fixes run order in Rails::Queueing::TestQueueVsevolod Romashov2012-04-281-1/+1
| | | | |
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-283-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use <tt>Foo::Bar</tt> instead of +Foo::Bar+Mark Rushakof2012-04-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter doesn't render as code in HTML output. Regex used in Rubymine to locate the latter form: (\+)(:*\w+:(?::|\w)+)(\+)
| * | | | Fix misprints in assert_file & assert_instance_method docsAlexey Vakhov2012-04-261-4/+4
| | | | |
* | | | | add a factory method for queue construction so that apps can have multiple ↵Aaron Patterson2012-04-271-1/+5
| | | | | | | | | | | | | | | | | | | | queues
* | | | | Missing git add :trollface:Yehuda Katz2012-04-261-0/+65
| | | | |
* | | | | Initial queue implementationYehuda Katz2012-04-266-2/+24
| | | | |
* | | | | Routes reloader knows how to reload external filesYehuda Katz2012-04-252-4/+12
| | | | |
* | | | | Fix the buildYehuda Katz2012-04-251-1/+1
| | | | |
* | | | | Make files in paths consistentYehuda Katz2012-04-251-1/+1
| | | | |
* | | | | Allow loading external route files from the routerJose and Yehuda2012-04-253-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature enables the ability to load an external routes file from the router via: draw :filename External routes files go in +config/routes+. This feature works in both engines and applications.
* | | | | Remove blank line at the end of routes.rbJeremy Kemper2012-04-251-2/+1
| | | | |
* | | | | Merge pull request #5902 from avakhov/generator-no-indent-blank-linesJosé Valim2012-04-251-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Don't indent blank lines in named base generators
| * | | | Don't indent blank lines in named base generatorsAlexey Vakhov2012-04-251-1/+1
| | | | |
* | | | | Merge pull request #5880 from asanghi/masterJeremy Kemper2012-04-255-9/+9
|\ \ \ \ \ | |/ / / / |/| | | | Stamp out ruby-debug with debugger everywhere else in the code base
| * | | | and one more timeAditya Sanghi2012-04-244-6/+6
| | | | |