aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | another attempt at the languageAditya Sanghi2012-04-183-4/+4
| | |
| * | stamp out ruby-debug19 with extreme prejudice :)Aditya Sanghi2012-04-175-9/+9
| | |
* | | Remove default match without specified methodJose and Yehuda2012-04-242-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current router DSL, using the +match+ DSL method will match all verbs for the path to the specified endpoint. In the vast majority of cases, people are currently using +match+ when they actually mean +get+. This introduces security implications. This commit disallows calling +match+ without an HTTP verb constraint by default. To explicitly match all verbs, this commit also adds a :via => :all option to +match+. Closes #5964
* | | Merge pull request #5929 from FLOChip/notesJeremy Kemper2012-04-241-3/+7
|\ \ \ | | | | | | | | `rake notes` and `rake notes:custom` now support css, scss, and css.
| * | | `rake notes` and `rake notes:custom` now supportTeng Siong Ong2012-04-221-3/+7
| | | | | | | | | | | | css, scss and css.
* | | | Deleting insecure and "bad practice" code. related: ↵Egor Homakov2012-04-241-5/+2
| | | | | | | | | | | | | | | | http://homakov.blogspot.com/2012/04/whitelist-your-routes-match-is-evil.html
* | | | Only include Rake::DSL if it's defined.Joe Van Dyk2012-04-231-1/+1
| | | | | | | | | | | | | | | | rake < 0.9 doesn't define Rake::DSL.
* | | | Refactor GeneratedAttributesCarlos Antonio da Silva2012-04-221-7/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | * Move reference? method to class to remove duplicated code * Move to_sym typecast from #initialize to .parse method (make it easier to refactor reference?), remove AS object/blank require * Use []= instead of merge!({}) * Remove in? in favor of include?, remove AS object/inclusion require
* | | Remove unused generator options. This was added for the removed rails new --httpSantiago Pastorino2012-04-183-9/+0
| | |
* | | Add hook for add_resource_routeSantiago Pastorino2012-04-183-7/+16
| | |
* | | Add missing dependency for active_record_deprecated_findersJuan Manuel Azambuja2012-04-181-0/+2
| | |
* | | Merge pull request #5869 from LachyGroom/patch-1Piotr Sarnacki2012-04-171-1/+1
|\ \ \ | | | | | | | | Changes b tag to strong
| * | | Changes b tag to strong CollectiveJam2012-04-161-1/+1
| |/ / | | | | | | | | | The change is made due to importance of the attribute name (e.g. Name:) on the page (versus just stylistic / appearance sake tag).
* | | the index option is always created if the type is one of references or ↵Vijay Dev2012-04-181-2/+4
| | | | | | | | | | | | belongs_to. Refactoring it to a simpler form and fixing the build
* | | let's not use `and` in place of `&&`Vijay Dev2012-04-181-1/+1
|/ /
* | Merge pull request #5835 from asanghi/masterJeremy Kemper2012-04-161-1/+1
|\ \ | | | | | | Update Gemfile to use 'debugger' instead of unmaintained 'ruby-debug19'
| * | Hey, let's just make it easier for everyone and dump the unmaintained ↵Aditya Sanghi2012-04-141-1/+1
| | | | | | | | | | | | ruby-debug19 and move to debugger. Whats the consensus here? If we want better adoption on ruby1.9, please lets just use this fork.