aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge pull request #7908 from arunagw/build_fix_railtiesRafael Mendonça França2012-10-111-5/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | No need to test for rack-cache present in gem file
| | * | | | | | No need to test for rack-cache present in GemfileArun Agrawal2012-10-111-5/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as it's removed here 1fc795468525d8622cdca474a54c8310a514aa46
| * | | | | | Merge pull request #7050 from kytrinyx/documentation-reset-column-infoVijay Dev2012-10-101-0/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Expand the caveat about models in migrations in the rails guide.
| | * | | | | | 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 pull request #7904 from jfirebaugh/eager_autoloadRafael Mendonça França2012-10-101-10/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Eager autoload Preloader classes
| | * | | | | | | Eager autoload Preloader classesJohn Firebaugh2012-10-101-10/+14
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without eager autoloading, these would be autoloaded only when #preloader_for is called, which is too late in threaded applications.
| * | | | | | | Remove the leading :: constant qualifier in the ActiveRecord::Fixtures ↵Jeremy Kemper2012-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deprecation message
| * | | | | | | Upgrade to a jquery-rails that doesn't expect ↵Jeremy Kemper2012-10-101-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | config.action_view.javascript_expansions to exist
| * | | | | | Merge pull request #7887 from senny/remove_unused_requires_in_ar_testsVijay Dev2012-10-104-4/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | remove duplicated require statements in AR test cases
| | * | | | | | remove duplicated require statements in AR test casesYves Senn2012-10-094-4/+0
| | | | | | | |
| * | | | | | | Fixing build failuresVijay Dev2012-10-116-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build failed with an error "invalid multibyte char (US-ASCII)" in these files. Apparently, some UTF-8 char disguised as whitespace causes this. Thanks @rafaelfranca
| * | | | | | | Merge pull request #7898 from olivierlacan/pg_homebrew_instructionsVijay Dev2012-10-101-1/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Offer instructions for pg gem when installed via Homebrew
| | * | | | | | | Offer instructions for pg gem when installed via HomebrewOlivier Lacan2012-10-101-1/+3
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #7890 from AvnerCohen/new_hash_syntaxVijay Dev2012-10-101-9/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Moving to new hash syntax
| | * | | | | | | moving to new hash syntax, for discussion before I take the time on full foldersAvnerCohen2012-10-091-9/+9
| | | | | | | | |
* | | | | | | | | Changeing some code-styles of the examples & fix a typo on dependent optionPablo Ifran2012-10-221-18/+12
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 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 branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-1165-252/+336
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-112-4/+4
| | | | | | | |
| * | | | | | | copy-edit the email delivery errors commentVijay Dev2012-10-111-1/+1
| | | | | | | |
| * | | | | | | Revert "Fix Example in active model attribute methods"Vijay Dev2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1c02b988641c201308e6b3de6457128878e47bd5.
| * | | | | | | Revert "Fix all examples in comments in active_model attribute methods"Vijay Dev2012-10-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 93b1ca8bd34993f8958219f13c195f5acf8e55f6.
| * | | | | | | Added clarity to update_column(s)Adam Haymond2012-10-101-2/+2
| | | | | | | |