Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | use strip_heredoc to keep indentation consistent. | Steve Klabnik | 2013-02-18 | 1 | -12/+12 | |
| | | | | | | | | Thanks @sikachu. :heart: | |||||
* | | Merge pull request #9316 from steveklabnik/no_routes | Xavier Noria | 2013-02-18 | 3 | -0/+46 | |
|\ \ | | | | | | | Print message on stderr when no routes are defined. | |||||
| * | | Add message when you have no routes defined. | Steve Klabnik | 2013-02-18 | 3 | -0/+46 | |
|/ / | | | | | | | | | | | Print a message in both `rake routes` and at GET "/rails/info/routes" that lets you know you have no routes defined, as well as linking to the Rails Guide on the topic. | |||||
* | | Merge pull request #9318 from steveklabnik/router_headings | Xavier Noria | 2013-02-18 | 1 | -3/+19 | |
|\ \ | | | | | | | Add headings to rake routes table | |||||
| * | | Add headings to rake routes table | Steve Klabnik | 2013-02-18 | 1 | -3/+19 | |
| | | | ||||||
* | | | Merge pull request #9317 from balexand/patch-1 | Rafael Mendonça França | 2013-02-18 | 1 | -0/+1 | |
|\ \ \ | |/ / |/| | | Document changes from #7968 in Upgrading Guide | |||||
| * | | Document changes in #7968 | Brian Alexander | 2013-02-18 | 1 | -0/+1 | |
|/ / | ||||||
* | | Bump up minitest dependency and remove our own reinvented version of ↵ | Akira Matsuda | 2013-02-19 | 2 | -38/+2 | |
| | | | | | | | | ParallelEach | |||||
* | | Gist URLs are now namespaced | Akira Matsuda | 2013-02-18 | 6 | -11/+11 | |
|/ | | | | see: https://github.com/blog/1406-namespaced-gists | |||||
* | Merge pull request #9313 from bkzl/return-false-on-toggle-on-error-pages | Guillermo Iguaran | 2013-02-17 | 2 | -6/+7 | |
|\ | | | | | Return false in toggle function on error pages | |||||
| * | Return false on toggle on error pages | Bartlomiej Kozal | 2013-02-17 | 2 | -6/+7 | |
| | | ||||||
* | | Merge pull request #9312 from Takehiro-Adachi/add_tests_for_ar_create | Guillermo Iguaran | 2013-02-17 | 1 | -0/+8 | |
|\ \ | |/ |/| | Add test for ActiveRecord::Base#create | |||||
| * | add tests for ActiveRecord::Base#create | Takehiro Adachi | 2013-02-18 | 1 | -0/+8 | |
|/ | ||||||
* | Add CHANGELOG entry for 41ff6a10216f48f43605a1f9cd6094765cab750f | Andrew White | 2013-02-17 | 1 | -0/+40 | |
| | | | | [ci skip] | |||||
* | Merge pull request #9307 from wangjohn/remove_unneeded_md5_digest | Xavier Noria | 2013-02-16 | 1 | -1/+0 | |
|\ | | | | | Removed an old require of an MD5 digest which is no longer used. | |||||
| * | Removed an old require of an MD5 digest which is no longer used. | wangjohn | 2013-02-15 | 1 | -1/+0 | |
| | | ||||||
* | | copy-edits RDoc in fba496f | Xavier Noria | 2013-02-16 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | This revision makes the terminology uniform with the rest of the file. In general we describe these methods in terms of the adapter, rather than the database. (As a side note, if we wanted to refer to the database we would write "PostgreSQL".) | |||||
* | | Remove valid_type? method | Jon Leighton | 2013-02-15 | 4 | -17/+0 | |
| | | | | | | | | | | It was supposed to be removed by the preceding two reversions but I did them in the wrong order. | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-02-15 | 11 | -9/+68 | |
|\ \ | | | | | | | | | | | | | Conflicts: guides/source/upgrading_ruby_on_rails.md | |||||
| * | | copy edits [ci skip] | Vijay Dev | 2013-02-15 | 2 | -3/+3 | |
| | | | ||||||
| * | | Revert "incorrect content of models/comment.rb after 'rails generate'" | Rafael Mendonça França | 2013-02-13 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 0f0803fda5df60319d8646bb4f3e71f2e596316a. Reason: The content was correct since attr_accessible was removed from rails master. | |||||
| * | | incorrect content of models/comment.rb after 'rails generate' | Kuba Brecka | 2013-02-13 | 1 | -0/+2 | |
| | | | ||||||
| * | | Correct bullet content line wrapping | Tim "Roger" Harvey | 2013-02-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | The `:prefix` bullet content was not properly wrapping, dropping to the following line because the additional content was not indented properly. With this change, it will now display properly the way `:discard_type` does. | |||||
| * | | Detail Ruby 1.8 ships with TestUnit and Ruby 1.9 with MiniTest | Americo Savinon | 2013-02-12 | 1 | -1/+4 | |
| | | | ||||||
| * | | Fix typo. | Carson McDonald | 2013-02-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | [ci skip] | |||||
| * | | Fix supported ruby version for Rails 4 | Ryunosuke SATO | 2013-02-10 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix CoffeeScript example | Ryunosuke SATO | 2013-02-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | `a[data-color]` is not used in example html. | |||||
| * | | Clarify ActiveModel::Validator initialization in docs. | Henrik Nyh | 2013-02-09 | 1 | -0/+3 | |
| | | | | | | | | | As discussed with @josevalim on Ruby Rogues Parley. | |||||
| * | | Validations guide: validates_with init clarification. | Henrik Nyh | 2013-02-09 | 1 | -0/+29 | |
| | | | | | | | | | As discussed with @josevalim on Ruby Rogues Parley. | |||||
| * | | Add example for ActiveRecord::Base.joins using a string as argument | Maurizio De Santis | 2013-02-07 | 1 | -0/+5 | |
| | | | ||||||
| * | | Add example for ActiveRecord::Base.group using a string as argument | Maurizio De Santis | 2013-02-07 | 1 | -0/+3 | |
| | | | ||||||
| * | | Add documentation for ActiveRecord.select when use strings as arguments | Maurizio De Santis | 2013-02-07 | 1 | -0/+10 | |
| | | | ||||||
| * | | Add ActiveRecord.count documentation when used on group relations | Maurizio De Santis | 2013-02-07 | 1 | -0/+6 | |
| | | | ||||||
| * | | Change Class#subclasses doc example | Dalibor Nasevic | 2013-02-06 | 1 | -2/+2 | |
| | | | ||||||
| * | | Fixing the examples for button_to | Marc Baumbach | 2013-02-06 | 1 | -2/+2 | |
| | | | | | | | | | The examples do not generate the output they intend to due to not explicitly declaring the hash separations. This causes it to be treated as one parameter instead of the intended two parameters. | |||||
| * | | Fix file name in document [ci skip] | Ryunosuke SATO | 2013-02-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | This file was renamed in c8a25386d. | |||||
* | | | Revert "Make valid_type? public" | Jon Leighton | 2013-02-15 | 4 | -12/+17 | |
| | | | | | | | | | | | | | | | | | | This reverts commit 5d528f835e871f5f9d4b68e8a81cfbe900b7e718. Relates to f8c8ad5 which is also getting reverted due to failing test. | |||||
* | | | Revert "checking in the abstractions for valid type checking:" | Jon Leighton | 2013-02-15 | 4 | -28/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c321b309a9a90bbfa0912832c11b3fef52e71840. Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb Reason: failing test 1) Error: test_valid_column(ActiveRecord::ConnectionAdapters::SQLite3AdapterTest): NoMethodError: undefined method `column' for test/cases/adapters/sqlite3/sqlite3_adapter_test.rb:29:in `test_valid_column' | |||||
* | | | Revert "Revert "Merge pull request #9206 from ranjaykrishna/use_define_method"" | Jon Leighton | 2013-02-15 | 1 | -18/+13 | |
| | | | | | | | | | | | | | | | | | | This reverts commit 8aa4603a5adaa56c818a7bd1c0b761b4ecca3d3e. Reverting the revert because I reverted the wrong thing! Fail. | |||||
* | | | Revert "Merge pull request #9206 from ranjaykrishna/use_define_method" | Jon Leighton | 2013-02-15 | 1 | -13/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1fc6876b57f2e1d31731e74eb4271b5655e746d2, reversing changes made to 0268b5d8cdc3c5a1337462135f0a326a2654ba1a. Reason: failing test 1) Error: test_valid_column(ActiveRecord::ConnectionAdapters::SQLite3AdapterTest): NoMethodError: undefined method `column' for test/cases/adapters/sqlite3/sqlite3_adapter_test.rb:29:in `test_valid_column' | |||||
* | | | Merge pull request #9298 from wangjohn/add_documentation_to_migration_collision | Jeremy Kemper | 2013-02-15 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | Added extra comment when a migration already exists of the same name | |||||
| * | | Added extra comment when a migration already exists of the same name. | wangjohn | 2013-02-15 | 1 | -1/+1 | |
|/ / | | | | | | | | | | | User should know that he can overwrite the previous migration. This comes in handy especially when generating models which were previously created then removed. | |||||
* | | Merge pull request #8704 from senny/remove_regexp_global_from_url_for | Aaron Patterson | 2013-02-14 | 2 | -2/+9 | |
|\ \ | | | | | | | replace regexp global in #url_for | |||||
| * | | replace regexp global in #url_for | Yves Senn | 2013-01-16 | 2 | -2/+9 | |
| | | | ||||||
* | | | Merge pull request #9252 from senny/8423_hmt_preloading_bug | Rafael Mendonça França | 2013-02-14 | 3 | -1/+30 | |
|\ \ \ | | | | | | | | | don't cache invalid subsets when preloading hmt associations | |||||
| * | | | don't cache invalid subsets when preloading hmt associations. | Yves Senn | 2013-02-14 | 3 | -1/+30 | |
| | | | | | | | | | | | | | | | | closes #8423. | |||||
* | | | | Merge pull request #9285 from rahul100885/master | Guillermo Iguaran | 2013-02-14 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Bump rack-test dependency to 0.6.2 | |||||
| * | | | | Bump rack-test dependency to 0.6.2 | Rahul P. Chaudhari | 2013-02-14 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #9283 from rubys/master | Carlos Antonio da Silva | 2013-02-14 | 4 | -17/+12 | |
|\ \ \ \ | |/ / / |/| | | | Make valid_type? public | |||||
| * | | | Make valid_type? public | Sam Ruby | 2013-02-14 | 4 | -17/+12 | |
|/ / / |