aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #16378 from ↵Rafael Mendonça França2014-08-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | JackDanger/doc-fix-in-join-association-build_constraint [doc] updating documented parameter for build_constraint
| * | | | | updating documented parameter for build_constraintJack Danger Canty2014-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates documentation in line with changes made in 743b67508e2027e1d086142ccbec47a19fc943f6
* | | | | | Merge pull request #16377 from JackDanger/doc-fix-in-association-reflectionEileen M. Uchitelle2014-08-021-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fixes small error in ActiveRecord::Reflection docs
| * | | | | Fixes small error in ActiveRecord::Reflection docsJack Danger Canty2014-07-311-1/+1
| |/ / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | [ci skip] fix markdownschneems2014-08-021-1/+1
| | | | |
* | | | | Merge pull request #16374 from rajcybage/consistency_minitestRafael Mendonça França2014-08-022-3/+3
|\ \ \ \ \ | | | | | | | | | | | | rename MiniTest to Minitest
| * | | | | rename MiniTest to MinitestRajarshi Das2014-08-022-3/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #16373 from eileencodes/deprecate-reflection-source_macroRafael Mendonça França2014-08-022-1/+15
|\ \ \ \ \ | | | | | | | | | | | | Deprecate source_macro
| * | | | | Deprecate source_macroeileencodes2014-08-022-1/+15
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | `source_macro` is no longer used in any ActiveRecord code. I've chosen to deprecate it because it was not marked as nodoc and may be in use outside of rails source.
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-024-30/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/testing.md
| * | | | | copy edits[ci skip]Vijay Dev2014-08-021-3/+1
| | | | | |
| * | | | | [ci skip] Normalize all localhost linking.Juanito Fatas2014-07-201-2/+2
| | | | | |
| * | | | | Performed Returns true if redirect/render has happenedGaurish Sharma2014-07-191-1/+4
| | | | | |
| * | | | | [ci skip] Remove duplicated last! section.Juanito Fatas2014-07-161-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: https://github.com/rails/rails/commit/d4fd0bd17709735ac91e434c94fe99429f078c6e cc @schneems
| * | | | | [ci skip] Use appropriate mailer syntax.Juanito Fatas2014-07-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reference: https://github.com/rails/rails/commit/f7e4362011ceb1317fd401125d48d7ccb9a1079c
| * | | | | Add link to minitest rdoc & githubGaurish Sharma2014-07-131-1/+3
| | | | | |
* | | | | | just set the host, no need for another hash allocation / merge!Aaron Patterson2014-08-011-1/+1
| | | | | |
* | | | | | always return a string from find_script_nameAaron Patterson2014-08-012-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | this allows us to avoid nil checks on the return value
* | | | | | Rename tests tooRafael Mendonça França2014-08-011-2/+2
| | | | | |
* | | | | | Rename Object#self to Object#itself to have parity with matz sanctioned ↵David Heinemeier Hansson2014-08-014-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | method name for Ruby 2.2
* | | | | | Added Object#self which returns the object itselfDavid Heinemeier Hansson2014-08-014-0/+26
| | | | | |
* | | | | | Use available method rather than macro name checkingCarlos Antonio da Silva2014-07-311-1/+1
| | | | | |
* | | | | | Rename method for clarityCarlos Antonio da Silva2014-07-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Ruby generally does not use the is_* prefix on predicate methods.
* | | | | | use `get` instead of accessing the named routes internalsAaron Patterson2014-07-311-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #16363 from arthurnn/null_transactionRafael Mendonça França2014-07-312-70/+67
|\ \ \ \ \ | | | | | | | | | | | | Null transaction
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Transactions refactoring - 2
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there's no reason to to_sym the string if it doesn't match the regexp anyway
* | | | | | do a hash lookup for collision detectionAaron Patterson2014-07-312-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | hash lookup should be faster than searching an array.
* | | | | | Merge pull request #16350 from JackDanger/test-rake-db-migrate-taskRafael Mendonça França2014-07-313-4/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add ActiveRecord::Tasks::DatabaseTasks.migrate
| * | | | | | Add ActiveRecord::Tasks::DatabaseTasks.migrateJack Danger Canty2014-07-313-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extracts the logic that was embedded in a Rake task into a static method. Bonus: the first test for `rake db:migrate`
* | | | | | | Merge pull request #16361 from JackDanger/clearer-connection-pool-documentationRafael Mendonça França2014-07-311-15/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [doc] Clarify how the ConnectionHandler works
| * | | | | | | Clarify how the ConnectionHandler worksJack Danger Canty2014-07-311-15/+36
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the implicit description of how connection pooling works a little more explicit. It converts the examples of a model hierarchy into actual Ruby code and demonstrates how the key structure of the database.yml relates to the `establish_connection` method.
* | | | | | | Merge pull request #16353 from ↵Rafael Mendonça França2014-07-312-29/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eileencodes/refactor-join_keys-usage-in-reflection Refactor join_keys to remove complex conditionals
| * | | | | | | Refactor join_keys to remove complex conditionalseileencodes2014-07-312-29/+29
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pushing conditionals down to through reflection Only the through association needs the part of this conditional that deals with belongs to and polymorphic? so that can be pushed down into the ThroughReflection reducing the conditionals. Remove conditional because we can delegate join keys to source reflection Remove need for source_macro checking By adding join_id_for to the other reflections we remove the need to cehck against the source_macro and can reduce the conditioanl from the original join_id_for(owner) Using polymorphism instead of testing the source_macro This case statement in join_association is almost exactly the same as the original join_keys code. Testing taht theory by creating a new join_dependency_keys(assoc_klass) method. Refactor join_keys further to be more concise Fixed format of "#:nodoc:" to "# :nodoc:" where I added them to this file.
* | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods mutate the path variable/argument so there is no need to reassign it every time.
* | | | | | | 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 ↵Rafael Mendonça França2014-07-313-11/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | eileencodes/finish-refactoring-macro-to-eliminate-checking-against-symbols Redefine macro checks for reflections
| * | | | | | Redefine macro checks for reflectionseileencodes2014-07-303-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we define the macro on the reflection type we no longer need to check `macro == :what` on each type for `belongs_to?` or `has_one?` etc. These now default to false unless it's defined in the reflection class. Reuse existing belongs_to? method to check macros We don't need to do `:belongs_to == macro` anymore becasue we have a `belongs_to?` method. I didn't find this being used anywhere for `has_one?` or `collection?` since they were already fixed.
* | | | | | | 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
| | | | | | |