aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Fix Active Support changelog formatting [ci skip]Carlos Antonio da Silva2012-09-071-2/+2
| | | | |
* | | | | Remove 3.2.x entries from Active Record changelog [ci skip]Carlos Antonio da Silva2012-09-071-100/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 810a50dacf9ddddc1d59c1cb350e8ce785c8bf85, the new policy is to keep old changelogs in their own branches, to avoid manual syncing across different branches. Please check that commit for more reasoning about the new policy.
* | | | | Add Changelog entry for #4976: fix eager load associations without pks [ci skip]Carlos Antonio da Silva2012-09-071-0/+2
| | | | |
* | | | | Add Changelog entry for #7560: deprecate #filter in AS::Callbacks [ci skip]Carlos Antonio da Silva2012-09-071-0/+22
| | | | |
* | | | | Merge pull request #7552 from guilleiguaran/dalli-session-storeSantiago Pastorino2012-09-073-13/+8
|\| | | | | | | | | | | | | | Use Dalli for memcache session store
| * | | | Dalli doesn't support autoloading of unloaded classesGuillermo Iguaran2012-09-061-5/+0
| | | | |
| * | | | Use dalli 2.2.1 or prior to fix failing tests in memcache session storeGuillermo Iguaran2012-09-061-1/+1
| | | | |
| * | | | More fixes for action pack tests with Dalli.Arun Agrawal2012-09-061-3/+3
| | | | |
| * | | | Let's run action pack tests with DalliArun Agrawal2012-09-061-4/+4
| | | | | | | | | | | | | | | | | | | | There is no memcache gem left in repo.
* | | | | Merge pull request #7560 from bogdan/deprecate_callbacks_monkeypatchJosé Valim2012-09-073-8/+9
|\ \ \ \ \ | | | | | | | | | | | | AS::Callbacks: deprecate monkey patch of object callbacks
| * | | | | AS::Callbacks: deprecate monkey patch of object callbacksBogdan Gusiev2012-09-073-8/+9
|/ / / / /
* | | | | Merge pull request #4976 from kreynolds/fix_eager_without_pkeyJon Leighton2012-09-072-1/+9
|\ \ \ \ \ | | | | | | | | | | | | Fix eagerly loading associations without primary keys
| * | | | | Change JoinPart test from an integration to a unit testKelley Reynolds2012-07-052-13/+8
| | | | | |
| * | | | | Fix eagerly loading associations without primary keysKelley Reynolds2012-02-092-1/+14
| | | | | |
* | | | | | fix tests on Ruby 2.0.0Aaron Patterson2012-09-061-1/+1
| |/ / / / |/| | | |
* | | | | Merge pull request #7549 from asanghi/masterCarlos Antonio da Silva2012-09-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix Changelog example in Action Mailer [ci skip]
| * | | | | fix bad changelog exampleAditya Sanghi2012-09-071-1/+1
| | | | | |
* | | | | | Merge pull request #7550 from sikachu/master-changelogCarlos Antonio da Silva2012-09-061-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update Active Record CHANGELOG for #7419 [ci skip]
| * | | | | Update Active Record CHANGELOG for #7419Prem Sichanugrist2012-09-061-0/+6
|/ / / / /
* | | | | Merge pull request #7419 from releu/fix-invalid-filename-migration-generatorJosé Valim2012-09-062-0/+16
|\ \ \ \ \ | |_|/ / / |/| | | | Ensure valid migration filename on generating migration
| * | | | add mini-validator on creating migrationJan Bernacki2012-09-062-0/+16
|/ / / / | | | | | | | | | | | | move validation to AR
* | | | Merge pull request #7542 from aaronrenner/patch-2José Valim2012-09-061-1/+1
|\ \ \ \ | | | | | | | | | | Fixed around callback with lambda example
| * | | | Fixed around callback with lambda exampleAaron Renner2012-09-061-1/+1
|/ / / / | | | | | | | | This is a follow up to issue #7535
* | | | we already have the module objects, do not constantizeXavier Noria2012-09-061-2/+6
| | | | | | | | | | | | | | | | | | | | I have also chosen a variable name that matches the parameter in the definition of load_missing_constant.
* | | | restores awesome commentXavier Noria2012-09-061-0/+19
| | | | | | | | | | | | | | | | Those who say source code should be without comments lie.
* | | | no more const_missing combinatoricsXavier Noria2012-09-061-41/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, const_missing had a loop to try parent namespaces if the constant lookup failed, but at the same time delegated to load_missing_constant which in turn also walks up parent namespaces calling const_missing by hand. In the case of missing constants this results in repeated work in some funky nested way.
* | | | Merge pull request #7397 from asanghi/masterJosé Valim2012-09-064-3/+58
|\ \ \ \ | | | | | | | | | | Allow delivery method options to be set per mail instance
| * | | | Allow delivery method options to be set per mail instanceAditya Sanghi2012-09-044-3/+58
| | | | |
* | | | | Put the create_table block in a transaction.Rafael Mendonça França2012-09-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | This will solve the issue that abort the connection transaction when we skip the tests.
* | | | | Merge pull request #7527 from guedes/pg9.2_json_supportRafael Mendonça França2012-09-059-4/+135
|\ \ \ \ \ | | | | | | | | | | | | AR supporting new JSON data type on PostgreSQL >= 9.2
| * | | | | ActiveRecord support to PostgreSQL 9.2 JSON typeDickson S. Guedes2012-09-059-4/+135
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the support to encode/decode JSON data to/from database and creating columns of type JSON using a native type [1] supported by PostgreSQL from version 9.2. [1] http://www.postgresql.org/docs/9.2/static/datatype-json.html
* | | | | Add CHANGELOG entry for #7532 [ci skip]Rafael Mendonça França2012-09-051-0/+10
| | | | |
* | | | | Merge pull request #7532 from al2o3cr/fix_store_bugsRafael Mendonça França2012-09-053-4/+12
|\ \ \ \ \ | | | | | | | | | | | | correct handling of changes in AR::Store, combine multiple store_accessors
| * | | | | correctly flag changed attributes in AR::Store, combine multiple calls to ↵Matt Jones2012-09-053-4/+12
| |/ / / / | | | | | | | | | | | | | | | store_accessor
* | | | | Merge pull request #7536 from pivotal/fix_pluck_with_reserved_wordsRafael Mendonça França2012-09-055-3/+21
|\ \ \ \ \ | | | | | | | | | | | | Fix pluck when columns/tables are reserved words.
| * | | | | Fix pluck when columns/tables are reserved words.Ian Lesperance2012-09-055-3/+21
| | | | | |
* | | | | | Merge pull request #7525 from ↵Rafael Mendonça França2012-09-052-9/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | seamusabshere/use-mysql-binary-for-rake-db-structure-load Use the 'mysql' binary for 'rake db:structure:load'
| * | | | | Use the 'mysql' binary for 'rake db:structure:load'.Seamus Abshere2012-09-052-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | The previous implementation had the strange requirement that db/structure.sql contain only CREATE TABLE sql statements, one per table, separated by double newlines. SQLite3 and PostgreSQL database tasks, on the other hand, simply spawn 'sqlite3' and 'psql' binaries to load the file directly. The new implementation follows this and attempts to respect all current MySQL configuration settings.
* | | | | | Define just the cattr_reader.Rafael Mendonça França2012-09-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will trim down the API and avoid some error that can be made changing the cache object.
* | | | | | Use the same logger that ActionView::Base for the DigestorRafael Mendonça França2012-09-052-16/+22
| | | | | |
* | | | | | Remove unneeded requiresRafael Mendonça França2012-09-051-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not require all the core extensions inside the frameworks. The logger is already defined in the Action View framework.
* | | | | | Merge pull request #7337 from adzap/string_to_dummy_timeRafael Mendonça França2012-09-053-1/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix for time type columns with invalid time value
| * | | | | | Update changelog with time column type casting fixAdam Meehan2012-09-051-0/+4
| | | | | | |
| * | | | | | Fix for time type columns with invalid timeAdam Meehan2012-09-052-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The string_to_dummy_time method was blindly parsing the dummy time string with Date._parse which returns a hash for the date part regardless of whether the time part is an invalid time string.
* | | | | | | Merge pull request #7447 from etehtsea/postgresql-adapterRafael Mendonça França2012-09-057-988/+1038
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Modularize postgresql adapter
| * | | | | | Modularize postgresql adapterKonstantin Shabanov2012-09-057-988/+1038
| | | | | | |
* | | | | | | Merge pull request #7530 from robin850/masterXavier Noria2012-09-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix a typo in AD
| * | | | | | | Fix a typoRobin Dupret2012-09-051-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #7519 from leocassarani/merge-with-blockRafael Mendonça França2012-09-043-6/+50
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add an optional block to HashWithIndifferentAccess#update and #merge
| * | | | | | | | Extend HashWithIndifferentAccess#update to take an optional blockLeo Cassarani2012-09-053-6/+50
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a block is passed into the method, it will be invoked for each duplicated key, with the key in question and the two values as arguments. The value for the duplicated key in the receiver will be set to the return value of the block. This behaviour matches Ruby's long-standing implementation of Hash#update and is intended to provide a more consistent interface. HashWithIndifferentAccess#merge is also affected by the change, as it uses #update internally.