Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #16738 from net-engine/guides-template-inheritance | Rafael Mendonça França | 2015-02-25 | 1 | -0/+36 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into guides-template-inheritance | ecoologic | 2014-10-07 | 235 | -943/+3435 | |
| |\ \ \ \ | ||||||
| * | | | | | 2.2.14.5 Template Inheritance (new in guide, feature in since 3.1) | erik | 2014-08-29 | 1 | -0/+36 | |
* | | | | | | Merge pull request #17601 from kamipo/support_any_unicode_charsets | Rafael Mendonça França | 2015-02-25 | 4 | -11/+16 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add `SchemaMigration.create_table` support any unicode charsets for MySQL. | Ryuta Kamizono | 2015-02-26 | 4 | -11/+16 | |
* | | | | | | | Merge pull request #17297 from rebyn/fix/17161-remove-objs-from-has_many-upda... | Rafael Mendonça França | 2015-02-25 | 2 | -0/+26 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Add specs for adding-to/clear has_many collections’s behavior on `updated_at` | Tu Hoang | 2014-10-30 | 2 | -0/+26 | |
* | | | | | | | Merge pull request #15476 from JacobEvelyn/master | Rafael Mendonça França | 2015-02-25 | 2 | -0/+10 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use logger environment settings in Rails console. | Jacob Evelyn | 2014-06-02 | 2 | -0/+10 | |
* | | | | | | | | fix bug in Levenshtein distance calculation | schneems | 2015-02-25 | 1 | -2/+0 | |
* | | | | | | | | add CHANGELOG for f6e293ec54f02f83cdb37502bea117f66f87bcae. [ci skip] | Yves Senn | 2015-02-25 | 1 | -0/+7 | |
* | | | | | | | | Fix default headers in test responses | Jeremy Kemper | 2015-02-25 | 5 | -34/+69 | |
* | | | | | | | | Merge pull request #19076 from nygrenh/truncate-words-fix | Rafael Mendonça França | 2015-02-25 | 3 | -1/+15 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix a backtracking problem in String#truncate_words | Henrik Nygren | 2015-02-25 | 3 | -1/+15 | |
* | | | | | | | | | Merge pull request #19074 from Mession/fix_test_dependency_of_erb_template_pa... | Rafael Mendonça França | 2015-02-25 | 3 | -5/+20 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix dependency tracker bug | Juho Leinonen | 2015-02-25 | 3 | -5/+20 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #18948 from kaspth/automatic-collection-caching | Rafael Mendonça França | 2015-02-25 | 17 | -22/+305 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Instrument read_multi. | Kasper Timm Hansen | 2015-02-21 | 3 | -20/+46 | |
| * | | | | | | | | Collections automatically cache and fetch partials. | Kasper Timm Hansen | 2015-02-21 | 11 | -3/+167 | |
| * | | | | | | | | Merge multi_fetch_fragments. | Kasper Timm Hansen | 2015-02-20 | 6 | -2/+95 | |
* | | | | | | | | | Merge pull request #19072 from y-yagi/mailer_doc | Abdelkader Boudih | 2015-02-25 | 1 | -15/+15 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | update docs to reflect that mailer generator add suffix to generated classes ... | yuuji.yaginuma | 2015-02-25 | 1 | -15/+15 | |
* | | | | | | | | | Merge pull request #19069 from robertzk/patch-1 | Abdelkader Boudih | 2015-02-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fix typo [ci-skip] | Robert Krzyzanowski | 2015-02-25 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | cache quoted column names in SQLite3 | Aaron Patterson | 2015-02-24 | 1 | -1/+2 | |
* | | | | | | | | | Merge pull request #19068 from pda/ar-translate-exception-class-no-log | Aaron Patterson | 2015-02-24 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | AR: translate_exception_class() no longer logs error. | Paul Annesley | 2015-02-24 | 1 | -1/+0 | |
* | | | | | | | | | | Merge pull request #18936 from arthurnn/txn_callbacks | Arthur Nogueira Neves | 2015-02-24 | 4 | -4/+105 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Rename tests | Arthur Neves | 2015-02-24 | 1 | -4/+4 | |
| * | | | | | | | | | | Add before_commit | Arthur Neves | 2015-02-24 | 4 | -4/+28 | |
| * | | | | | | | | | | Add transaction callbacks that wont enroll to the transaction. | Arthur Neves | 2015-02-24 | 2 | -2/+79 | |
* | | | | | | | | | | | Merge pull request #17426 from jpcody/fixture_associations_fix | Aaron Patterson | 2015-02-24 | 2 | -1/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Rely on through table name in has_many fixtures | Joshua Cody | 2014-10-29 | 2 | -1/+23 | |
* | | | | | | | | | | | Add a failing test demonstrating regression with HEAD requests to Rack apps, ... | Jeremy Kemper | 2015-02-24 | 1 | -3/+9 | |
* | | | | | | | | | | | Tiny documentation edits [ci skip] | Robin Dupret | 2015-02-24 | 3 | -5/+4 | |
* | | | | | | | | | | | Call `attributes_for_update` in `_update_record` w/ optimistic locking | Sean Griffin | 2015-02-24 | 1 | -1/+1 | |
* | | | | | | | | | | | Fix c479480638508c20601af69ca46b5b606c2d5b4d to account for from_value -> fro... | Jeremy Kemper | 2015-02-24 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #18744 from mfazekas/no-table-name-with-from | Rafael Mendonça França | 2015-02-24 | 2 | -5/+20 | |
* | | | | | | | | | | | Merge pull request #19066 from courtenay/mysql_boolean_limit_19065 | Rafael Mendonça França | 2015-02-24 | 2 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix mysql's schema.rb dumper so it does not include limit on emulated boolean... | Court3nay | 2015-02-24 | 2 | -0/+6 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #19055 from ianks/model_name.to_json | Rafael Mendonça França | 2015-02-24 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | activemodel: make .model_name json encodable | Ian Ker-Seymer | 2015-02-24 | 2 | -1/+5 | |
* | | | | | | | | | | | | Use other controller instead of sharing the controller | Rafael Mendonça França | 2015-02-24 | 1 | -18/+17 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Make TestController available to all test classes | Rafael Mendonça França | 2015-02-24 | 1 | -16/+16 | |
* | | | | | | | | | | | Merge pull request #19060 from iainbeeston/deprecate-skip-action-callback | Rafael Mendonça França | 2015-02-24 | 3 | -2/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Deprecate `AbstractController::Callbacks#skip_action_callback` | Iain Beeston | 2015-02-24 | 3 | -2/+28 | |
* | | | | | | | | | | | | rework `disable_referential_integrity` for PostgreSQL. | Yves Senn | 2015-02-24 | 3 | -9/+136 | |
* | | | | | | | | | | | | Merge pull request #19064 from kamipo/remove_unused_table | Rafael Mendonça França | 2015-02-24 | 1 | -10/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Remove unused table | Ryuta Kamizono | 2015-02-25 | 1 | -10/+0 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #19062 from kamipo/move_back_new_column_definition_into_ta... | Rafael Mendonça França | 2015-02-24 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | |