| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | Merge pull request #3609 from noefroidevaux/issue_3595 | Aaron Patterson | 2011-11-11 | 1 | -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é Froidevaux | 2011-11-11 | 1 | -3/+3 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #3607 from bogdan/callbacks | José Valim | 2011-11-11 | 1 | -10/+6 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | AS::Callbacks.__run_keyed_callback: remove unused cache | |||||
| | * | | | | | | AS::Callbacks.__run_keyed_callback: remove unused cache | Bogdan Gusiev | 2011-11-10 | 1 | -10/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | change_table bulk test case should check if the connection supports bulk alter | Vijay Dev | 2011-11-11 | 1 | -13/+15 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #3603 from vijaydev/change_table_without_block_arg | José Valim | 2011-11-10 | 2 | -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 Dev | 2011-11-11 | 2 | -7/+64 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #3600 from vijaydev/migration_arity | José Valim | 2011-11-10 | 2 | -1/+22 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Checking the arity of the block passed to create_table | |||||
| | * | | | | | | | Checking the arity of the block passed to create_table | Vijay Dev | 2011-11-10 | 2 | -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 handler | Vijay Dev | 2011-11-10 | 1 | -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é Valim | 2011-11-10 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #3592 from avakhov/av-highlight-regexp | José Valim | 2011-11-10 | 2 | -1/+5 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix and simplify highlight regexp | |||||
| | * | | | | | | Fix and simplify highlight regexp | Alexey Vakhov | 2011-11-10 | 2 | -1/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #3591 from tylercoville/fix-plugin-new | José Valim | 2011-11-10 | 3 | -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 Coville | 2011-11-09 | 3 | -4/+12 | |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | properly generated if --dummy-path was used and added test case | |||||
| * | | | | | | | Merge pull request #3593 from bogdan/callbacks | José Valim | 2011-11-10 | 1 | -23/+22 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | AS::Callbacks._define_runner better abstraction | |||||
| | * | | | | | | | AS::Callbacks#_define_runner refactored | Bogdan Gusiev | 2011-11-10 | 1 | -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_19 | José Valim | 2011-11-10 | 2 | -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 Matsuda | 2011-11-10 | 1 | -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.9 | Akira Matsuda | 2011-11-07 | 1 | -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é Valim | 2011-11-09 | 2 | -3/+13 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Deprecated ActiveSupport::MessageEncryptor#encrypt and decrypt. | José Valim | 2011-11-09 | 3 | -41/+70 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #3589 from amatsuda/console_extend_command_bundle_fix | José Valim | 2011-11-09 | 2 | -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 Matsuda | 2011-11-10 | 2 | -2/+2 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Rails::Application | |||||
| * | | | | | | | | Use head :no_content on the guides as well. | José Valim | 2011-11-09 | 2 | -4/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #3509 from amatsuda/console_extend_command_bundle | José Valim | 2011-11-09 | 4 | -31/+47 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | move Rails console top level methods to IRB context | |||||
| | * | | | | | | | | Modulize Rails console methods so that other console libraries such as Pry ↵ | Akira Matsuda | 2011-11-09 | 4 | -5/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can include these methods | |||||
| | * | | | | | | | | move Rails console top level methods to IRB context | Akira Matsuda | 2011-11-04 | 3 | -31/+45 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #3579 from arunagw/missing_md_in_changelog | Vijay Dev | 2011-11-08 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | CHANGELOG => CHANGELOG.md | |||||
| | * | | | | | | | | | CHANGELOG => CHANGELOG.md | Arun Agrawal | 2011-11-09 | 1 | -2/+2 | |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | I missed these in previous commit | |||||
| * | | | | | | | | | Merge pull request #3574 from arunagw/refactor_testing_uncommitted_task | Vijay Dev | 2011-11-08 | 1 | -10/+3 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Refactor test:uncommitted task. | |||||
| | * | | | | | | | | | Refactor test:uncommitted task. | Arun Agrawal | 2011-11-09 | 1 | -10/+3 | |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | Thanks to @sobrinho (Gabriel Sobrinho) | |||||
| * | | | | | | | | | Merge pull request #3572 from amatsuda/ar_exists_uniq_order | Aaron Patterson | 2011-11-08 | 2 | -1/+6 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | exclude ORDER BY clause when querying Relation#exists? | |||||
| | * | | | | | | | | | exclude ORDER BY clause when querying Relation#exists? | Akira Matsuda | 2011-11-09 | 2 | -1/+6 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #3562 from rahul100885/rahul100885_work | Vijay Dev | 2011-11-08 | 1 | -7/+7 | |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | Updated Rakefile as CHANGELOG has been renamed to CHANGELOG.md | |||||
| | * | | | | | | | | Updated Rakefile as CHANGELOG has been renamed to CHANGELOG.md | Rahul Chaudhari | 2011-11-08 | 1 | -7/+7 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-08 | 8 | -33/+25 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/active_record_querying.textile | |||||
| | * | | | | | | | | | Replace example with SQL placeholder syntax. | Joost Baaij | 2011-11-08 | 1 | -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 doc | Alexey Vakhov | 2011-11-08 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | document fix: remove_column takes multiple column_names | Akira Matsuda | 2011-11-07 | 1 | -2/+2 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | self.up, self.down => up, down | Akira Matsuda | 2011-11-07 | 3 | -7/+6 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Fixed stale doc in AbstractController::Layouts | Dalibor Nasevic | 2011-11-06 | 1 | -12/+5 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | fix markups for plus in AR guide | Vijay Dev | 2011-11-06 | 1 | -10/+10 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #3568 from bfolkens/master-url_subdomain_with_numeric_host | José Valim | 2011-11-08 | 2 | -1/+12 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix trouble using :subdomain in development environment when using numeric addresses. | |||||
| | * | | | | | | | | | | Fix trouble using :subdomain in development environment when using ↵ | Bradford Folkens | 2011-11-08 | 2 | -1/+12 | |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | numeric addresses. See-also pull request #3561 from 3-1-stable Otherwise the following occurs: TypeError: can't convert nil into String /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:75:in host_or_subdomain_and_domain' /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:37:in url_for' /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/routing/url_for.rb:147:in test_subdomain_may_be_accepted_with_numeric_host' /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/testing/setup_and_teardown.rb:67:in run' /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:426:in send' /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:81:in run' | |||||
| * | | | | | | | | | | Merge pull request #3564 from arunagw/uncommitted_rake_fix | José Valim | 2011-11-08 | 1 | -3/+9 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Should be checking if file exists or not. | |||||
| | * | | | | | | | | | | Should be checking if file exists or not. | Arun Agrawal | 2011-11-08 | 1 | -3/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found this bug when running rake test:uncommitted on a newly generated rails app which don't have test file for application_controller. Can see detail here #3461 | |||||
| * | | | | | | | | | | | Merge pull request #3565 from arunagw/warning_remove_release_file | Xavier Noria | 2011-11-08 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Warnings removed. | |||||
| | * | | | | | | | | | | Warnings removed. | Arun Agrawal | 2011-11-08 | 1 | -4/+4 | |
| |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge pull request #3563 from arunagw/changelog_to_md | Vijay Dev | 2011-11-07 | 2 | -7/+7 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | CHANGELOG to CHANGELOG.md | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |