Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Generating stubs for helper tests is overly specific. Most helpers should ↵ | David Heinemeier Hansson | 2014-08-03 | 4 | -75/+0 | |
|/ / / / | | | | | | | | | | | | | simply be tested as part of the view thats using them. If you need something beyond that, you can add a test yourself for them | |||||
* | | | | Merge pull request #16306 from aditya-kapoor/add-docs-for-uglifier | Zachary Scott | 2014-08-02 | 1 | -8/+9 | |
|\ \ \ \ | | | | | | | | | | | [ci skip] add tip for uglifier in execjs error | |||||
| * | | | | [ci skip] add tip for uglifier in execjs error | Aditya Kapoor | 2014-08-03 | 1 | -8/+9 | |
| | | | | | ||||||
* | | | | | Merge pull request #16380 from y-yagi/patch-1 | Richard Schneeman | 2014-08-02 | 1 | -1/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Remove "Machinist" from testing guide | |||||
| * | | | | | [ci skip] Remove "Machinist" from testing guide | yuuji.yaginuma | 2014-08-03 | 1 | -1/+0 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #16378 from ↵ | Rafael Mendonça França | 2014-08-02 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | JackDanger/doc-fix-in-join-association-build_constraint [doc] updating documented parameter for build_constraint | |||||
| * | | | | | updating documented parameter for build_constraint | Jack Danger Canty | 2014-08-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates documentation in line with changes made in 743b67508e2027e1d086142ccbec47a19fc943f6 | |||||
* | | | | | | Merge pull request #16377 from JackDanger/doc-fix-in-association-reflection | Eileen M. Uchitelle | 2014-08-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Fixes small error in ActiveRecord::Reflection docs | |||||
| * | | | | | Fixes small error in ActiveRecord::Reflection docs | Jack Danger Canty | 2014-07-31 | 1 | -1/+1 | |
| |/ / / / | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | [ci skip] fix markdown | schneems | 2014-08-02 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #16374 from rajcybage/consistency_minitest | Rafael Mendonça França | 2014-08-02 | 2 | -3/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | rename MiniTest to Minitest | |||||
| * | | | | | rename MiniTest to Minitest | Rajarshi Das | 2014-08-02 | 2 | -3/+3 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #16373 from eileencodes/deprecate-reflection-source_macro | Rafael Mendonça França | 2014-08-02 | 2 | -1/+15 | |
|\ \ \ \ \ | | | | | | | | | | | | | Deprecate source_macro | |||||
| * | | | | | Deprecate source_macro | eileencodes | 2014-08-02 | 2 | -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/docrails | Vijay Dev | 2014-08-02 | 4 | -30/+11 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/testing.md | |||||
| * | | | | | copy edits[ci skip] | Vijay Dev | 2014-08-02 | 1 | -3/+1 | |
| | | | | | | ||||||
| * | | | | | [ci skip] Normalize all localhost linking. | Juanito Fatas | 2014-07-20 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Performed Returns true if redirect/render has happened | Gaurish Sharma | 2014-07-19 | 1 | -1/+4 | |
| | | | | | | ||||||
| * | | | | | [ci skip] Remove duplicated last! section. | Juanito Fatas | 2014-07-16 | 1 | -17/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: https://github.com/rails/rails/commit/d4fd0bd17709735ac91e434c94fe99429f078c6e cc @schneems | |||||
| * | | | | | [ci skip] Use appropriate mailer syntax. | Juanito Fatas | 2014-07-16 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Reference: https://github.com/rails/rails/commit/f7e4362011ceb1317fd401125d48d7ccb9a1079c | |||||
| * | | | | | Add link to minitest rdoc & github | Gaurish Sharma | 2014-07-13 | 1 | -1/+3 | |
| | | | | | | ||||||
* | | | | | | just set the host, no need for another hash allocation / merge! | Aaron Patterson | 2014-08-01 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | always return a string from find_script_name | Aaron Patterson | 2014-08-01 | 2 | -7/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | this allows us to avoid nil checks on the return value | |||||
* | | | | | | Rename tests too | Rafael Mendonça França | 2014-08-01 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Rename Object#self to Object#itself to have parity with matz sanctioned ↵ | David Heinemeier Hansson | 2014-08-01 | 4 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | method name for Ruby 2.2 | |||||
* | | | | | | Added Object#self which returns the object itself | David Heinemeier Hansson | 2014-08-01 | 4 | -0/+26 | |
| | | | | | | ||||||
* | | | | | | Use available method rather than macro name checking | Carlos Antonio da Silva | 2014-07-31 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Rename method for clarity | Carlos Antonio da Silva | 2014-07-31 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Ruby generally does not use the is_* prefix on predicate methods. | |||||
* | | | | | | use `get` instead of accessing the named routes internals | Aaron Patterson | 2014-07-31 | 1 | -1/+1 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge pull request #16363 from arthurnn/null_transaction | Rafael Mendonça França | 2014-07-31 | 2 | -70/+67 | |
|\ \ \ \ \ | | | | | | | | | | | | | Null transaction | |||||
| * | | | | | Replace ClosedTransaction with NullTransaction | Arthur Neves | 2014-07-31 | 2 | -8/+5 | |
| | | | | | | ||||||
| * | | | | | Move TransactionManager to bottom of class | Arthur Neves | 2014-07-31 | 1 | -67/+67 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #16341 from arthurnn/transactions_remove_begin | Rafael Mendonça França | 2014-07-31 | 2 | -56/+20 | |
|\ \ \ \ \ | | | | | | | | | | | | | Transactions refactoring - 2 | |||||
| * | | | | | Make ClosedTransaction a null object | Arthur Neves | 2014-07-31 | 1 | -16/+6 | |
| | | | | | | ||||||
| * | | | | | Remove parent on Transaction object | Arthur Neves | 2014-07-31 | 1 | -16/+9 | |
| | | | | | | ||||||
| * | | | | | Remove being/number methods from transaction class | Arthur Neves | 2014-07-31 | 2 | -29/+10 | |
| | | | | | | ||||||
* | | | | | | invert check so we fail faster | Aaron Patterson | 2014-07-31 | 1 | -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 detection | Aaron Patterson | 2014-07-31 | 2 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | hash lookup should be faster than searching an array. | |||||
* | | | | | | Merge pull request #16350 from JackDanger/test-rake-db-migrate-task | Rafael Mendonça França | 2014-07-31 | 3 | -4/+24 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add ActiveRecord::Tasks::DatabaseTasks.migrate | |||||
| * | | | | | | Add ActiveRecord::Tasks::DatabaseTasks.migrate | Jack Danger Canty | 2014-07-31 | 3 | -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-documentation | Rafael Mendonça França | 2014-07-31 | 1 | -15/+36 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [doc] Clarify how the ConnectionHandler works | |||||
| * | | | | | | | Clarify how the ConnectionHandler works | Jack Danger Canty | 2014-07-31 | 1 | -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ça | 2014-07-31 | 2 | -29/+29 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eileencodes/refactor-join_keys-usage-in-reflection Refactor join_keys to remove complex conditionals | |||||
| * | | | | | | | Refactor join_keys to remove complex conditionals | eileencodes | 2014-07-31 | 2 | -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 Silva | 2014-07-31 | 1 | -5/+5 | |
| | | | | | | | ||||||
* | | | | | | | Do not reassign variable when mutation is happening | Carlos Antonio da Silva | 2014-07-31 | 1 | -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 blindly | Carlos Antonio da Silva | 2014-07-31 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Rename variable to better show its intent | Carlos Antonio da Silva | 2014-07-31 | 1 | -12/+12 | |
| | | | | | | | ||||||
* | | | | | | | Simplify conditional | Carlos Antonio da Silva | 2014-07-31 | 1 | -3/+2 | |
| | | | | | | | ||||||
* | | | | | | | Push options check up so we can simplify internal methods | Carlos Antonio da Silva | 2014-07-31 | 1 | -13/+10 | |
|/ / / / / / |