aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/ /
* | | adds trailing +s to the output of EXPLAIN for MySQLXavier Noria2011-11-072-9/+8
| | |
* | | Merge pull request #3542 from amatsuda/controller_generator_remove_blank_lineJosé Valim2011-11-071-1/+1
|\ \ \ | | | | | | | | Remove redundant blank line at the bottom of generated controller code
| * | | Remove redundant blank line at the bottomAkira Matsuda2011-11-071-1/+1
| | | |
* | | | revises EXPLAIN tests for SQLite3Xavier Noria2011-11-061-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-warningsAaron Patterson2011-11-062-16/+16
|\ \ \ | | | | | | | | Removed argument throwing warnings when running tests
| * | | Removed argument throwing warnings when running tests.Henrik Hodne2011-11-062-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 typoVijay Dev2011-11-061-1/+1
|/ / /
* | | Merge pull request #3521 from ↵Aaron Patterson2011-11-062-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/masterJosé Valim2011-11-061-0/+1
|\ \ \ | |/ / |/| | Make pluralize follow singularize's logic of uncountability check
| * | Added the test case for #3537Pavan Kumar Sunkara2011-11-061-0/+1
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-061-2/+2
|\ \
| * | Docs cosmetic fixes in Action View form_helper.rbAlexey Vakhov2011-11-061-2/+2
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-14 04:30:01 +0000