aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | prevent people from accidentally modifying the filter wordAaron Patterson2012-10-181-1/+1
| |
* | simplify filter enabled checkingAaron Patterson2012-10-181-9/+4
| |
* | if no filters are supplied, default to an empty listAaron Patterson2012-10-181-1/+1
| |
* | initialize required instance variables for this mixinAaron Patterson2012-10-181-2/+7
| |
* | There is already a Set of non-hidden action_names lying around.thedarkone2012-10-181-8/+2
| |
* | eagerly populate the http method loookup cache so we don't need locksAaron Patterson2012-10-181-1/+7
| |
* | move cache inside the instance so we do not need lockingAaron Patterson2012-10-181-9/+12
| |
* | add test for fetch with a blockAaron Patterson2012-10-182-2/+6
| |
* | prefer composition over inheritenceAaron Patterson2012-10-182-11/+31
| |
* | fix assertionsAaron Patterson2012-10-181-2/+2
| |
* | Make DescendantsTracker thread safe and optimize the #descendants method.thedarkone2012-10-183-30/+51
| |
* | some ruby interpreters don't have ruby-prof so just skip the testsAaron Patterson2012-10-182-4/+13
| | | | | | | | rather than exiting the process.
* | Merge pull request #7975 from butcher/extend_date_select_helper_functionalityRafael Mendonça França2012-10-183-0/+24
|\ \ | | | | | | | | | | | | | | | | | | Extend date_select helper functionality. Conflicts: actionpack/CHANGELOG.md
| * | Extend date_select helper functionality.Pavel Nikitin2012-10-183-0/+22
| | |
* | | Remove warning setting eager_loadRafael Mendonça França2012-10-181-0/+1
| | |
* | | Don't use action_controller.perform_caching to enable rack-rack.Rafael Mendonça França2012-10-183-7/+14
| | | | | | | | | | | | | | | Setting the action_dispatch.rack_cache options to true or a hash should be the way to enable it.
* | | Fix the app_generator and plugin_new testsRafael Mendonça França2012-10-182-1/+4
| | |
* | | Merge pull request #7990 from mrbrdo/masterRafael Mendonça França2012-10-181-1/+1
|\ \ \ | | | | | | | | Credit for previous commit [ci skip]
| * | | add credit to committer of pull request #6569Jan Berdajs2012-10-181-1/+1
|/ / /
* | | Merge pull request #7969 from ↵Rafael Mendonça França2012-10-181-5/+6
|\ \ \ | |_|/ |/| | | | | | | | senny/active_model_validations_requires_necessary_files active_model/validations requires necessary files to run
| * | active_model/validations requires necessary files to runYves Senn2012-10-181-0/+1
| | |
| * | cleanup, replace non-breaking spaces with spacesYves Senn2012-10-181-5/+5
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 02:33:11 +0000