Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | fix a couple of typos in the js guide [ci skip] | Vijay Dev | 2012-10-21 | 1 | -5/+3 | |
|/ | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-21 | 13 | -382/+386 | |
|\ | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md | |||||
| * | remove assert_valid method from testing guide [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -3/+0 | |
| | | ||||||
| * | Change 'branches' to 'branch' [ci skip] | Adam Coffman | 2012-10-18 | 1 | -1/+1 | |
| | | ||||||
| * | Revert "Change with start of translation in internationalization, this time ↵ | Rafael Mendonça França | 2012-10-17 | 64 | -36390/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | with pt_br." This reverts commit 09682e9e7328b1c1466ae87af08f1785a0b5d7e3. Conflicts: guides/source/en/association_basics.md REASON: Translation work can not be done in the docrails repository | |||||
| * | Revert "divided into folder with the language" | Rafael Mendonça França | 2012-10-17 | 56 | -0/+35064 | |
| | | | | | | | | | | | | This reverts commit f5b9ed4fbc3215a5fce48985ea372ad3f1182252. REASON: Translation work can not be done in the docrails repository | |||||
| * | Fix typos in Association Basics guide | Jaime Iniesta | 2012-10-17 | 1 | -5/+5 | |
| | | ||||||
| * | divided into folder with the language | Rodrigo Martins | 2012-10-17 | 56 | -35064/+0 | |
| | | ||||||
| * | Change with start of translation in internationalization, this time with pt_br. | Rodrigo Martins | 2012-10-17 | 63 | -0/+36385 | |
| | | ||||||
| * | Fix formatting errors on the Active Record Validations and Callbacks guide | Jaime Iniesta | 2012-10-15 | 1 | -5/+8 | |
| | | ||||||
| * | fix link bug in contributing page | Cesar Carruitero | 2012-10-15 | 1 | -1/+1 | |
| | | ||||||
| * | Fix formatting on migrations guide | Jaime Iniesta | 2012-10-14 | 1 | -7/+8 | |
| | | ||||||
| * | Merge pull request #118 from patriciomacadden/master | Vijay Dev | 2012-10-14 | 1 | -1/+1 | |
| |\ | | | | | | | Fix a typo in caching with rails guide | |||||
| | * | Fix a silly typo | Patricio Mac Adden | 2012-10-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | Update guides/source/contributing_to_ruby_on_rails.md | Arturo Pie | 2012-10-13 | 1 | -1/+1 | |
| |/ | | | | | In this section we are actually updating 'my_new_branch' | |||||
| * | Fix typos and clean up Getting Started guide | Jaime Iniesta | 2012-10-12 | 1 | -14/+17 | |
| | | ||||||
| * | Fix small typo in development_dependencies_install | Arturo Pie | 2012-10-12 | 1 | -1/+1 | |
| | | | | | | Fix small typo a link to bundler page in development_dependencies_install.md | |||||
| * | specify path to CommentsController again inline | Tim McEwan | 2012-10-12 | 1 | -1/+1 | |
| | | | | | | | | (incorporating feedback from a newbie) | |||||
| * | 1.9 hash syntax changes. | AvnerCohen | 2012-10-12 | 4 | -262/+262 | |
| | | ||||||
| * | 1.9 hash syntax for guides, work-in-progress | AvnerCohen | 2012-10-11 | 3 | -79/+79 | |
| | | ||||||
* | | Merge pull request #7493 from steveklabnik/ajax_guide | Xavier Noria | 2012-10-21 | 2 | -316/+392 | |
|\ \ | | | | | | | Re-writing the AJAX Guide | |||||
| * | | Working With JavaScript guide. | Steve Klabnik | 2012-10-14 | 2 | -316/+392 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, this guide was called "AJAX on Rails," but really, it's not just about AJAX. This was never finished, but it got accidentally generated and Google found out about it. In the meantime, all the guides were converted to markdown, as well. So here's a new guide. It covers all of the built-in helpers that use ajax requests, it covers CoffeeScript, and it covers UJS. | |||||
* | | | nodoc the first_or_create methods and document alternatives | Jon Leighton | 2012-10-19 | 1 | -28/+11 | |
| | | | ||||||
* | | | Add Relation#find_or_create_by and friends | Jon Leighton | 2012-10-19 | 1 | -20/+51 | |
| | | | | | | | | | | | | | | | | | | | | | This is similar to #first_or_create, but slightly different and a nicer API. See the CHANGELOG/docs in the commit. Fixes #7853 | |||||
* | | | Now the Sprockets railtie lives in sprockets/railtie | Rafael Mendonça França | 2012-10-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | Add more CHANGELOG entries from #7927 | Rafael Mendonça França | 2012-10-17 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | Also remove references for RAILS_ASSET_ID from the guides [ci skip] | |||||
* | | | Add CHANGELOG entry for #7927 | Rafael Mendonça França | 2012-10-17 | 2 | -10/+2 | |
| | | | | | | | | | | | | | | | | | | | | | Removed the asset_path configuration from the guides and added an entry in the upgrading_ruby_on_rails guide [ci skip] | |||||
* | | | Adding reference a few Time and Date aliases | Matt Bridges | 2012-10-15 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | I originally contributed these aliases 10 months ago and just never got it added to the Rails 4.0 release notes. Here they are. | |||||
* | | | Backpedal from class-oriented config.queue. Set an actual queue instance. | Jeremy Kemper | 2012-10-12 | 2 | -4/+4 | |
| | | | ||||||
* | | | Merge pull request #7007 from Mik-die/hash_extract | Rafael Mendonça França | 2012-10-12 | 1 | -2/+10 | |
|\ \ \ | | | | | | | | | make Hash#extract! more symmetric with Hash#slice | |||||
| * | | | add more testcases and doc about Hash#extract! | Mikhail Dieterle | 2012-10-08 | 1 | -2/+10 | |
| | | | | ||||||
* | | | | Expand caveat about models in migrations (rails guide) | Katrina Owen | 2012-10-10 | 1 | -0/+21 | |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an attempt to address issue #6939, where an earlier migration added a column to the database, and a later migration uses a model and references that column. When both migrations were run together with `rake db:migrate` the column information in memory still referenced the old table structure. Running the migrations separately fixed this, as a new connection was then established before referencing the model. Explicitly calling `reset_column_information` is a more reliable workaround. | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-11 | 14 | -123/+199 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb | |||||
| * | | | copy edits [ci skip] | Vijay Dev | 2012-10-11 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | migrating guides to new hash syntax | AvnerCohen | 2012-10-10 | 3 | -68/+68 | |
| | | | | ||||||
| * | | | Revert "Add changelog/release note entries for missing ActionMailer super ↵ | Aditya Sanghi | 2012-10-10 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | feature related to inclusion of callbacks in mailers" This reverts commit f16ec8c864ba12c2315713af76b11be5887cfa3a. | |||||
| * | | | Add changelog/release note entries for missing ActionMailer super feature ↵ | Aditya Sanghi | 2012-10-10 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | related to inclusion of callbacks in mailers | |||||
| * | | | updating i18n guide with locale config location. | Steve Klabnik | 2012-10-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | This changed in rails/rails#43e14f8 | |||||
| * | | | Correct and clarify `--full` and `--mountable` options to `rails plugin new` | Corey Innis | 2012-10-07 | 1 | -4/+43 | |
| | | | | ||||||
| * | | | Update guides/source/action_mailer_basics.md | Adrien Lamothe | 2012-10-06 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | add AC::Parameters#permit_all_parameters config option [ci skip] | Francesco Rodriguez | 2012-10-05 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | remove old AR Mass Assignment config options [ci skip] | Francesco Rodriguez | 2012-10-05 | 1 | -4/+0 | |
| | | | | ||||||
| * | | | Merge pull request #115 from ruggeri/master | Francesco Rodríguez | 2012-10-05 | 1 | -2/+0 | |
| |\ \ \ | | | | | | | | | | | Remove non sequitur NOTE on :include [ci skip] | |||||
| | * | | | remove non sequitur NOTE on :include | Ned Ruggeri | 2012-10-01 | 1 | -2/+0 | |
| | | | | | ||||||
| * | | | | delete removed page cache options [ci skip] | Francesco Rodriguez | 2012-10-05 | 1 | -10/+2 | |
| | | | | | ||||||
| * | | | | use default_static_extension instead of page_cache_extension deprecated ↵ | Francesco Rodriguez | 2012-10-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | option [ci skip] | |||||
| * | | | | update caching with rails guide to reflect action and page extraction [ci skip] | Francesco Rodriguez | 2012-10-05 | 1 | -5/+8 | |
| | | | | | ||||||
| * | | | | Add CollectionAssociation#destroy to association guide | Samuel Cochran | 2012-10-05 | 1 | -0/+23 | |
| | | | | | ||||||
| * | | | | Merge pull request #116 from jarednipper/master | Jared Nipper | 2012-10-03 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | | | Fixed two typos in the testing guide | |||||
| | * | | | | Fixed typo in command to run unit test | Jared Nipper | 2012-10-01 | 1 | -1/+1 | |
| | | | | | |