aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16363 from arthurnn/null_transactionRafael Mendonça França2014-07-312-70/+67
|\
| * Replace ClosedTransaction with NullTransactionArthur Neves2014-07-312-8/+5
| * Move TransactionManager to bottom of classArthur Neves2014-07-311-67/+67
|/
* Merge pull request #16341 from arthurnn/transactions_remove_beginRafael Mendonça França2014-07-312-56/+20
|\
| * Make ClosedTransaction a null objectArthur Neves2014-07-311-16/+6
| * Remove parent on Transaction objectArthur Neves2014-07-311-16/+9
| * Remove being/number methods from transaction classArthur Neves2014-07-312-29/+10
* | invert check so we fail fasterAaron Patterson2014-07-311-1/+1
* | do a hash lookup for collision detectionAaron Patterson2014-07-312-1/+5
* | Merge pull request #16350 from JackDanger/test-rake-db-migrate-taskRafael Mendonça França2014-07-313-4/+24
|\ \
| * | Add ActiveRecord::Tasks::DatabaseTasks.migrateJack Danger Canty2014-07-313-4/+24
* | | Merge pull request #16361 from JackDanger/clearer-connection-pool-documentationRafael Mendonça França2014-07-311-15/+36
|\ \ \
| * | | Clarify how the ConnectionHandler worksJack Danger Canty2014-07-311-15/+36
* | | | Merge pull request #16353 from eileencodes/refactor-join_keys-usage-in-reflec...Rafael Mendonça França2014-07-312-29/+29
|\ \ \ \
| * | | | Refactor join_keys to remove complex conditionalseileencodes2014-07-312-29/+29
* | | | | Realign assignments :scissors:Carlos Antonio da Silva2014-07-311-5/+5
* | | | | Do not reassign variable when mutation is happeningCarlos Antonio da Silva2014-07-311-8/+5
* | | | | Only concatenate path if it was given rather than converting blindlyCarlos Antonio da Silva2014-07-311-1/+1
* | | | | Rename variable to better show its intentCarlos Antonio da Silva2014-07-311-12/+12
* | | | | Simplify conditionalCarlos Antonio da Silva2014-07-311-3/+2
* | | | | Push options check up so we can simplify internal methodsCarlos Antonio da Silva2014-07-311-13/+10
|/ / / /
* | | | Merge pull request #16351 from eileencodes/finish-refactoring-macro-to-elimin...Rafael Mendonça França2014-07-313-11/+9
|\ \ \ \
| * | | | Redefine macro checks for reflectionseileencodes2014-07-303-11/+9
* | | | | Simplify code branch, remove #tapCarlos Antonio da Silva2014-07-311-7/+6
* | | | | Avoid a new hash objectCarlos Antonio da Silva2014-07-311-1/+1
* | | | | Fix assertion arguments orderCarlos Antonio da Silva2014-07-311-1/+1
* | | | | Avoid creating an extra hashCarlos Antonio da Silva2014-07-311-2/+2
* | | | | Remove unnecessary call to #tapCarlos Antonio da Silva2014-07-311-5/+3
* | | | | Merge pull request #16356 from gchan/add-hwia-testsYves Senn2014-07-311-0/+12
|\ \ \ \ \
| * | | | | Add tests to ensure default proc is used when `HashWithIndifferentAccess' is ...Gordon Chan2014-07-311-0/+12
* | | | | | Merge pull request #16355 from xaviershay/validate-in-groups-of-argsAaron Patterson2014-07-302-0/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Raise a descriptive error if non-positive integer passed to in_groups_of.Xavier Shay2014-07-302-0/+11
|/ / / / /
* | | | | Properly assert for the expected messagesCarlos Antonio da Silva2014-07-301-4/+8
* | | | | Avoid defining the test if it does not need to when not on JRubyCarlos Antonio da Silva2014-07-301-2/+2
* | | | | Use default argument when testing generators without the need for extra argsCarlos Antonio da Silva2014-07-302-7/+7
* | | | | Simplify path setupCarlos Antonio da Silva2014-07-301-1/+1
* | | | | Simplify plugin tests a bit, leave the regexp work for minitestCarlos Antonio da Silva2014-07-301-6/+6
* | | | | Invert unless..else conditions on JRuby checksCarlos Antonio da Silva2014-07-302-12/+12
* | | | | Merge pull request #16352 from gchan/remove-unnecessary-convert-keyCarlos Antonio da Silva2014-07-301-2/+2
|\ \ \ \ \
| * | | | | Removed unnecessary call to 'convert_key' in 'HashWithIndifferentAccess#to_hash'Gordon Chan2014-07-311-2/+2
* | | | | | Remove some more globals from testsCarlos Antonio da Silva2014-07-301-26/+26
* | | | | | Fix / improve some assertionsCarlos Antonio da Silva2014-07-301-6/+4
* | | | | | Remove some globals from configuration testsCarlos Antonio da Silva2014-07-301-20/+20
* | | | | | remove useless deupAaron Patterson2014-07-301-1/+1
* | | | | | push options inside the scope objectAaron Patterson2014-07-301-4/+9
* | | | | | turn scope in to a linked listAaron Patterson2014-07-301-15/+36
| |/ / / / |/| | | |
* | | | | don't access named routes internalsAaron Patterson2014-07-301-1/+1
| |/ / / |/| | |
* | | | remove alias_method_chainAaron Patterson2014-07-301-4/+2
* | | | avoid instrospection on the moduleAaron Patterson2014-07-301-1/+2
* | | | fix variable nameAaron Patterson2014-07-301-3/+3