Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | Refactored pluralize and singularize into a common method. | Henrik Hodne | 2011-11-06 | 1 | -16/+18 |
| | | | | | | | | See diff discussion on rails/#3536. | ||||
* | | Merge pull request #3535 from jmazzi/master | Jon Leighton | 2011-11-06 | 2 | -1/+20 |
|\ \ | | | | | | | Update ActiveRecord#attribute_present? to work as documented | ||||
| * | | Update ActiveRecord#attribute_present? to work as documented | Justin Mazzi | 2011-11-05 | 2 | -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#explain | Xavier Noria | 2011-11-05 | 9 | -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-gemfile | Xavier Noria | 2011-11-05 | 1 | -0/+2 |
|\ \ | | | | | | | Add arel to Gemfile on apps generated in edge Rails | ||||
| * | | Add arel to Gemfile on apps generated in edge Rails | Guillermo Iguaran | 2011-11-05 | 1 | -0/+2 |
|/ / | |||||
* | | bumps up sprockets | Xavier Noria | 2011-11-05 | 1 | -1/+1 |
| | | |||||
* | | fixes typo | Xavier Noria | 2011-11-05 | 1 | -1/+1 |
| | | |||||
* | | implements AS::Notifications.subscribed, which provides subscriptions to ↵ | Xavier Noria | 2011-11-05 | 3 | -0/+63 |
|/ | | | | events while a block runs | ||||
* | expands the documentation of AS::Notifications | Xavier Noria | 2011-11-05 | 1 | -14/+46 |
| | |||||
* | Merge pull request #3525 from kennyj/fix_3440-1 | Jon Leighton | 2011-11-05 | 3 | -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) | kennyj | 2011-11-06 | 3 | -2/+20 |
| | | |||||
* | | Revert "Merge pull request #2378 from cesario/remove_warnings_activemodel" | Jon Leighton | 2011-11-05 | 1 | -1/+0 |
| | | | | | | | | | | | | | | This reverts commit 6aaae3de277b572f37e09f16ae12737c3c87dfb7, reversing changes made to fdbc4e5f4e5746ebf558485348c841b33f038fda. Reason: build failure. | ||||
* | | make class name consistent with the filename | Vijay Dev | 2011-11-05 | 1 | -1/+1 |
| | | |||||
* | | Skip test_default_external_works on the CI for Ruby 1.9.3. | Jon Leighton | 2011-11-05 | 1 | -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 query | Jon Leighton | 2011-11-05 | 1 | -14/+2 |
| | | |||||
* | | Add ActiveRecord::Relation#uniq for toggling DISTINCT in the SQL query | Jon Leighton | 2011-11-05 | 9 | -13/+89 |
| | | |||||
* | | Merge pull request #2378 from cesario/remove_warnings_activemodel | Vijay Dev | 2011-11-05 | 1 | -0/+1 |
|\ \ | | | | | | | Remove warnings by calling remove_method | ||||
| * | | Remove warnings by calling remove_method | Franck Verrot | 2011-07-31 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-05 | 11 | -37/+45 |
|\ \ \ | |||||
| * | | | Revert "outline two ways to invoke a custom active model validator" | Vijay Dev | 2011-11-05 | 1 | -9/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d163d3bf7ebb98d90977974aed8f85b7ec678afd. Reason: The alternate approach can be documented in the guide and not disrupt the existing flow in the readme. | ||||
| * | | | Revert "make the inline text a comment in the code block" | Vijay Dev | 2011-11-05 | 2 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 36a5f48f9323c4a770c290a9a16ae58388e7925f. Reason: Editing .gitignore in docrails is not allowed. Docrails is meant only for documentation. | ||||
| * | | | Fixed after_initialize/after_find guide | Florian Walch | 2011-11-05 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Defining after_initialize and after_find as ordinary methods like documented in the guide doesn't work with Rails 3.1.1; now macro-style is used here, too. | ||||
| * | | | make the inline text a comment in the code block | Karthik Muthupalaniappan | 2011-11-04 | 2 | -1/+3 |
| | | | | |||||
| * | | | outline two ways to invoke a custom active model validator | Karthik Muthupalaniappan | 2011-11-04 | 1 | -1/+9 |
| | | | | |||||
| * | | | Added bundle exec to rake test. | Henrik Hodne | 2011-11-03 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | This is in response to rails/rails#3504. | ||||
| * | | | Fix javascript_include_tag examples in documentation | Alexey Vakhov | 2011-11-03 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fix small typos in routing docs | Alexey Vakhov | 2011-11-03 | 1 | -1/+3 |
| | | | | |||||
| * | | | minor edit | Vijay Dev | 2011-11-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | minor edits in AR validations guide | Vijay Dev | 2011-11-02 | 1 | -10/+2 |
| | | | | |||||
| * | | | use relative urls for linking to sections in the guides | Vijay Dev | 2011-11-02 | 1 | -10/+10 |
| | | | | |||||
| * | | | Fix wrong link in initialization doc | juandebravo | 2011-11-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix typo in Dispatcher#controller documentation | Aviv Ben-Yosef | 2011-11-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix typo in constraints method documentation | Alexey Vakhov | 2011-11-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | [config guide] mention that config methods are to be called on Railtie ↵ | Ryan Bigg | 2011-11-01 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | subclasses | ||||
| * | | | [engines guide] add 'General engine configuration' section | Ryan Bigg | 2011-11-01 | 1 | -0/+12 |
| | | | | |||||
| * | | | Update routing guides, root route should be at the top of the file | Alexey Vakhov | 2011-10-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix typo on the performance test guide | Gonçalo Silva | 2011-10-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3529 from vjebelev/ar_ordered_indexes2 | Jon Leighton | 2011-11-05 | 11 | -20/+111 |
|\ \ \ \ | |_|_|/ |/| | | | AR changes to support creating ordered (asc, desc) indexes | ||||
| * | | | AR changes to support creating ordered (asc, desc) indexes | Vlad Jebelev | 2011-11-04 | 11 | -20/+111 |
|/ / / | |||||
* | | | add tests for the case where size is explicitly passed to number_field helper | Vijay Dev | 2011-11-04 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #3517 from arunagw/test_fix_activerecord | Jon Leighton | 2011-11-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix test as one more has_many added | ||||
| * | | | Fix test as one more has_many added | Arun Agrawal | 2011-11-04 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #3516 from cesario/fix_gemspec | Jon Leighton | 2011-11-04 | 7 | -7/+7 |
|\ \ \ | | | | | | | | | Synchronize the gemspecs since CHANGELOG has been renamed to CHANGELOG.md | ||||
| * | | | Synchronize the gemspecs since CHANGELOG has been renamed to CHANGELOG.md | Franck Verrot | 2011-11-04 | 7 | -7/+7 |
|/ / / | |||||
* | | | Convert CHANGELOGs to Markdown format. | Jon Leighton | 2011-11-04 | 14 | -17147/+17080 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reasons: * Markdown reads well as plain text, but can also be formatted. * It will make it easier for people to read on the web as Github formats the Markdown nicely. * It will encourage a level of consistency when people are writing CHANGELOG entries. The script used to perform the conversion is at https://gist.github.com/1339263 |