| Commit message (Expand) | Author | Age | Files | Lines |
* | Improve error message for memcache session store when dalli isn't loaded in app | Guillermo Iguaran | 2012-09-07 | 1 | -2/+6 |
* | Dalli doesn't support autoloading of unloaded classes | Guillermo Iguaran | 2012-09-06 | 1 | -5/+0 |
* | Use dalli 2.2.1 or prior to fix failing tests in memcache session store | Guillermo Iguaran | 2012-09-06 | 1 | -1/+1 |
* | More fixes for action pack tests with Dalli. | Arun Agrawal | 2012-09-06 | 1 | -3/+3 |
* | Let's run action pack tests with Dalli | Arun Agrawal | 2012-09-06 | 1 | -4/+4 |
* | Merge pull request #7549 from asanghi/master | Carlos Antonio da Silva | 2012-09-06 | 1 | -1/+1 |
|\ |
|
| * | fix bad changelog example | Aditya Sanghi | 2012-09-07 | 1 | -1/+1 |
* | | Merge pull request #7550 from sikachu/master-changelog | Carlos Antonio da Silva | 2012-09-06 | 1 | -0/+6 |
|\ \
| |/
|/| |
|
| * | Update Active Record CHANGELOG for #7419 | Prem Sichanugrist | 2012-09-06 | 1 | -0/+6 |
|/ |
|
* | Merge pull request #7419 from releu/fix-invalid-filename-migration-generator | José Valim | 2012-09-06 | 2 | -0/+16 |
|\ |
|
| * | add mini-validator on creating migration | Jan Bernacki | 2012-09-06 | 2 | -0/+16 |
|/ |
|
* | Merge pull request #7542 from aaronrenner/patch-2 | José Valim | 2012-09-06 | 1 | -1/+1 |
|\ |
|
| * | Fixed around callback with lambda example | Aaron Renner | 2012-09-06 | 1 | -1/+1 |
|/ |
|
* | we already have the module objects, do not constantize | Xavier Noria | 2012-09-06 | 1 | -2/+6 |
* | restores awesome comment | Xavier Noria | 2012-09-06 | 1 | -0/+19 |
* | no more const_missing combinatorics | Xavier Noria | 2012-09-06 | 1 | -41/+2 |
* | Merge pull request #7397 from asanghi/master | José Valim | 2012-09-06 | 4 | -3/+58 |
|\ |
|
| * | Allow delivery method options to be set per mail instance | Aditya Sanghi | 2012-09-04 | 4 | -3/+58 |
* | | Put the create_table block in a transaction. | Rafael Mendonça França | 2012-09-05 | 1 | -2/+4 |
* | | Merge pull request #7527 from guedes/pg9.2_json_support | Rafael Mendonça França | 2012-09-05 | 9 | -4/+135 |
|\ \ |
|
| * | | ActiveRecord support to PostgreSQL 9.2 JSON type | Dickson S. Guedes | 2012-09-05 | 9 | -4/+135 |
|/ / |
|
* | | Add CHANGELOG entry for #7532 [ci skip] | Rafael Mendonça França | 2012-09-05 | 1 | -0/+10 |
* | | Merge pull request #7532 from al2o3cr/fix_store_bugs | Rafael Mendonça França | 2012-09-05 | 3 | -4/+12 |
|\ \ |
|
| * | | correctly flag changed attributes in AR::Store, combine multiple calls to sto... | Matt Jones | 2012-09-05 | 3 | -4/+12 |
| |/ |
|
* | | Merge pull request #7536 from pivotal/fix_pluck_with_reserved_words | Rafael Mendonça França | 2012-09-05 | 5 | -3/+21 |
|\ \ |
|
| * | | Fix pluck when columns/tables are reserved words. | Ian Lesperance | 2012-09-05 | 5 | -3/+21 |
* | | | Merge pull request #7525 from seamusabshere/use-mysql-binary-for-rake-db-stru... | Rafael Mendonça França | 2012-09-05 | 2 | -9/+10 |
|\ \ \
| |/ /
|/| | |
|
| * | | Use the 'mysql' binary for 'rake db:structure:load'. | Seamus Abshere | 2012-09-05 | 2 | -9/+10 |
* | | | Define just the cattr_reader. | Rafael Mendonça França | 2012-09-05 | 1 | -1/+2 |
* | | | Use the same logger that ActionView::Base for the Digestor | Rafael Mendonça França | 2012-09-05 | 2 | -16/+22 |
* | | | Remove unneeded requires | Rafael Mendonça França | 2012-09-05 | 1 | -7/+3 |
* | | | Merge pull request #7337 from adzap/string_to_dummy_time | Rafael Mendonça França | 2012-09-05 | 3 | -1/+23 |
|\ \ \ |
|
| * | | | Update changelog with time column type casting fix | Adam Meehan | 2012-09-05 | 1 | -0/+4 |
| * | | | Fix for time type columns with invalid time | Adam Meehan | 2012-09-05 | 2 | -1/+19 |
* | | | | Merge pull request #7447 from etehtsea/postgresql-adapter | Rafael Mendonça França | 2012-09-05 | 7 | -988/+1038 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Modularize postgresql adapter | Konstantin Shabanov | 2012-09-05 | 7 | -988/+1038 |
* | | | | Merge pull request #7530 from robin850/master | Xavier Noria | 2012-09-05 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Fix a typo | Robin Dupret | 2012-09-05 | 1 | -1/+1 |
* | | | | | Merge pull request #7519 from leocassarani/merge-with-block | Rafael Mendonça França | 2012-09-04 | 3 | -6/+50 |
|\ \ \ \ \ |
|
| * | | | | | Extend HashWithIndifferentAccess#update to take an optional block | Leo Cassarani | 2012-09-05 | 3 | -6/+50 |
|/ / / / / |
|
* | | | | | Merge pull request #7522 from lexmag/mime_type | Rafael Mendonça França | 2012-09-04 | 2 | -85/+94 |
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
|
| * | | | | Refactor `Mime::Type` | Aleksey Magusev | 2012-09-05 | 2 | -85/+94 |
* | | | | | We dont need to include the name and the format in the digest -- source is au... | David Heinemeier Hansson | 2012-09-04 | 1 | -1/+1 |
| |_|_|/
|/| | | |
|
* | | | | Merge pull request #7422 from ernie/improvements-to-improved-routing | David Heinemeier Hansson | 2012-09-04 | 3 | -14/+103 |
|\ \ \ \ |
|
| * | | | | Make enhanced routing Concerns more tell-don't-ask | Ernie Miller | 2012-09-03 | 2 | -37/+70 |
| * | | | | Fix concerns not executing block in mapper | Ernie Miller | 2012-09-03 | 2 | -2/+29 |
| * | | | | Allow routing concerns to accept a callable | Ernie Miller | 2012-09-03 | 3 | -5/+34 |
* | | | | | revised the exception message "Expected #{file_path} to define #{qualified_na... | Xavier Noria | 2012-09-04 | 1 | -1/+1 |
* | | | | | Merge pull request #7515 from senny/custom_inheritance_column_test_refactoring | Rafael Mendonça França | 2012-09-03 | 9 | -65/+66 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | test cleanup, remove ruby_type because it's no longer needed | Yves Senn | 2012-09-03 | 7 | -16/+5 |