| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | include serializers in ActiveModel::Serialization example | Hrvoje Šimić | 2012-10-19 | 1 | -0/+12 | |
| | | | ||||||
| | * | better examples in ActiveModel readme | Hrvoje Šimić | 2012-10-19 | 1 | -1/+15 | |
| | | | ||||||
| | * | Corrected the logic in production.rb comment. | Robb Shecter | 2012-10-18 | 1 | -1/+1 | |
| | | | ||||||
| | * | 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 | |
| | | | ||||||
| | * | add a nested attributes example into Strong Parameters documentation [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -6/+31 | |
| | | | ||||||
| | * | remove some non-breaking spaces [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -13/+13 | |
| | | | ||||||
| | * | remove non-breaking spaces [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -3/+3 | |
| | | | ||||||
| | * | 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 | |
| | | | ||||||
| | * | Moving code base to 1.9 hash syntax | AvnerCohen | 2012-10-16 | 3 | -7/+7 | |
| | | | ||||||
| | * | 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 | |
| | | | ||||||
| | * | Hash syntax to 1.9 style | AvnerCohen | 2012-10-15 | 2 | -3/+3 | |
| | | | ||||||
| | * | 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. | |||||
| * | | | Rotate the debug.log on each 100MB | Rafael Mendonça França | 2012-10-20 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #8002 from nashby/checkbox-include | Rafael Mendonça França | 2012-10-20 | 2 | -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 class | Vasiliy Ermolovich | 2012-10-20 | 2 | -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 Kemper | 2012-10-20 | 15 | -28/+88 | |
| | | | | | | | | | | | | | | | | | This reverts commit 83846838252397b3781eed165ca301e05db39293. | |||||
| * | | | | Merge pull request #7951 from Grandrath/patch-1 | Carlos Antonio da Silva | 2012-10-20 | 1 | -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; #7951 | Martin Grandrath | 2012-10-18 | 1 | -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 release | Rafael Mendonça França | 2012-10-19 | 1 | -3/+0 | |
| | | | | | ||||||
| * | | | | Merge pull request #7995 from adimichele/master | Rafael Mendonça França | 2012-10-19 | 2 | -1/+10 | |
| |\ \ \ \ | | | | | | | | | | | Small change to active_record/locale/en.yml | |||||
| | * | | | | Changed scope for "taken" error message translation to decrease precedence | Andrew DiMichele | 2012-10-19 | 2 | -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_733 | Rafael Mendonça França | 2012-10-19 | 2 | -11/+24 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add i18n scope to disance_of_time_in_words. | |||||
| | * | | | | | Add i18n scope to disance_of_time_in_words. | Steve Klabnik | 2012-10-19 | 2 | -11/+24 | |
| | |/ / / / | | | | | | | | | | | | | | | | This fixes #733. | |||||
| * | | | | | Merge pull request #7996 from yahonda/revert_7994 | Rafael Mendonça França | 2012-10-19 | 1 | -2/+1 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Revert "truncate debug.log on each test run" I'm reverting this since we may want to see SQL results of subsequent tests run, to, per example, copare them. I didn't realized this first time but @yahonda pointed me out. | |||||
| | * | | | | Revert "truncate debug.log on each test run" | Yasuo Honda | 2012-10-20 | 1 | -2/+1 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 98043c689f945cabffc043f4bdc80ab2a7edc763. Because if every time `debug.log` is truncated, developers have no way to see the previous ActiveRecord unit test results. `debug.log` file can be easily reduced by executing `$ touch /dev/null > debug.log` periodically. | |||||
| * | | | | Merge pull request #7994 from frodsan/truncate_debug_log | Rafael Mendonça França | 2012-10-19 | 1 | -1/+2 | |
| |\ \ \ \ | | | | | | | | | | | truncate debug.log on each test run | |||||
| | * | | | | truncate debug.log on each test run | Francesco Rodriguez | 2012-10-19 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | Get rid of the ActiveRecord::Model::DeprecationProxy thing. | Jon Leighton | 2012-10-19 | 15 | -88/+28 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think it's going to be too much pain to try to transition the :active_record load hook from executing against Base to executing against Model. For example, after Model is included in Base, and modules included in Model will no longer get added to the ancestors of Base. So plugins which wish to be compatible with both Model and Base should use the :active_record_model load hook which executes *before* Base gets loaded. In general, ActiveRecord::Model is an advanced feature at the moment and probably most people will continue to inherit from ActiveRecord::Base for the time being. | |||||
| * | | | | Update rails gemspec to use sprockets-rails 2.0.0.rc1 | Carlos Antonio da Silva | 2012-10-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | So that we can bundle and travis can run our tests. | |||||
| * | | | | Rename the partial_updates config to partial_writes | Jon Leighton | 2012-10-19 | 5 | -23/+53 | |
| | | | | | | | | | | | | | | | | | This reflects the fact that it now impact inserts as well as updates. | |||||
| * | | | | nodoc the first_or_create methods and document alternatives | Jon Leighton | 2012-10-19 | 4 | -68/+50 | |
| | | | | | ||||||
| * | | | | fix test :/ | Jon Leighton | 2012-10-19 | 1 | -5/+1 | |
| | | | | | ||||||
| * | | | | The default value of a text/blob in mysql strict mode should be nil | Jon Leighton | 2012-10-19 | 6 | -48/+70 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In non-strict mode it is '', but if someone is in strict mode then we should honour the strict semantics. Also, this removes the need for a completely horrible hack in dirty.rb. Closes #7780 | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |