aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | 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
| | | | | | | |
* | | | | | | | RUBY_ENGINE is not defined on 1.8Jon Leighton2011-11-061-1/+1
| | | | | | | |
* | | | | | | | Implement a workaround for a bug in ruby-1.9.3p0.Jon Leighton2011-11-063-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 Leighton2011-11-061-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 10773f94eae0dacf10e2ed0c28f6bb73805c2521.
* | | | | | | | Merge pull request #3537 from dvyjones/refactor-pluralize-singularizeJosé Valim2011-11-061-16/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Refactored pluralize and singularize into a common method
| * | | | | | | | Refactored pluralize and singularize into a common method.Henrik Hodne2011-11-061-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See diff discussion on rails/#3536.
* | | | | | | | | Merge pull request #3535 from jmazzi/masterJon Leighton2011-11-062-1/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update ActiveRecord#attribute_present? to work as documented
| * | | | | | | | | Update ActiveRecord#attribute_present? to work as documentedJustin Mazzi2011-11-052-1/+20
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Returns true if the specified attribute has been set by the user or by a database load and is neither nil nor empty?" Fixes #1613
* | | | | | | | | implements AR::Relation#explainXavier Noria2011-11-059-1/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a first implementation, EXPLAIN is highly dependent on the database and I have made some compromises. On one hand, the method allows you to run the most common EXPLAIN and that's it. If you want EXPLAIN ANALYZE in PostgreSQL you need to do it by hand. On the other hand, I've tried to construct a string as close as possible to the ones built by the respective shells. The rationale is that IMO the user should feel at home with the output and recognize it at first sight. Per database. I don't know whether this implementation is going to work well. Let's see whether people like it.
* | | | | | | | | Merge pull request #3534 from guilleiguaran/arel-git-gemfileXavier Noria2011-11-051-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add arel to Gemfile on apps generated in edge Rails
| * | | | | | | | | Add arel to Gemfile on apps generated in edge RailsGuillermo Iguaran2011-11-051-0/+2
|/ / / / / / / / /
* | | | | | | | | bumps up sprocketsXavier Noria2011-11-051-1/+1
| | | | | | | | |
* | | | | | | | | fixes typoXavier Noria2011-11-051-1/+1
| | | | | | | | |
* | | | | | | | | implements AS::Notifications.subscribed, which provides subscriptions to ↵Xavier Noria2011-11-053-0/+63
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | events while a block runs
* | | | | | | | expands the documentation of AS::NotificationsXavier Noria2011-11-051-14/+46
| | | | | | | |
* | | | | | | | Merge pull request #3525 from kennyj/fix_3440-1Jon Leighton2011-11-053-2/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed an issue id false option is ignored on mysql/mysql2 (fix #3440)
| * | | | | | | | Fixed an issue id false option is ignored on mysql/mysql2 (fix #3440)kennyj2011-11-063-2/+20
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Revert "Merge pull request #2378 from cesario/remove_warnings_activemodel"Jon Leighton2011-11-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6aaae3de277b572f37e09f16ae12737c3c87dfb7, reversing changes made to fdbc4e5f4e5746ebf558485348c841b33f038fda. Reason: build failure.
* | | | | | | | make class name consistent with the filenameVijay Dev2011-11-051-1/+1
| | | | | | | |
* | | | | | | | Skip test_default_external_works on the CI for Ruby 1.9.3.Jon Leighton2011-11-051-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test is affected by a bug in Ruby 1.9.3p0 and trunk: http://redmine.ruby-lang.org/issues/5564 Given we cannot fix it for ourselves, it is better to skip for now so that we will easily see if further failures are introduced. Jon Leighton is monitoring the bug report and will revert this when a suitable solution is found (either a new Ruby release or a generic workaround). If you are using 1.9.3 in your app and have templates that are not in UTF-8, you should add a workaround early on in the boot process. For example, if your templates are Shift_JIS encoded, then add the following in an initializer: Encoding::Converter.new('Shift_JIS', 'UTF-8')
* | | | | | | | Use uniq instead of manually putting a DISTINCT in the queryJon Leighton2011-11-051-14/+2
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 09:58:21 +0000