aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19076 from nygrenh/truncate-words-fixRafael Mendonça França2015-02-253-1/+15
|\
| * Fix a backtracking problem in String#truncate_wordsHenrik Nygren2015-02-253-1/+15
* | Merge pull request #19074 from Mession/fix_test_dependency_of_erb_template_pa...Rafael Mendonça França2015-02-253-5/+20
|\ \
| * | Fix dependency tracker bugJuho Leinonen2015-02-253-5/+20
| |/
* | Merge pull request #18948 from kaspth/automatic-collection-cachingRafael Mendonça França2015-02-2517-22/+305
|\ \ | |/ |/|
| * Instrument read_multi.Kasper Timm Hansen2015-02-213-20/+46
| * Collections automatically cache and fetch partials.Kasper Timm Hansen2015-02-2111-3/+167
| * Merge multi_fetch_fragments.Kasper Timm Hansen2015-02-206-2/+95
* | Merge pull request #19072 from y-yagi/mailer_docAbdelkader Boudih2015-02-251-15/+15
|\ \
| * | update docs to reflect that mailer generator add suffix to generated classes ...yuuji.yaginuma2015-02-251-15/+15
* | | Merge pull request #19069 from robertzk/patch-1Abdelkader Boudih2015-02-251-1/+1
|\ \ \
| * | | fix typo [ci-skip]Robert Krzyzanowski2015-02-251-1/+1
|/ / /
* | | cache quoted column names in SQLite3Aaron Patterson2015-02-241-1/+2
* | | Merge pull request #19068 from pda/ar-translate-exception-class-no-logAaron Patterson2015-02-241-1/+0
|\ \ \
| * | | AR: translate_exception_class() no longer logs error.Paul Annesley2015-02-241-1/+0
* | | | Merge pull request #18936 from arthurnn/txn_callbacksArthur Nogueira Neves2015-02-244-4/+105
|\ \ \ \
| * | | | Rename testsArthur Neves2015-02-241-4/+4
| * | | | Add before_commitArthur Neves2015-02-244-4/+28
| * | | | Add transaction callbacks that wont enroll to the transaction.Arthur Neves2015-02-242-2/+79
* | | | | Merge pull request #17426 from jpcody/fixture_associations_fixAaron Patterson2015-02-242-1/+23
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Rely on through table name in has_many fixturesJoshua Cody2014-10-292-1/+23
* | | | | Add a failing test demonstrating regression with HEAD requests to Rack apps, ...Jeremy Kemper2015-02-241-3/+9
* | | | | Tiny documentation edits [ci skip]Robin Dupret2015-02-243-5/+4
* | | | | Call `attributes_for_update` in `_update_record` w/ optimistic lockingSean Griffin2015-02-241-1/+1
* | | | | Fix c479480638508c20601af69ca46b5b606c2d5b4d to account for from_value -> fro...Jeremy Kemper2015-02-241-1/+1
* | | | | Merge pull request #18744 from mfazekas/no-table-name-with-fromRafael Mendonça França2015-02-242-5/+20
* | | | | Merge pull request #19066 from courtenay/mysql_boolean_limit_19065Rafael Mendonça França2015-02-242-0/+6
|\ \ \ \ \
| * | | | | Fix mysql's schema.rb dumper so it does not include limit on emulated boolean...Court3nay2015-02-242-0/+6
|/ / / / /
* | | | | Merge pull request #19055 from ianks/model_name.to_jsonRafael Mendonça França2015-02-242-1/+5
|\ \ \ \ \
| * | | | | activemodel: make .model_name json encodableIan Ker-Seymer2015-02-242-1/+5
* | | | | | Use other controller instead of sharing the controllerRafael Mendonça França2015-02-241-18/+17
|/ / / / /
* | | | | Make TestController available to all test classesRafael Mendonça França2015-02-241-16/+16
* | | | | Merge pull request #19060 from iainbeeston/deprecate-skip-action-callbackRafael Mendonça França2015-02-243-2/+28
|\ \ \ \ \
| * | | | | Deprecate `AbstractController::Callbacks#skip_action_callback`Iain Beeston2015-02-243-2/+28
* | | | | | rework `disable_referential_integrity` for PostgreSQL.Yves Senn2015-02-243-9/+136
* | | | | | Merge pull request #19064 from kamipo/remove_unused_tableRafael Mendonça França2015-02-241-10/+0
|\ \ \ \ \ \
| * | | | | | Remove unused tableRyuta Kamizono2015-02-251-10/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #19062 from kamipo/move_back_new_column_definition_into_ta...Rafael Mendonça França2015-02-241-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Move back `new_column_definition` into `TableDefinition`Ryuta Kamizono2015-02-251-4/+4
|/ / / / /
* | | | | Avoid creating an extra hash on the job test adapterCarlos Antonio da Silva2015-02-241-1/+1
* | | | | Merge pull request #19052 from square/testing-singletonRafael Mendonça França2015-02-234-31/+31
|\ \ \ \ \
| * | | | | `ActiveJob::QueueAdapters::TestAdapter` is now a singletonTamir Duberstein2015-02-234-31/+31
* | | | | | Merge pull request #19030 from kamipo/extract_short_hand_column_methodsRafael Mendonça França2015-02-234-110/+173
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | The short-hand methods should be able to define multiple columnsRyuta Kamizono2015-02-232-45/+69
| * | | | | Extract the short-hand methods into `ColumnMethods`Ryuta Kamizono2015-02-232-23/+36
| * | | | | Extract `primary_key` method into `ColumnMethods`Ryuta Kamizono2015-02-224-42/+68
* | | | | | Merge pull request #19038 from tchandy/cleaning_actionpack_testsSantiago Pastorino2015-02-234-41/+3
|\ \ \ \ \ \
| * | | | | | Removing old helper that was necessary for compatibility with Ruby 1.8.xThiago Pradi2015-02-223-18/+3
| * | | | | | Removing unused constants from abstract_unitThiago Pradi2015-02-221-2/+0
| * | | | | | Removing unused controller from abstract_unitThiago Pradi2015-02-221-16/+0