Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | | | CHANGELOG to CHANGELOG.md | Arun Agrawal | 2011-11-08 | 2 | -7/+7 |
|/ / / / | |||||
* | | | | fix typo again (Thanks Phillip Oertel) | Vijay Dev | 2011-11-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3552 from evtuhovich/master | José Valim | 2011-11-07 | 1 | -1/+0 |
|\ \ \ \ | | |/ / | |/| | | Doc patch, DrbStore no more exists in rails | ||||
| * | | | DrbStore removed from cache backends | Ivan Evtukhovich | 2011-11-07 | 1 | -1/+0 |
|/ / / | |||||
* | | | fix incorrect code example | Vijay Dev | 2011-11-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3549 from luckydev/rmethod | Aaron Patterson | 2011-11-07 | 2 | -2/+30 |
|\ \ \ | | | | | | | | | remove_method tests and changes | ||||
| * | | | added remove_method core_ext tests | Anand | 2011-11-07 | 1 | -0/+29 |
| | | | | |||||
| * | | | replaced remove and define method calls to :redefine | Anand | 2011-11-07 | 1 | -2/+1 |
| |/ / | |||||
* | | | adds trailing +s to the output of EXPLAIN for MySQL | Xavier Noria | 2011-11-07 | 2 | -9/+8 |
| | | | |||||
* | | | Merge pull request #3542 from amatsuda/controller_generator_remove_blank_line | José Valim | 2011-11-07 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Remove redundant blank line at the bottom of generated controller code | ||||
| * | | | Remove redundant blank line at the bottom | Akira Matsuda | 2011-11-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | revises EXPLAIN tests for SQLite3 | Xavier Noria | 2011-11-06 | 1 | -3/+3 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output in Travis is a bit different. The SQLite documentation (http://www.sqlite.org/eqp.html) warns output may change dramatically between releases. I do not want to mock the result set because I want a real EXPLAIN to happen. I prefer a test that may fail in future releases than a test that may give false positives in future releases. | ||||
* | | | Merge pull request #3541 from dvyjones/fix-datetime-warnings | Aaron Patterson | 2011-11-06 | 2 | -16/+16 |
|\ \ \ | | | | | | | | | Removed argument throwing warnings when running tests | ||||
| * | | | Removed argument throwing warnings when running tests. | Henrik Hodne | 2011-11-06 | 2 | -16/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last argument to DateTime.new/civil is the Julian day number for when the calendar reform occured. DateTime ignores it if it's 0, and sets it to the default of DateTime::ITALY instead, so we could just leave it out. This also removes the warnings while running the ActiveSupport tests (there still are some for the setup though). | ||||
* | | | | fix typo | Vijay Dev | 2011-11-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #3521 from ↵ | Aaron Patterson | 2011-11-06 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | nulogy/fix_postgres_adapter_to_handle_spaces_between_schemas Fix postgres adapter to handle spaces between schemas | ||||
* | | | Merge pull request #3536 from pkumar/master | José Valim | 2011-11-06 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Make pluralize follow singularize's logic of uncountability check | ||||
| * | | Added the test case for #3537 | Pavan Kumar Sunkara | 2011-11-06 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-06 | 1 | -2/+2 |
|\ \ | |||||
| * | | Docs cosmetic fixes in Action View form_helper.rb | Alexey Vakhov | 2011-11-06 | 1 | -2/+2 |
| | | | |||||
* | | | RUBY_ENGINE is not defined on 1.8 | Jon Leighton | 2011-11-06 | 1 | -1/+1 |
| | | | |||||
* | | | Implement a workaround for a bug in ruby-1.9.3p0. | Jon Leighton | 2011-11-06 | 3 | -0/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug is that an error would be raised while attempting to convert a template from one encoding to another. Please see http://redmine.ruby-lang.org/issues/5564 for more details. The workaround is to load all conversions into memory ahead of time, and will only happen if the ruby version is *exactly* 1.9.3p0. The hope is obviously that the underlying problem will be resolved in the next patchlevel release of 1.9.3. | ||||
* | | | Revert "Skip test_default_external_works on the CI for Ruby 1.9.3." | Jon Leighton | 2011-11-06 | 1 | -11/+0 |
| | | | | | | | | | | | | This reverts commit 10773f94eae0dacf10e2ed0c28f6bb73805c2521. | ||||
* | | | Merge pull request #3537 from dvyjones/refactor-pluralize-singularize | José Valim | 2011-11-06 | 1 | -16/+18 |
|\ \ \ | | | | | | | | | Refactored pluralize and singularize into a common method |