aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix human attribute_name to handle deeply nested attributesTsutomu Kuroda2012-05-162-2/+7
| | | | | | | | | | | | When a model nests another model that also nests yet another model using accepts_nested_attributes_for method, its Errors object can have an attribute name with "contacts.addresses.street" style. In this case, the dots within the namespace should be substituted with slashes so that we can provide the translation under the "activemodel.attributes.person/contacts/addresses.street" key. This commit is related to #3859.
* Merge pull request #6273 from KensoDev/feature/simple_format_refactoringRafael Mendonça França2012-05-152-9/+27
|\ | | | | Feature/simple format refactoring
| * Added the wrapper tag option to simple_formatAvi Tzurel2012-05-142-2/+12
| |
| * simple_format refactoringAvi Tzurel2012-05-141-9/+17
| | | | | | | | | | using split_paragraphs method and content_tag instead of string concatination
* | Merge pull request #6333 from carlosgaldino/unnecessary-callRafael Mendonça França2012-05-151-1/+1
|\ \ | | | | | | Remove unnecessary calls to primary_key on sqlite3_adapter
| * | Remove unnecessary calls to primary_key on sqlite3_adapterCarlos Galdino2012-05-151-1/+1
|/ /
* | Merge pull request #6325 from kennyj/fix_5832-3Carlos Antonio da Silva2012-05-151-5/+1
|\ \ | | | | | | Remove unnecessary assertions.
| * | Remove unnecessary assertions. We should only test the before_seq isn't same ↵kennyj2012-05-161-5/+1
| | | | | | | | | | | | to the after_seq when using sequencer.
* | | Merge pull request #6327 from nashby/string-interpolationCarlos Antonio da Silva2012-05-153-17/+0
|\ \ \ | | | | | | | | remove backported string interpolation
| * | | remove backported string interpolationVasiliy Ermolovich2012-05-153-17/+0
|/ / /
* | | Expand and improve #pluck docsJeremy Kemper2012-05-151-6/+27
| | |
* | | Restore support for Model.pluck('sql fragment')Jeremy Kemper2012-05-152-1/+10
| | |
* | | Kill whitespaces :scissors:Carlos Antonio da Silva2012-05-152-3/+3
| | |
* | | Merge pull request #6322 from acapilleri/some_mispelling_errorsRafael Mendonça França2012-05-151-3/+3
|\ \ \ | |/ / |/| | corrected some misspelling
| * | corrected some misspellingAngelo capilleri2012-05-151-3/+3
|/ /
* | Merge pull request #5571 from jarkko/5559-fix-dst-jump-bug-on-masterAaron Patterson2012-05-152-0/+23
|\ \ | | | | | | [#5559] Do not black out the system timezone DST jump hour if Time.zone ...
| * | [#5559] Do not black out the system timezone DST jump hour if Time.zone ↵Jarkko Laine2012-03-242-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | differs from that. The system timezone DST jump hour should not be blacked out by Time.zone.parse if current Time.zone does not do the jump at that time. Fixes #5559.
* | | Remove extra `end` in arel_table docs. [ci skip]Carlos Antonio da Silva2012-05-151-8/+6
| | | | | | | | | | | | Introduced in 7ecfe3d30ccfaee8dcca4ee649cc006c090bdfb4
* | | Merge pull request #6284 from acapilleri/dup_validationCarlos Antonio da Silva2012-05-152-0/+21
|\ \ \ | | | | | | | | clean the erros if an object that includes validation is duped.
| * | | clean the erros if an object that includes validations errors is duped. ↵Angelo Capilleri2012-05-132-0/+21
| | | | | | | | | | | | | | | | Fixes #5953
* | | | Revert "Revert "Remove `:disable_with` in favor of `'data-disable-with'` ↵José Valim2012-05-156-57/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option from `submit_tag`, `button_tag` and `button_to` helpers."" Finally remove `:disable_with` but use `:data => { :disable_with => ... }` in examples to show off a better API (which looks nicer in Ruby 1.9) This reverts commit a5c38a9c087e33d36397afc496be7c8e01b37ef0.
* | | | Revert "Remove `:disable_with` in favor of `'data-disable-with'` option from ↵José Valim2012-05-156-13/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `submit_tag`, `button_tag` and `button_to` helpers." `disable_with:` is much easier to type than `"data-disable-with" =>`, and the fact it uses "data-disable-with" => is an implementation concern, it should not affect the public API. This reverts commit 683fc4db00f496e5225928afb4d4e932e0fcdc48.
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-1570-341/+161
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * | | | missing dot [ci skip]Vijay Dev2012-05-151-1/+1
| | | | |
| * | | | copy edit asset guide [ci skip]Vijay Dev2012-05-151-7/+5
| | | | |
| * | | | Removing ==Examples and last blank lines of docs from actionpackFrancesco Rodriguez2012-05-1532-183/+56
| | | | |
| * | | | code-format italicized 'production' env [ci skip]Mark Rushakoff2012-05-141-1/+1
| | | | |
| * | | | s/aff/add [ci skip]Mark Rushakoff2012-05-141-1/+1
| | | | |
| * | | | Add documentation for arel_tableOscar Del Ben2012-05-141-0/+8
| | | | |
| * | | | Minor editing of getting started guideOscar Del Ben2012-05-141-3/+11
| | | | |
| * | | | Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-05-14252-1613/+3273
| |\ \ \ \
| | * | | | remove docs on Range#stepVasiliy Ermolovich2012-05-141-12/+0
| | | | | |
| | * | | | Removing ==Examples and last blank lines of docs from railtiesFrancesco Rodriguez2012-05-146-61/+0
| | | | | |
| | * | | | 'Netherlands locale' does not make any sense, it's Dutch locale [ci skip]Ayrton De Craene2012-05-141-2/+2
| | | | | |
| | * | | | Improved the readability of some sentences [ci skip]Ayrton De Craene2012-05-141-1/+1
| | | | | |
| | * | | | fix format in getting started guide [ci skip]Vijay Dev2012-05-141-1/+1
| | | | | |
| | * | | | adding examples to deep_dup methodFrancesco Rodriguez2012-05-141-1/+23
| | | | | |
| | * | | | Missed colonAlexey Vakhov2012-05-141-1/+1
| | | | | |
| | * | | | removing unnecessary 'examples' noise from activesupportFrancesco Rodriguez2012-05-1321-74/+11
| | | | | |
| | * | | | Fixing Hash#stringify_keys docsFrancesco Rodriguez2012-05-131-1/+1
| | | | | |
| | * | | | Merge pull request #98 from acapilleri/mispelling_assetAngelo Capilleri2012-05-131-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | mispelling asset_tag_helper
| | | * | | | mispelling asset_tag_helperAngelo Capilleri2012-05-131-1/+1
| | | | | | |
| | * | | | | Correct code wrapping around content of welcome/index.html.erbRyan Bigg2012-05-141-2/+2
| | | | | | |
| | * | | | | Wrap 'Missing template posts/new' error message in a blockquote for better ↵Ryan Bigg2012-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | formatting
| | * | | | | Rails actually has one root route definedRyan Bigg2012-05-141-1/+1
| | | | | | |
| | * | | | | Separate CR out in CRUD explanation, explain each letter one at a timeRyan Bigg2012-05-141-1/+1
| | | | | | |
| | * | | | | Re-enforce/re-explain what happens when you go to root route (Welcome#index) ↵Ryan Bigg2012-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | better
| | * | | | | Briefly explain static file routing in the getting started guideRyan Bigg2012-05-141-1/+1
| | |/ / / /
| | * | | | marking self in Hash#symbolize_keys!Francesco Rodriguez2012-05-131-1/+1
| | | | | |
| | * | | | added example to Hash#symbolize_keysFrancesco Rodriguez2012-05-131-2/+5
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 09:05:24 +0000