aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added therubyrhino to default Gemfile under JRubyGuillermo Iguaran2011-11-142-0/+8
|
* Allow to use ruby-debug in 1.9.3Santiago Pastorino2011-11-121-2/+1
|
* Merge pull request #3618 from amatsuda/ad_headers_unmemoizableJon Leighton2011-11-121-2/+0
|\ | | | | Unneeded require 'active_support/memoizable'
| * Unneeded require memoizableAkira Matsuda2011-11-121-2/+0
|/
* Merge pull request #3613 from mitio/fix-actionpack-responder-docsXavier Noria2011-11-111-4/+4
|\ | | | | Fix wording and minor typos in the Responder RDoc
| * Fix wording and minor typos in the Responder RDocDimitar Dimitrov2011-11-111-4/+4
| |
* | Merge pull request #3611 from bogdan/compile_optionsJosé Valim2011-11-111-14/+12
|\ \ | | | | | | AS::Callbacks::Callback#_compile_option refactored
| * | AS::Callbacks::Callback#_compile_option refactoredBogdan Gusiev2011-11-111-14/+12
|/ /
* | Merge pull request #3609 from noefroidevaux/issue_3595Aaron Patterson2011-11-111-3/+3
|\ \ | | | | | | Prevent multiple SHOW TABLES calls when a table don't exists in database...
| * | Prevent multiple SHOW TABLES calls when a table don't exists in database.Noé Froidevaux2011-11-111-3/+3
|/ /
* | Merge pull request #3607 from bogdan/callbacksJosé Valim2011-11-111-10/+6
|\ \ | | | | | | AS::Callbacks.__run_keyed_callback: remove unused cache
| * | AS::Callbacks.__run_keyed_callback: remove unused cacheBogdan Gusiev2011-11-101-10/+6
| | |
* | | change_table bulk test case should check if the connection supports bulk alterVijay Dev2011-11-111-13/+15
| | |
* | | Merge pull request #3603 from vijaydev/change_table_without_block_argJosé Valim2011-11-102-7/+64
|\ \ \ | | | | | | | | Modify change_table to remove the need for the block argument
| * | | Modify change_table to remove the need for the block argument.Vijay Dev2011-11-112-7/+64
|/ / /
* | | Merge pull request #3600 from vijaydev/migration_arityJosé Valim2011-11-102-1/+22
|\ \ \ | | | | | | | | Checking the arity of the block passed to create_table
| * | | Checking the arity of the block passed to create_tableVijay Dev2011-11-102-1/+22
|/ / / | | | | | | | | | | | | | | | A recent change made to create_table does away with the need for the block argument. Checking the arity will prevent the mixing up of the two syntaxes.
* / / Fixes deprecation warning about passing a template handlerVijay Dev2011-11-101-1/+2
|/ / | | | | | | | | in the template name while generating guide related pages like index, layout and credits
* | self.class.name -> self.name (we are already inside a class).José Valim2011-11-101-1/+1
| |
* | Merge pull request #3592 from avakhov/av-highlight-regexpJosé Valim2011-11-102-1/+5
|\ \ | | | | | | Fix and simplify highlight regexp
| * | Fix and simplify highlight regexpAlexey Vakhov2011-11-102-1/+5
| | |
* | | Merge pull request #3591 from tylercoville/fix-plugin-newJosé Valim2011-11-103-4/+12
|\ \ \ | | | | | | | | Fixed error with 'rails generate new plugin' where the .gitignore was not
| * | | Fixed error with 'rails generate new plugin' where the .gitignore was not ↵Tyler Coville2011-11-093-4/+12
| |/ / | | | | | | | | | properly generated if --dummy-path was used and added test case
* | | Merge pull request #3593 from bogdan/callbacksJosé Valim2011-11-101-23/+22
|\ \ \ | | | | | | | | AS::Callbacks._define_runner better abstraction
| * | | AS::Callbacks#_define_runner refactoredBogdan Gusiev2011-11-101-23/+22
| | | | | | | | | | | | | | | | | | | | Incapsulate the logic of keyed callback method definition and execution in the separated method.
* | | | Merge pull request #3581 from amatsuda/metal_response_body_19José Valim2011-11-102-1/+13
|\ \ \ \ | |_|/ / |/| | | AC::Metal#response_body= stores different value in Ruby 1.8 and 1.9
| * | | A test case to ensure that AC::Metal#response_body= always wraps the given ↵Akira Matsuda2011-11-101-0/+6
| | | | | | | | | | | | | | | | value in an Array in both Ruby 1.8 and 1.9 (refs #3581)
| * | | Fix AC::Metal#response_body= to store same value on Ruby 1.8 and 1.9Akira Matsuda2011-11-071-1/+7
| | | | | | | | | | | | | | | | This was because String#respond_to?(:each) differs in 1.8 and 1.9
* | | | Don't marshal dump twice when using encryptor.José Valim2011-11-092-3/+13
| | | |
* | | | Deprecated ActiveSupport::MessageEncryptor#encrypt and decrypt.José Valim2011-11-093-41/+70
| | | |
* | | | Merge pull request #3589 from amatsuda/console_extend_command_bundle_fixJosé Valim2011-11-092-2/+2
|\ \ \ \ | | | | | | | | | | Extend IRB right before starting IRB to remove dependency on IRB from Rails::Application
| * | | | Extend IRB right before starting IRB to remove dependency on IRB from ↵Akira Matsuda2011-11-102-2/+2
|/ / / / | | | | | | | | | | | | Rails::Application
* | | | Use head :no_content on the guides as well.José Valim2011-11-092-4/+4
| | | |
* | | | Merge pull request #3509 from amatsuda/console_extend_command_bundleJosé Valim2011-11-094-31/+47
|\ \ \ \ | | | | | | | | | | move Rails console top level methods to IRB context
| * | | | Modulize Rails console methods so that other console libraries such as Pry ↵Akira Matsuda2011-11-094-5/+7
| | | | | | | | | | | | | | | | | | | | can include these methods
| * | | | move Rails console top level methods to IRB contextAkira Matsuda2011-11-043-31/+45
| | | | |
* | | | | Merge pull request #3579 from arunagw/missing_md_in_changelogVijay Dev2011-11-081-2/+2
|\ \ \ \ \ | | | | | | | | | | | | CHANGELOG => CHANGELOG.md
| * | | | | CHANGELOG => CHANGELOG.mdArun Agrawal2011-11-091-2/+2
|/ / / / / | | | | | | | | | | | | | | | I missed these in previous commit
* | | | | Merge pull request #3574 from arunagw/refactor_testing_uncommitted_taskVijay Dev2011-11-081-10/+3
|\ \ \ \ \ | | | | | | | | | | | | Refactor test:uncommitted task.
| * | | | | Refactor test:uncommitted task.Arun Agrawal2011-11-091-10/+3
|/ / / / / | | | | | | | | | | Thanks to @sobrinho (Gabriel Sobrinho)
* | | | | Merge pull request #3572 from amatsuda/ar_exists_uniq_orderAaron Patterson2011-11-082-1/+6
|\ \ \ \ \ | | | | | | | | | | | | exclude ORDER BY clause when querying Relation#exists?
| * | | | | exclude ORDER BY clause when querying Relation#exists?Akira Matsuda2011-11-092-1/+6
|/ / / / /
* | | | | Merge pull request #3562 from rahul100885/rahul100885_workVijay Dev2011-11-081-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Updated Rakefile as CHANGELOG has been renamed to CHANGELOG.md
| * | | | | Updated Rakefile as CHANGELOG has been renamed to CHANGELOG.mdRahul Chaudhari2011-11-081-7/+7
| | | | | |
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-088-33/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/active_record_querying.textile
| * | | | | | Replace example with SQL placeholder syntax. Joost Baaij2011-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | This works just fine, is less code, and reduces the risk of someone implementing a SQL injection vulnerability.
| * | | | | | Fix small typo in link_to_function docAlexey Vakhov2011-11-081-1/+1
| | | | | | |
| * | | | | | document fix: remove_column takes multiple column_namesAkira Matsuda2011-11-071-2/+2
| | | | | | |
| * | | | | | self.up, self.down => up, downAkira Matsuda2011-11-073-7/+6
| | | | | | |
| * | | | | | Fixed stale doc in AbstractController::LayoutsDalibor Nasevic2011-11-061-12/+5
| | | | | | |