Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Updated 4.0 release notes | Vijay Dev | 2012-12-04 | 2 | -818/+49 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The release notes is changed to include only the major changes and point to the changelogs for the complete list. This lets us talk more about the features included in the upcoming release and make the guide more useful and interesting than just a list of all changelogs. This is still a WIP guide pending a lot of work. [ci skip] | |||||
* | | | Merge pull request #8416 from kennyj/redundant_pg_namespace | Rafael Mendonça França | 2012-12-04 | 1 | -1/+0 | |
|\ \ \ | | |/ | |/| | pg_namespace table isn't used. | |||||
| * | | pg_namespace table isn't used. | kennyj | 2012-12-05 | 1 | -1/+0 | |
|/ / | ||||||
* | | Track the default application.css/js files for turbolinks as per version 0.6.0 | David Heinemeier Hansson | 2012-12-04 | 1 | -2/+2 | |
| | | ||||||
* | | Fixed issue where routes with globs caused constraints on that glob to | Maura Fitzgerald | 2012-12-04 | 3 | -1/+34 | |
| | | | | | | | | | | | | be ignored. A regular expression constraint gets overwritten when the routes.rb file is processed. Changed the overwriting to an ||= instead of an = assignment. | |||||
* | | Merge pull request #8403 from senny/3313_after_find_is_triggered_too_often | Rafael Mendonça França | 2012-12-04 | 4 | -2/+26 | |
|\ \ | | | | | | | Do not instantiate intermediate AR objects when eager loading. | |||||
| * | | Do not instantiate intermediate AR objects when eager loading. | Yves Senn | 2012-12-04 | 4 | -2/+26 | |
|/ / | | | | | | | Closes #3313 | |||||
* | | Bump mailer to quiet the stdout log messages | Jeremy Kemper | 2012-12-03 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #8411 from YasuOza/turbolinks_require_bottom | Rafael Mendonça França | 2012-12-03 | 1 | -1/+3 | |
|\ \ | | | | | | | Locate `=require turbolinks` at the bottom of application.js | |||||
| * | | Locate `=require turbolinks` at the bottom of application.js | Yasuharu Ozaki | 2012-12-04 | 1 | -1/+3 | |
|/ / | | | | | | | | | Turbolinks should be located at the bottom of application.js to detect assets change properly. | |||||
* | | Merge pull request #8393 from frodsan/fix_dependend_order_test_example | Carlos Antonio da Silva | 2012-12-03 | 1 | -0/+3 | |
|\ \ | | | | | | | Ensure original encoding does not change in mb_chars test. | |||||
| * | | ensure original encoding doesnt change | Francesco Rodriguez | 2012-12-01 | 1 | -0/+3 | |
| | | | ||||||
* | | | Use send in Time marshal extensions since the methods are now private | Carlos Antonio da Silva | 2012-12-03 | 1 | -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 Kemper | 2012-12-03 | 3 | -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_comments | Rafael Mendonça França | 2012-12-03 | 2 | -3/+3 | |
|\ \ \ | | | | | | | | | Fix wrong doc and message about rails profiler. | |||||
| * | | | Fix wrong doc and message about rails profiler. | kennyj | 2012-12-04 | 2 | -3/+3 | |
|/ / / | ||||||
* | | | Try to get back the campfire notifications | Rafael Mendonça França | 2012-12-03 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fix failing tests related to rake notes | Carlos Antonio da Silva | 2012-12-03 | 1 | -2/+2 | |
| | | | | | | | | | | | | Related to changes introduced in 553b563749517114323b4e8742509227e0daab67 | |||||
* | | | Merge pull request #8375 from steveklabnik/migrations_guide | Xavier Noria | 2012-12-03 | 1 | -365/+217 | |
|\ \ \ | | | | | | | | | Updates to the Migration Guide | |||||
| * | | | Migration Guide: General fix-up | Steve Klabnik | 2012-12-01 | 1 | -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ça | 2012-12-02 | 3 | -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 Senn | 2012-12-02 | 3 | -1/+16 | |
|/ / / / | ||||||
* | | | | Merge pull request #8394 from acangiano/add_db_folder_to_annotations | Rafael Mendonça França | 2012-12-01 | 3 | -1/+7 | |
|\ \ \ \ | | | | | | | | | | | Add db to the list of default annotation folders | |||||
| * | | | | Add db to the list of default annotation folders | Antonio Cangiano | 2012-12-01 | 3 | -1/+7 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #8398 from rmascarenhas/active-model-errors-spec-fixes | Rafael Mendonça França | 2012-12-01 | 1 | -3/+2 | |
|\ \ \ \ | | | | | | | | | | | ActiveModel::Errors spec fixes | |||||
| * | | | | Actually test that ActiveModel::Errors#add defaults to :invalid. | Renato Mascarenhas | 2012-12-01 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Call `full_messages` instead of `to_a` in its spec. | Renato Mascarenhas | 2012-12-01 | 1 | -2/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #8397 from mmb/gitignore_global_home | Rafael Mendonça França | 2012-12-01 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Quote ~ in git config global excludes command. | |||||
| * | | | | Quote ~ in git config global excludes command. | Matthew M. Boedicker | 2012-12-01 | 1 | -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.now | Andrew White | 2012-12-01 | 2 | -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/mailerguide | Vijay Dev | 2012-12-01 | 1 | -1/+52 | |
|\ \ \ | | | | | | | | | Add Mailer Callback section to Mailer guides | |||||
| * | | | Add Mailer Callback section to Mailer guides | Aditya Sanghi | 2012-12-02 | 1 | -1/+52 | |
| | | | | ||||||
* | | | | Remove not used variable warnigns | Carlos Antonio da Silva | 2012-12-01 | 2 | -5/+5 | |
|/ / / | ||||||
* | | | Merge pull request #8391 from rmascarenhas/reset-attribute-doesnt-change-it | Rafael Mendonça França | 2012-12-01 | 3 | -3/+9 | |
|\ \ \ | |/ / |/| | | Reset attributes should not report changes. | |||||
| * | | Reset attributes should not report changes. | Renato Mascarenhas | 2012-12-01 | 3 | -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_guide | Vijay Dev | 2012-12-01 | 4 | -347/+342 | |
|\ \ | |/ |/| | Validations guide | |||||
| * | Here's a few updates to the validations guide. A bunch of small changes, | Steve Klabnik | 2012-12-01 | 4 | -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/docrails | Vijay Dev | 2012-12-01 | 40 | -261/+299 | |
|\ | | | | | | | | | Conflicts: guides/source/active_record_validations.md | |||||
| * | copy edits [ci skip] | Vijay Dev | 2012-12-01 | 2 | -2/+2 | |
| | | ||||||
| * | Fix Calculations#pluck doc to mention several attributes can be selected [ci ↵ | Florent Guilleux | 2012-12-01 | 1 | -3/+3 | |
| | | | | | | | | skip] | |||||
| * | Normalize on 'After reading this guide, you will know:' | Steve Klabnik | 2012-11-29 | 37 | -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 Rodriguez | 2012-11-29 | 1 | -3/+3 | |
| | | ||||||
| * | add documentation to CollectionProxy #length and #size methods [ci skip] | Francesco Rodriguez | 2012-11-29 | 1 | -2/+7 | |
| | | ||||||
| * | add documentation to CollectionProxy#empty? | Francesco Rodriguez | 2012-11-29 | 1 | -1/+6 | |
| | | ||||||
| * | Asset Pipeline: add 'the' | Steve Klabnik | 2012-11-29 | 1 | -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 Klabnik | 2012-11-29 | 1 | -2/+2 | |
| | | | | | | | | It's obvious that this is a guide. | |||||
| * | Migrations: add 'Active Record' to title | Steve Klabnik | 2012-11-29 | 1 | -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 Klabnik | 2012-11-29 | 1 | -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 Klabnik | 2012-11-29 | 1 | -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 Klabnik | 2012-11-29 | 4 | -9/+0 | |
| | | | | | | | | It's obvious that the guide is based on this version of Rails, and may not be backwards compatible. |