Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 | |
| * | | | | | | | rewrite inheritance tests with a custom inheritance_column | Yves Senn | 2012-09-03 | 4 | -49/+61 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #7506 from senny/issue_7503 | Rafael Mendonça França | 2012-09-03 | 5 | -2/+38 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | set the configured #inheritance_column on #become (#7503) | Yves Senn | 2012-09-03 | 5 | -2/+38 | |
* | | | | | | | Merge pull request #7502 from xoen/fixed-upgrading-guide-markup | Carlos Antonio da Silva | 2012-09-02 | 1 | -2/+12 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixed markup in Upgrading RoR guide [ci skip] | Aldo "xoen" Giambelluca | 2012-09-02 | 1 | -2/+12 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #7504 from behrends/patch-1 | Carlos Antonio da Silva | 2012-09-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix example code: use tasks instead of comments | Erik Behrends | 2012-09-02 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #7495 from steveklabnik/issue_7478 | Aaron Patterson | 2012-09-01 | 3 | -4/+18 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Force reloading of the session after destroy | Andreas Loupasakis | 2012-09-01 | 1 | -0/+3 | |
| * | | | | | Override rack's destroy_session in cookie store | Andreas Loupasakis | 2012-09-01 | 1 | -0/+8 | |
| * | | | | | Assign a new session_id to session options hash | Andreas Loupasakis | 2012-09-01 | 1 | -2/+2 |