Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Improve grammar a bit" | Xavier Noria | 2012-10-24 | 1 | -1/+1 |
| | | | | This reverts commit 507e522e26b4073455b2337bcf1670e52bba5429. | ||||
* | Revert "Explain where the acronym AJAX stands for & replace "JavaScript ↵ | Xavier Noria | 2012-10-24 | 1 | -2/+2 |
| | | | | | | writer" with "JavaScript developer"" This reverts commit 1332cf53af981d0a7a6f801edd9632eb5c118a3f. | ||||
* | Revert "Improve "request response" term typing & fix a minor typo" | Xavier Noria | 2012-10-24 | 1 | -1/+1 |
| | | | | This reverts commit a6d383c8b2afb253c009ad67d31aae3aa8dcc457. | ||||
* | Revert "fix a typo" | Xavier Noria | 2012-10-24 | 1 | -1/+1 |
| | | | | This reverts commit 6d927fb4da7a0a17d62109b7ef8798a8e75082a7. | ||||
* | Revert "Consistent headlines & ToC" | Xavier Noria | 2012-10-24 | 1 | -5/+5 |
| | | | | This reverts commit 506257a173bb5cbb083ccae8d1b4ed82a456006a. | ||||
* | With the Asset Pipeline the :cache and :concat options aren't used anymore | Guillermo Iguaran | 2012-10-24 | 1 | -0/+3 |
| | |||||
* | Update Upgrading Guide with removal of :cache and :concat options | Guillermo Iguaran | 2012-10-24 | 1 | -0/+4 |
| | |||||
* | Update upgrading notes: users should stop using :concat and :cache options ↵ | Guillermo Iguaran | 2012-10-24 | 1 | -0/+4 |
| | | | | in asset tags | ||||
* | fix output messages - docs [ci skip] | Francesco Rodriguez | 2012-10-22 | 4 | -23/+23 |
| | |||||
* | Fixes typo. | Lennart Fridén | 2012-10-21 | 1 | -1/+1 |
| | |||||
* | Wrap a piece of code to a code block | Robin Dupret | 2012-10-21 | 1 | -0/+2 |
| | |||||
* | Fix a typo | Agis Anastasopoulos | 2012-10-21 | 1 | -1/+1 |
| | |||||
* | Improve grammar | Agis Anastasopoulos | 2012-10-21 | 1 | -2/+2 |
| | |||||
* | Improve grammar a bit | Agis Anastasopoulos | 2012-10-21 | 1 | -1/+1 |
| | |||||
* | Explain where the acronym AJAX stands for & replace "JavaScript writer" with ↵ | Agis Anastasopoulos | 2012-10-21 | 1 | -2/+2 |
| | | | | "JavaScript developer" | ||||
* | Improve "request response" term typing & fix a minor typo | Agis Anastasopoulos | 2012-10-21 | 1 | -1/+1 |
| | |||||
* | Consistent headlines & ToC | Agis Anastasopoulos | 2012-10-21 | 1 | -5/+5 |
| | | | I believe the topics and their headlines should be consistent for obvious reasons. Also | ||||
* | fix a typo | Agis Anastasopoulos | 2012-10-21 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-21 | 15 | -387/+391 |
|\ | | | | | | | | | | | 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 | 67 | -36402/+8 |
| | | | | | | | | | | | | | | | | | | | | | | 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 | 66 | -3/+36397 |
| | | |||||
| * | 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' | ||||
| * | 1.9 hash syntax changes | AvnerCohen | 2012-10-13 | 2 | -5/+5 |
| | | |||||
| * | 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. |