Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 | |||||
* | | | | Add Relation#find_or_create_by and friends | Jon Leighton | 2012-10-19 | 5 | -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 Patterson | 2012-10-18 | 1 | -2/+7 | |
| | | | | | | | | | | | | | | | | Do we actually need this cache? | |||||
* | | | | add another singleton for environment filtering | Aaron Patterson | 2012-10-18 | 1 | -3/+8 | |
| | | | | ||||||
* | | | | oops, forgot the default parameter | Aaron Patterson | 2012-10-18 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | keep a singleton filter around that we can use when no filter is set | Aaron Patterson | 2012-10-18 | 1 | -2/+6 | |
| | | | | ||||||
* | | | | move compiled filters to their own class so that recursive calls don't | Aaron Patterson | 2012-10-18 | 1 | -41/+45 | |
| | | | | | | | | | | | | | | | | need to check for the length of @filters | |||||
* | | | | nil isn't a valid filter | Aaron Patterson | 2012-10-18 | 1 | -1/+0 | |
| | | | | ||||||
* | | | | prevent people from accidentally modifying the filter word | Aaron Patterson | 2012-10-18 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | simplify filter enabled checking | Aaron Patterson | 2012-10-18 | 1 | -9/+4 | |
| | | | | ||||||
* | | | | if no filters are supplied, default to an empty list | Aaron Patterson | 2012-10-18 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | initialize required instance variables for this mixin | Aaron Patterson | 2012-10-18 | 1 | -2/+7 | |
| | | | | ||||||
* | | | | There is already a Set of non-hidden action_names lying around. | thedarkone | 2012-10-18 | 1 | -8/+2 | |
| | | | | ||||||
* | | | | eagerly populate the http method loookup cache so we don't need locks | Aaron Patterson | 2012-10-18 | 1 | -1/+7 | |
| | | | | ||||||
* | | | | move cache inside the instance so we do not need locking | Aaron Patterson | 2012-10-18 | 1 | -9/+12 | |
| | | | | ||||||
* | | | | add test for fetch with a block | Aaron Patterson | 2012-10-18 | 2 | -2/+6 | |
| | | | | ||||||
* | | | | prefer composition over inheritence | Aaron Patterson | 2012-10-18 | 2 | -11/+31 | |
| | | | | ||||||
* | | | | fix assertions | Aaron Patterson | 2012-10-18 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Make DescendantsTracker thread safe and optimize the #descendants method. | thedarkone | 2012-10-18 | 3 | -30/+51 | |
| | | | | ||||||
* | | | | some ruby interpreters don't have ruby-prof so just skip the tests | Aaron Patterson | 2012-10-18 | 2 | -4/+13 | |
| | | | | | | | | | | | | | | | | rather than exiting the process. | |||||
* | | | | Merge pull request #7975 from butcher/extend_date_select_helper_functionality | Rafael Mendonça França | 2012-10-18 | 3 | -0/+24 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend date_select helper functionality. Conflicts: actionpack/CHANGELOG.md | |||||
| * | | | | Extend date_select helper functionality. | Pavel Nikitin | 2012-10-18 | 3 | -0/+22 | |
| | | | | | ||||||
* | | | | | Remove warning setting eager_load | Rafael Mendonça França | 2012-10-18 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Don't use action_controller.perform_caching to enable rack-rack. | Rafael Mendonça França | 2012-10-18 | 3 | -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 tests | Rafael Mendonça França | 2012-10-18 | 2 | -1/+4 | |
| | | | | | ||||||
* | | | | | Merge pull request #7990 from mrbrdo/master | Rafael Mendonça França | 2012-10-18 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Credit for previous commit [ci skip] | |||||
| * | | | | | add credit to committer of pull request #6569 | Jan Berdajs | 2012-10-18 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #7969 from ↵ | Rafael Mendonça França | 2012-10-18 | 1 | -5/+6 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | senny/active_model_validations_requires_necessary_files active_model/validations requires necessary files to run | |||||
| * | | | | active_model/validations requires necessary files to run | Yves Senn | 2012-10-18 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | cleanup, replace non-breaking spaces with spaces | Yves Senn | 2012-10-18 | 1 | -5/+5 | |
|/ / / / | ||||||
* | | | | Now the Sprockets railtie lives in sprockets/railtie | Rafael Mendonça França | 2012-10-18 | 4 | -4/+4 | |
| | | | | ||||||
* | | | | Permit string and float values in the multiparameter attributes | Rafael Mendonça França | 2012-10-18 | 2 | -10/+15 | |
| | | | | ||||||
* | | | | Typecast to string and array are not supported in multiparameter | Rafael Mendonça França | 2012-10-18 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | | attributes | |||||
* | | | | Change back to official sprockets-rails | Joshua Peek | 2012-10-17 | 2 | -3/+3 | |
| | | | | ||||||
* | | | | Add changelog entry for precompile config | Joshua Peek | 2012-10-17 | 1 | -0/+4 | |
| | | | | ||||||
* | | | | Merge pull request #7968 from josh/only-precompile-app-assets-by-default | Rafael Mendonça França | 2012-10-17 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Only compile non-js/css under app/assets by default | |||||
| * | | | | Only compile non-js/css under app/assets by default | Joshua Peek | 2012-10-16 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #7964 from josh/josh-sprockets-rails | Rafael Mendonça França | 2012-10-17 | 7 | -136/+61 | |
|\ \ \ \ \ | | | | | | | | | | | | | Switch to new sprockets-rails plugin | |||||
| * | | | | | Switch to new sprockets-rails plugin | Joshua Peek | 2012-10-15 | 7 | -136/+61 | |
| |/ / / / | ||||||
* | | | | | Add more CHANGELOG entries from #7927 | Rafael Mendonça França | 2012-10-17 | 2 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove references for RAILS_ASSET_ID from the guides [ci skip] | |||||
* | | | | | Add CHANGELOG entry for #7927 | Rafael Mendonça França | 2012-10-17 | 3 | -11/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the asset_path configuration from the guides and added an entry in the upgrading_ruby_on_rails guide [ci skip] | |||||
* | | | | | remove unused variables. Oops! | Aaron Patterson | 2012-10-17 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | use columns hash to look up the column for the count field | Aaron Patterson | 2012-10-17 | 2 | -14/+7 | |
| | | | | |