aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
Commit message (Collapse)AuthorAgeFilesLines
...
* | fix a couple of typos in the js guide [ci skip]Vijay Dev2012-10-211-5/+3
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-2113-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 Rodriguez2012-10-181-3/+0
| |
| * Change 'branches' to 'branch' [ci skip]Adam Coffman2012-10-181-1/+1
| |
| * Revert "Change with start of translation in internationalization, this time ↵Rafael Mendonça França2012-10-1764-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ça2012-10-1756-0/+35064
| | | | | | | | | | | | This reverts commit f5b9ed4fbc3215a5fce48985ea372ad3f1182252. REASON: Translation work can not be done in the docrails repository
| * Fix typos in Association Basics guideJaime Iniesta2012-10-171-5/+5
| |
| * divided into folder with the languageRodrigo Martins2012-10-1756-35064/+0
| |
| * Change with start of translation in internationalization, this time with pt_br.Rodrigo Martins2012-10-1763-0/+36385
| |
| * Fix formatting errors on the Active Record Validations and Callbacks guideJaime Iniesta2012-10-151-5/+8
| |
| * fix link bug in contributing pageCesar Carruitero2012-10-151-1/+1
| |
| * Fix formatting on migrations guideJaime Iniesta2012-10-141-7/+8
| |
| * Merge pull request #118 from patriciomacadden/masterVijay Dev2012-10-141-1/+1
| |\ | | | | | | Fix a typo in caching with rails guide
| | * Fix a silly typoPatricio Mac Adden2012-10-131-1/+1
| | |
| * | Update guides/source/contributing_to_ruby_on_rails.mdArturo Pie2012-10-131-1/+1
| |/ | | | | In this section we are actually updating 'my_new_branch'
| * Fix typos and clean up Getting Started guideJaime Iniesta2012-10-121-14/+17
| |
| * Fix small typo in development_dependencies_installArturo Pie2012-10-121-1/+1
| | | | | | Fix small typo a link to bundler page in development_dependencies_install.md 
| * specify path to CommentsController again inlineTim McEwan2012-10-121-1/+1
| | | | | | | | (incorporating feedback from a newbie)
| * 1.9 hash syntax changes.AvnerCohen2012-10-124-262/+262
| |
| * 1.9 hash syntax for guides, work-in-progressAvnerCohen2012-10-113-79/+79
| |
* | Merge pull request #7493 from steveklabnik/ajax_guideXavier Noria2012-10-212-316/+392
|\ \ | | | | | | Re-writing the AJAX Guide
| * | Working With JavaScript guide.Steve Klabnik2012-10-142-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 alternativesJon Leighton2012-10-191-28/+11
| | |
* | | Add Relation#find_or_create_by and friendsJon Leighton2012-10-191-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/railtieRafael Mendonça França2012-10-181-1/+1
| | |
* | | Add more CHANGELOG entries from #7927Rafael Mendonça França2012-10-171-2/+0
| | | | | | | | | | | | | | | | | | Also remove references for RAILS_ASSET_ID from the guides [ci skip]
* | | Add CHANGELOG entry for #7927Rafael Mendonça França2012-10-172-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 aliasesMatt Bridges2012-10-151-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 Kemper2012-10-122-4/+4
| | |
* | | Merge pull request #7007 from Mik-die/hash_extractRafael Mendonça França2012-10-121-2/+10
|\ \ \ | | | | | | | | make Hash#extract! more symmetric with Hash#slice
| * | | add more testcases and doc about Hash#extract!Mikhail Dieterle2012-10-081-2/+10
| | | |
* | | | Expand caveat about models in migrations (rails guide)Katrina Owen2012-10-101-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/docrailsVijay Dev2012-10-1114-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 Dev2012-10-111-2/+2
| | | |
| * | | migrating guides to new hash syntaxAvnerCohen2012-10-103-68/+68
| | | |
| * | | Revert "Add changelog/release note entries for missing ActionMailer super ↵Aditya Sanghi2012-10-101-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 Sanghi2012-10-101-0/+2
| | | | | | | | | | | | | | | | related to inclusion of callbacks in mailers
| * | | updating i18n guide with locale config location.Steve Klabnik2012-10-081-1/+1
| | | | | | | | | | | | | | | | This changed in rails/rails#43e14f8
| * | | Correct and clarify `--full` and `--mountable` options to `rails plugin new`Corey Innis2012-10-071-4/+43
| | | |
| * | | Update guides/source/action_mailer_basics.mdAdrien Lamothe2012-10-061-1/+1
| | | |
| * | | add AC::Parameters#permit_all_parameters config option [ci skip]Francesco Rodriguez2012-10-051-1/+3
| | | |
| * | | remove old AR Mass Assignment config options [ci skip]Francesco Rodriguez2012-10-051-4/+0
| | | |
| * | | Merge pull request #115 from ruggeri/masterFrancesco Rodríguez2012-10-051-2/+0
| |\ \ \ | | | | | | | | | | Remove non sequitur NOTE on :include [ci skip]
| | * | | remove non sequitur NOTE on :includeNed Ruggeri2012-10-011-2/+0
| | | | |
| * | | | delete removed page cache options [ci skip]Francesco Rodriguez2012-10-051-10/+2
| | | | |
| * | | | use default_static_extension instead of page_cache_extension deprecated ↵Francesco Rodriguez2012-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | option [ci skip]
| * | | | update caching with rails guide to reflect action and page extraction [ci skip]Francesco Rodriguez2012-10-051-5/+8
| | | | |
| * | | | Add CollectionAssociation#destroy to association guideSamuel Cochran2012-10-051-0/+23
| | | | |
| * | | | Merge pull request #116 from jarednipper/masterJared Nipper2012-10-031-2/+2
| |\ \ \ \ | | | | | | | | | | | | Fixed two typos in the testing guide
| | * | | | Fixed typo in command to run unit testJared Nipper2012-10-011-1/+1
| | | | | |