aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | |
| * | | | | fix markups for plus in AR guideVijay Dev2011-11-061-10/+10
| | | | | |
* | | | | | Merge pull request #3568 from bfolkens/master-url_subdomain_with_numeric_hostJosé Valim2011-11-082-1/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix trouble using :subdomain in development environment when using numeric addresses.
| * | | | | | Fix trouble using :subdomain in development environment when using ↵Bradford Folkens2011-11-082-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_fixJosé Valim2011-11-081-3/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Should be checking if file exists or not.
| * | | | | | Should be checking if file exists or not.Arun Agrawal2011-11-081-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_fileXavier Noria2011-11-081-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Warnings removed.
| * | | | | | Warnings removed.Arun Agrawal2011-11-081-4/+4
|/ / / / / /
* | | | | | Merge pull request #3563 from arunagw/changelog_to_mdVijay Dev2011-11-072-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | CHANGELOG to CHANGELOG.md
| * | | | | | CHANGELOG to CHANGELOG.mdArun Agrawal2011-11-082-7/+7
|/ / / / / /
* | | | | | fix typo again (Thanks Phillip Oertel)Vijay Dev2011-11-081-1/+1
| | | | | |
* | | | | | Merge pull request #3552 from evtuhovich/masterJosé Valim2011-11-071-1/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Doc patch, DrbStore no more exists in rails
| * | | | | DrbStore removed from cache backendsIvan Evtukhovich2011-11-071-1/+0
|/ / / / /
* | | | | fix incorrect code exampleVijay Dev2011-11-071-1/+1
| | | | |
* | | | | Merge pull request #3549 from luckydev/rmethodAaron Patterson2011-11-072-2/+30
|\ \ \ \ \ | | | | | | | | | | | | remove_method tests and changes
| * | | | | added remove_method core_ext testsAnand2011-11-071-0/+29
| | | | | |
| * | | | | replaced remove and define method calls to :redefineAnand2011-11-071-2/+1
| |/ / / /