aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8393 from frodsan/fix_dependend_order_test_exampleCarlos Antonio da Silva2012-12-031-0/+3
|\ | | | | Ensure original encoding does not change in mb_chars test.
| * ensure original encoding doesnt changeFrancesco Rodriguez2012-12-011-0/+3
| |
* | Use send in Time marshal extensions since the methods are now privateCarlos Antonio da Silva2012-12-031-1/+1
| | | | | | | | | | | | | | See https://github.com/ruby/ruby/commit/9c1b3161f20162dc1682d758c0e4d2fc3a74745e All Active Support tests pass in 2.0.0preview2 after this change. Closes #8409
* | Override <%== to always behave as literal text rather than toggling based on ↵Jeremy Kemper2012-12-033-4/+21
| | | | | | | | whether escaping is enabled. Fixes that existing plaintext email templates using <%== unexpectedly flipped to *escaping* HTML when #8235 was merged.
* | Merge pull request #8407 from kennyj/fix_profiler_commentsRafael Mendonça França2012-12-032-3/+3
|\ \ | | | | | | Fix wrong doc and message about rails profiler.
| * | Fix wrong doc and message about rails profiler.kennyj2012-12-042-3/+3
|/ /
* | Try to get back the campfire notificationsRafael Mendonça França2012-12-031-1/+1
| |
* | Fix failing tests related to rake notesCarlos Antonio da Silva2012-12-031-2/+2
| | | | | | | | Related to changes introduced in 553b563749517114323b4e8742509227e0daab67
* | Merge pull request #8375 from steveklabnik/migrations_guideXavier Noria2012-12-031-365/+217
|\ \ | | | | | | Updates to the Migration Guide
| * | Migration Guide: General fix-upSteve Klabnik2012-12-011-365/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a bunch of editing/re-writing to the migrations guide. There were a bunch of small changes, and a few larger ones: * mysql does support transactions. * Add a section about db/seeds.rb * Largely re-wrote the first few sections
* | | Merge pull request #8402 from ↵Rafael Mendonça França2012-12-023-1/+16
|\ \ \ | | | | | | | | | | | | | | | | senny/8376_descriptive_error_message_for_partial_layout_true More descriptive error when rendering a partial with `:layout => true`
| * | | More descriptive error when rendering a partial with `:layout => true`Yves Senn2012-12-023-1/+16
|/ / /
* | | Merge pull request #8394 from acangiano/add_db_folder_to_annotationsRafael Mendonça França2012-12-013-1/+7
|\ \ \ | | | | | | | | Add db to the list of default annotation folders
| * | | Add db to the list of default annotation foldersAntonio Cangiano2012-12-013-1/+7
| | |/ | |/|
* | | Merge pull request #8398 from rmascarenhas/active-model-errors-spec-fixesRafael Mendonça França2012-12-011-3/+2
|\ \ \ | | | | | | | | ActiveModel::Errors spec fixes
| * | | Actually test that ActiveModel::Errors#add defaults to :invalid.Renato Mascarenhas2012-12-011-1/+1
| | | |
| * | | Call `full_messages` instead of `to_a` in its spec.Renato Mascarenhas2012-12-011-2/+1
|/ / /
* | | Merge pull request #8397 from mmb/gitignore_global_homeRafael Mendonça França2012-12-011-1/+1
|\ \ \ | | | | | | | | Quote ~ in git config global excludes command.
| * | | Quote ~ in git config global excludes command.Matthew M. Boedicker2012-12-011-1/+1
|/ / / | | | | | | | | | | | | This will put ~/ in .gitconfig so it will not be hardcoded to the home directory where the command was run.
* / / Only take the date parts from Time.zone.nowAndrew White2012-12-012-3/+10
|/ / | | | | | | | | | | | | When there are missing components in the Hash returned by Date._parse only the date components should default to the value of Time.zone.now, the time components should all default to zero.
* | Merge pull request #8382 from asanghi/mailerguideVijay Dev2012-12-011-1/+52
|\ \ | | | | | | Add Mailer Callback section to Mailer guides
| * | Add Mailer Callback section to Mailer guidesAditya Sanghi2012-12-021-1/+52
| | |
* | | Remove not used variable warnignsCarlos Antonio da Silva2012-12-012-5/+5
|/ /
* | Merge pull request #8391 from rmascarenhas/reset-attribute-doesnt-change-itRafael Mendonça França2012-12-013-3/+9
|\ \ | |/ |/| Reset attributes should not report changes.
| * Reset attributes should not report changes.Renato Mascarenhas2012-12-013-3/+9
| | | | | | | | | | | | | | | | | | | | | | When resetting an attribute, you expect it to return to the state it was before any changes. Namely, this fixes this unexpected behavior: ~~~ruby model.name = "Bob" model.reset_name! model.name_changed? #=> true ~~~
* | Merge pull request #8379 from steveklabnik/validations_guideVijay Dev2012-12-014-347/+342
|\ \ | |/ |/| Validations guide
| * Here's a few updates to the validations guide. A bunch of small changes,Steve Klabnik2012-12-014-347/+342
|/ | | | | | | | plus: * 80 column formats * replacing the explanation of the dynamic_form gem with the example HTML/CSS that Rails scaffolds generate.
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-0140-261/+299
|\ | | | | | | | | Conflicts: guides/source/active_record_validations.md
| * copy edits [ci skip]Vijay Dev2012-12-012-2/+2
| |
| * Fix Calculations#pluck doc to mention several attributes can be selected [ci ↵Florent Guilleux2012-12-011-3/+3
| | | | | | | | skip]
| * Normalize on 'After reading this guide, you will know:'Steve Klabnik2012-11-2937-28/+80
| | | | | | | | | | We have three or four different introduction sentences to the guides. After this commit, we use the same one everywhere.
| * nodoc AS::Deprecation::InstanceDelegator class [ci skip]Francesco Rodriguez2012-11-291-3/+3
| |
| * add documentation to CollectionProxy #length and #size methods [ci skip]Francesco Rodriguez2012-11-291-2/+7
| |
| * add documentation to CollectionProxy#empty?Francesco Rodriguez2012-11-291-1/+6
| |
| * Asset Pipeline: add 'the'Steve Klabnik2012-11-291-2/+2
| | | | | | | | | | | | Some guides work without 'the'. For instance, 'Migrations' or 'Form Helpers.' But when we talk about the asset pipeline, we... always say 'the asset pipeline.' The guide title should reflect this.
| * Command Line: remove 'A Guide to'Steve Klabnik2012-11-291-2/+2
| | | | | | | | It's obvious that this is a guide.
| * Migrations: add 'Active Record' to titleSteve Klabnik2012-11-291-2/+2
| | | | | | | | | | Other guides that talk about Active Record specific features include the name of the library in the title, this one should too for consistency.
| * Fix title of 'form helpers' guide.Steve Klabnik2012-11-291-2/+2
| | | | | | | | | | | | They're Rails Guides, so obviously we're talking about Rails Form Helpers. Also, 'helpers' should be capitalized.
| * Associations: s/A Guide//Steve Klabnik2012-11-291-2/+2
| | | | | | | | It's obvious that this is a guide, and none of the other guides say 'A Guide to'.
| * Remove 'This guide is based on ' warnings.Steve Klabnik2012-11-294-9/+0
| | | | | | | | It's obvious that the guide is based on this version of Rails, and may not be backwards compatible.
| * Add periods to the bullet points in guides.Steve Klabnik2012-11-2928-126/+126
| | | | | | | | Talked with @fxn about this. Bullet points should have periods at the ends.
| * Migrations: Fix opening bullets.Steve Klabnik2012-11-291-2/+2
| | | | | | | | The wording of these was a bit off, so I fixed them.
| * ActionView -> Action ViewSteve Klabnik2012-11-291-2/+2
| | | | | | | | The proper name has a space.
| * ActionController -> Action ControllerSteve Klabnik2012-11-291-2/+2
| | | | | | | | The proper name has a space.
| * ActiveSupport -> Active SupportSteve Klabnik2012-11-291-4/+4
| | | | | | | | The proper name has a space.
| * ActionMailer -> Action Mailer.Steve Klabnik2012-11-291-2/+2
| | | | | | | | The proper name for the library has a space.
| * ActionPack -> Action Pack.Steve Klabnik2012-11-291-1/+1
| | | | | | | | The proper name has a space.
| * ActiveRecord -> Active RecordSteve Klabnik2012-11-295-6/+6
| | | | | | | | | | The proper name, as per the documentation guides, is 'Active Record.' I've updated several references to it as 'ActiveRecord'.
| * Migrations: move massive paragraph out of intro.Steve Klabnik2012-11-291-10/+19
| | | | | | | | | | | | | | Most of the guides have a few simple sentences describing what they will show you at the top. This one had a few big paragraphs. I've moved those paragraphs down to an introductory one, and written a new smaller one for the introduction. This makes this guide more consistent with the others.
| * Getting Started: Improve instructions on opening a terminalSteve Klabnik2012-11-291-1/+4
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 03:24:57 +0000