aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #8006 from GRoguelon/masterRafael Mendonça França2012-10-211-1/+1
|\ \ \ | | | | | | | | Remove extra line in Gemfile generated
| * | | Remove extra line in Gemfile under turbolinks.Geoffrey Roguelon2012-10-211-1/+1
|/ / /
* | / 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-2152-482/+674
|\ \ | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md
| * | copy edits [ci skip]Vijay Dev2012-10-211-14/+7
| | |
| * | minor edits in AM documentation [ci skip]Francesco Rodriguez2012-10-2122-32/+32
| | |
| * | update AR::AttributeMethods documentation [ci skip]Francesco Rodriguez2012-10-211-23/+124
| | |
| * | nodoc AR::Generators [ci skip]Francesco Rodriguez2012-10-204-10/+10
| | |
| * | Hash Syntax changes to 1.9 formatAvnerCohen2012-10-205-9/+9
| |/
| * ActiveRecord Callbacks ordering examplesPablo Ifran2012-10-191-0/+43
| |
| * include serializers in ActiveModel::Serialization exampleHrvoje Šimić2012-10-191-0/+12
| |
| * better examples in ActiveModel readmeHrvoje Šimić2012-10-191-1/+15
| |
| * Corrected the logic in production.rb comment.Robb Shecter2012-10-181-1/+1
| |
| * 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
| |
| * add a nested attributes example into Strong Parameters documentation [ci skip]Francesco Rodriguez2012-10-181-6/+31
| |
| * remove some non-breaking spaces [ci skip]Francesco Rodriguez2012-10-181-13/+13
| |
| * remove non-breaking spaces [ci skip]Francesco Rodriguez2012-10-181-3/+3
| |
| * Revert "Change with start of translation in internationalization, this time ↵Rafael Mendonça França2012-10-1767-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ç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-1766-3/+36397
| |
| * Moving code base to 1.9 hash syntaxAvnerCohen2012-10-163-7/+7
| |
| * 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
| |
| * Hash syntax to 1.9 styleAvnerCohen2012-10-152-3/+3
| |
| * 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'
| * 1.9 hash syntax changesAvnerCohen2012-10-132-5/+5
| |
| * 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.
* | | Rotate the debug.log on each 100MBRafael Mendonça França2012-10-201-1/+1
| | |
* | | Merge pull request #8002 from nashby/checkbox-includeRafael Mendonça França2012-10-202-3/+11
|\ \ \ | | | | | | | | check_box value can be not only an object of Array class
| * | | check_box value can be not only an object of Array classVasiliy Ermolovich2012-10-202-3/+11
| | | | | | | | | | | | | | | | there is a chance that `value` is a Set or an object that reponses to `include?` method so let's handle this case
* | | | Revert "Get rid of the ActiveRecord::Model::DeprecationProxy thing."Jeremy Kemper2012-10-2015-28/+88
| | | | | | | | | | | | | | | | This reverts commit 83846838252397b3781eed165ca301e05db39293.
* | | | Merge pull request #7951 from Grandrath/patch-1Carlos Antonio da Silva2012-10-201-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | Use `Rails.env` instead of `ENV['RAILS_ENV']`. Fix behavior of `rake db:structure:load`.
| * | | Don't use test environment by default when running rake db:structure:load; #7951Martin Grandrath2012-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | `ENV['RAILS_ENV']` is not defined unless explicitly specified on the command line when running `rake db:structure:load`.
* | | | We don't need this anymore since we had a sprockets-rails releaseRafael Mendonça França2012-10-191-3/+0
| | | |
* | | | Merge pull request #7995 from adimichele/masterRafael Mendonça França2012-10-192-1/+10
|\ \ \ \ | | | | | | | | | | Small change to active_record/locale/en.yml
| * | | | Changed scope for "taken" error message translation to decrease precedenceAndrew DiMichele2012-10-192-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved activerecord.errors.messages.taken to errors.messages.taken so that translations for, e.g., errors.attributes.email.taken don't get overridden. Test that the translation for 'taken' can be overridden
* | | | | Merge pull request #7997 from steveklabnik/issue_733Rafael Mendonça França2012-10-192-11/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Add i18n scope to disance_of_time_in_words.
| * | | | | Add i18n scope to disance_of_time_in_words.Steve Klabnik2012-10-192-11/+24
| |/ / / / | | | | | | | | | | | | | | | This fixes #733.