aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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.
* | | | | | Merge pull request #7996 from yahonda/revert_7994Rafael Mendonça França2012-10-191-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 Honda2012-10-201-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_logRafael Mendonça França2012-10-191-1/+2
|\ \ \ \ \ | | | | | | | | | | | | truncate debug.log on each test run
| * | | | | truncate debug.log on each test runFrancesco Rodriguez2012-10-191-1/+2
| | | | | |
* | | | | | Get rid of the ActiveRecord::Model::DeprecationProxy thing.Jon Leighton2012-10-1915-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.rc1Carlos Antonio da Silva2012-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | So that we can bundle and travis can run our tests.
* | | | | Rename the partial_updates config to partial_writesJon Leighton2012-10-195-23/+53
| | | | | | | | | | | | | | | | | | | | This reflects the fact that it now impact inserts as well as updates.
* | | | | nodoc the first_or_create methods and document alternativesJon Leighton2012-10-194-68/+50
| | | | |
* | | | | fix test :/Jon Leighton2012-10-191-5/+1
| | | | |
* | | | | The default value of a text/blob in mysql strict mode should be nilJon Leighton2012-10-196-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
* | | | | Add Relation#find_or_create_by and friendsJon Leighton2012-10-195-22/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar to #first_or_create, but slightly different and a nicer API. See the CHANGELOG/docs in the commit. Fixes #7853
* | | | | synchronize on param filter cache.Aaron Patterson2012-10-181-2/+7
| | | | | | | | | | | | | | | | | | | | Do we actually need this cache?
* | | | | add another singleton for environment filteringAaron Patterson2012-10-181-3/+8
| | | | |
* | | | | oops, forgot the default parameterAaron Patterson2012-10-181-1/+1
| | | | |
* | | | | keep a singleton filter around that we can use when no filter is setAaron Patterson2012-10-181-2/+6
| | | | |
* | | | | move compiled filters to their own class so that recursive calls don'tAaron Patterson2012-10-181-41/+45
| | | | | | | | | | | | | | | | | | | | need to check for the length of @filters
* | | | | nil isn't a valid filterAaron Patterson2012-10-181-1/+0
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 16:04:09 +0000