Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | AR::Relation#order: make new order prepend old one | Bogdan Gusiev | 2012-07-31 | 2 | -1/+10 |
| | | | | | | | User.order("name asc").order("created_at desc") # SELECT * FROM users ORDER BY created_at desc, name asc This also affects order defined in `default_scope` or any kind of associations. | ||||
* | Merge pull request #6827 from zephyr-dev/master | José Valim | 2012-07-27 | 1 | -0/+2 |
|\ | | | | | Validates_presence_of associated object marked for destruction | ||||
| * | AR has a subclass of AM:PresenceValidator. | Brent Wheeldon & Nick Monje | 2012-07-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | | This allows us to mark the parent object as invalid if all associated objects in a presence validated association are marked for destruction. See: https://github.com/rails/rails/issues/6812 | ||||
* | | Changelog and doc updates for the previous changes. | Jon Leighton | 2012-07-27 | 1 | -15/+0 |
| | | |||||
* | | New #update_columns method. | Sebastian Martinez | 2012-07-24 | 1 | -0/+2 |
| | | |||||
* | | update 4.0 release notes [ci skip] | Vijay Dev | 2012-07-21 | 1 | -0/+2 |
| | | |||||
* | | remove references to :finder_sql, :counter_sql, :delete_sql, :insert_sql ↵ | Jon Leighton | 2012-07-20 | 2 | -55/+1 |
| | | | | | | | | from guides | ||||
* | | Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` option | Carlos Galdino | 2012-07-18 | 5 | -18/+16 |
| | | | | | | | | | | | | | | | | | | This applies to the following helpers: `button_to` `button_tag` `image_submit_tag` `link_to` `submit_tag` | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-07-15 | 7 | -23/+169 |
|\ \ | |||||
| * | | add note about requiring gem dependencies before initialization [ci skip] | Francesco Rodriguez | 2012-07-13 | 1 | -6/+28 |
| | | | |||||
| * | | Added note about feature requests and rails-core list. | Steve Klabnik | 2012-07-13 | 1 | -0/+2 |
| | | | |||||
| * | | Change Assertion language to Expected/Actual from obj1/obj2 | Scott Stewart | 2012-07-12 | 1 | -5/+5 |
| | | | |||||
| * | | Fixes typo in CommentsController#create example | Andy Lindeman | 2012-07-11 | 1 | -1/+1 |
| | | | | | | | | | * comments.build will not actually persist the comment | ||||
| * | | Fix typo | Chun-wei Kuo | 2012-07-11 | 1 | -1/+1 |
| | | | |||||
| * | | [getting started] update a code listing | Simon Hengel | 2012-07-10 | 1 | -0/+1 |
| | | | |||||
| * | | Add info note about sass/coffeescript use in engine assets to guide | Marten Veldthuis | 2012-07-09 | 1 | -0/+2 |
| | | | |||||
| * | | Fixed second assert_match - previous one didn't make any sense (if the first ↵ | Jakub Kuźma | 2012-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | passed, the second passed as well) | ||||
| * | | It's better to pass strings to assert_match - it converts them to regular ↵ | Jakub Kuźma | 2012-07-09 | 1 | -2/+2 |
| | | | | | | | | | | | | expressions, escaping special chars like '.'. It seems email.encoded contains some unexpected line breaks (due to encoding), it's better to assert_match email.body.to_s. | ||||
| * | | Revert "Select missing formbuilder typo." | Dan Patrick | 2012-07-08 | 1 | -2/+2 |
| | | | | | | | | | | | | This reverts commit bf97795e7327e15774666d2197f1c0b8ada57a84. | ||||
| * | | Select missing formbuilder typo. | Dan Patrick | 2012-07-08 | 1 | -2/+2 |
| | | | |||||
| * | | Document building complex forms using accepts_nested_attributes_for | Frederick Cheung | 2012-07-08 | 1 | -8/+127 |
| | | | |||||
* | | | testing guide: start of a pass | Xavier Noria | 2012-07-12 | 1 | -49/+29 |
| | | | |||||
* | | | Merge pull request #7004 from philiqq/master | Xavier Noria | 2012-07-08 | 6 | -7/+7 |
|\ \ \ | | | | | | | | | [Guide] Fix broken links | ||||
| * | | | Fix broken links in 2.2 release notes, i18n, debugging, security, 2.3 ↵ | Philipp Franke | 2012-07-08 | 6 | -7/+7 |
| | | | | | | | | | | | | | | | | release notes, plugins | ||||
* | | | | Merge pull request #6956 from lexmag/ref_migration_generator | Rafael Mendonça França | 2012-07-08 | 1 | -0/+47 |
|\ \ \ \ | | | | | | | | | | | Add references statements to migration generator | ||||
| * | | | | Update migrations guide | Aleksey Magusev | 2012-07-08 | 1 | -0/+47 |
| | |/ / | |/| | | | | | | | | | | | | | | Add a paragraph about references statements in migration generator and the subchapter "Supported type modifiers" | ||||
* | | | | Merge pull request #7003 from philiqq/master | Carlos Antonio da Silva | 2012-07-08 | 1 | -2/+2 |
|\ \ \ \ | | |/ / | |/| | | Fix Bleak House link in debugging guide. Closes #7002 | ||||
| * | | | fix broken bleak_house link | Philipp Franke | 2012-07-08 | 1 | -2/+2 |
| |/ / | |||||
* | | | Improve and fix AP changelog, sync release notes [ci skip] | Carlos Antonio da Silva | 2012-07-08 | 1 | -0/+12 |
| | | | |||||
* | | | Merge pull request #6998 from robin850/patch-1 | Carlos Antonio da Silva | 2012-07-08 | 1 | -2/+23 |
|\ \ \ | |/ / |/| | | Add few information on Fedora and CentOS [ci skip] | ||||
| * | | Add few information on Fedora and CentOS | Robin Dupret | 2012-07-08 | 1 | -2/+23 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-07-07 | 1 | -12/+16 |
|\ \ \ | |/ / |/| | | |||||
| * | | Update list of AR Relation methods | Oscar Del Ben | 2012-07-05 | 1 | -10/+16 |
| | | | |||||
| * | | Bump query guide to latest version | Oscar Del Ben | 2012-07-05 | 1 | -2/+0 |
| | | | |||||
* | | | Update master | José Valim | 2012-07-07 | 1 | -0/+2 |
| | | | |||||
* | | | Improve docs, changelog and release notes for Action Mailer default_options= | Carlos Antonio da Silva | 2012-07-06 | 2 | -2/+4 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #6950 from paneq/default_from2 | Carlos Antonio da Silva | 2012-07-06 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce config.action_mailer.default_options= Allows to easily set :from, :replay_to, etc. options in config/application.rb using simple syntax: config.action_mailer.default_options = { from: "no-replay@example.org" } Closes #6747 | ||||
| * | | | Introduce config.action_mailer.default_from= | Robert Pankowecki | 2012-07-03 | 1 | -2/+2 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to easily set :from, :replay_to, etc. options in config/application.rb using simple syntax: config.action_mailer.default_options = {from:"no-replay@example.org"} This was not possible using #default method because config.action_mailer.default(from: "no-replay@example.org") is interpreated as reader method and just returns nil. It would not call ActionMailer::Base.default method. The only way of calling this method from config/application.rb was to use the direct syntax which looks ugly in my opinion: config.assets.enabled = false config.assets.version = '1.0' config.encoding = "utf-8" config.action_mailer.default_url_options= { host:"example.org", protocol:"https" } ActionMailer::Base.default(from: "no-replay@example.org") | ||||
* | | | Update release notes with AR::Relation#inspect change [ci skip] | Carlos Antonio da Silva | 2012-07-06 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | See 07314e64fd62fb8e6165c8c539420160da9437e9. Also fix some tabs in AR Changelog. | ||||
* | | | Remove mention to csv fixtures from test_helper in guides [ci skip] | Carlos Antonio da Silva | 2012-07-06 | 1 | -1/+1 |
| | | | |||||
* | | | fix link and add activeresource link in release notes page [ci skip] | Francesco Rodriguez | 2012-07-04 | 1 | -2/+2 |
| | | | |||||
* | | | Update 4.0 Release Notes | Rafael Mendonça França | 2012-07-04 | 1 | -1/+15 |
|/ / | | | | | | | Related with 17d2115e3df6caf15d554b44e28177069fa3ed5b | ||||
* / | Update 4.0 Release Notes with changelogs [ci skip] | Carlos Antonio da Silva | 2012-07-02 | 1 | -14/+221 |
|/ | | | | | | | Also fix some wrong formatting. Related discussion: https://github.com/rails/rails/commit/ab72040b74f742b6676b2d2a5dd029bfdca25a7a#commitcomment-1525256 | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-06-30 | 4 | -7/+13 |
|\ | | | | | | | | | Conflicts: activemodel/lib/active_model/errors.rb | ||||
| * | Rails now uses the ActiveSupport BufferedLogger class | Chris Adams | 2012-06-29 | 1 | -1/+1 |
| | | | | | | | | Instead of the standard Ruby logger | ||||
| * | corrected URLs and controller benchmark method call | Eric Carty-Fickes | 2012-06-26 | 1 | -3/+3 |
| | | |||||
| * | Fixed example in 1.2 so help will be defined as the text implies | Perry Smith | 2012-06-24 | 1 | -1/+7 |
| | | |||||
| * | fixed another typo in edge guides | Uday Kadaboina | 2012-06-23 | 1 | -1/+1 |
| | | |||||
| * | fixed a typo | Uday Kadaboina | 2012-06-23 | 1 | -1/+1 |
| | | |||||
* | | Revert "Allow loading external route files from the router" | José Valim | 2012-06-29 | 1 | -18/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6acebb38bc0637bc05c19d87f8767f16ce79189b. Usage of this feature did not reveal any improvement in existing apps. Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb guides/source/routing.textile railties/lib/rails/engine.rb railties/lib/rails/paths.rb railties/test/paths_test.rb |