Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | get the Action Mailer guide ready. [ci skip] | Yves Senn | 2013-04-09 | 2 | -118/+238 |
| | |||||
* | Merge pull request #10130 from Agis-/patch-2 | Carlos Antonio da Silva | 2013-04-08 | 1 | -3/+3 |
|\ | | | | | Mark unused block parameters. | ||||
| * | Remove unused block parameters | Agis Anastasopoulos | 2013-04-07 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #10131 from Agis-/metal_helper | Carlos Antonio da Silva | 2013-04-08 | 1 | -1/+0 |
|\ \ | |/ |/| | Remove unecessary variable call since `sort!` always returns the sorted array | ||||
| * | Remove unecessary variable call, `#sort!` always returns an array | Agis Anastasopoulos | 2013-04-07 | 1 | -1/+0 |
|/ | |||||
* | Minor AR changelog improvements [ci skip] | Carlos Antonio da Silva | 2013-04-07 | 1 | -4/+3 |
| | |||||
* | Avoid iterating over records hash when not necessary | Carlos Antonio da Silva | 2013-04-07 | 1 | -2/+6 |
| | | | | | | If the reflection scope is not flagged with distinct value, there is no need to iterate over the records, so we avoid that by doing the check before iterating rather than inside the iteration block. | ||||
* | Merge pull request #10127 from vipulnsward/each_to_each_value | Carlos Antonio da Silva | 2013-04-07 | 2 | -3/+3 |
|\ | | | | | each to each_value; remove unused vars | ||||
| * | each to each_value; remove unused vars | Vipul A M | 2013-04-07 | 2 | -3/+3 |
|/ | |||||
* | Merge pull request #10123 from ↵ | Carlos Antonio da Silva | 2013-04-06 | 1 | -3/+3 |
|\ | | | | | | | | | wangjohn/added_bang_to_raise_nested_attributes_method Added a bang to the raise_nested_attributes_record_not_found method | ||||
| * | Added a bang to the end of +raise_nested_attributes_record_not_found+ | wangjohn | 2013-04-06 | 1 | -3/+3 |
|/ | | | | method to signify an exception possibly being raised. | ||||
* | Merge pull request #10101 from wangjohn/refactoring_routing_mapper | Andrew White | 2013-04-06 | 1 | -12/+13 |
|\ | | | | | Refactoring some reused code into a method (inside of the routes mapper) | ||||
| * | Refactoring some reused code into a method (inside of the routes | wangjohn | 2013-04-05 | 1 | -12/+13 |
| | | | | | | | | mapper) and adding a constant for all the possible scopes. | ||||
* | | Forgot to lock the uglifier version in our Gemfile | Rafael Mendonça França | 2013-04-06 | 1 | -1/+1 |
| | | | | | | | | Related with 575838795019f7402992e3bfa83a0c5048cf143d | ||||
* | | Merge pull request #10121 from Agis-/patch-2 | Rafael Mendonça França | 2013-04-06 | 1 | -1/+1 |
|\ \ | | | | | | | Fix markdown formatting | ||||
| * | | Fix markdown formatting | Agis Anastasopoulos | 2013-04-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #10120 from vipulnsward/change_merge_on_new_hash | Rafael Mendonça França | 2013-04-06 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | change some more merge to merge! on new hashes | ||||
| * | | change some more merge to merge! on new hashes | Vipul A M | 2013-04-06 | 1 | -3/+3 |
| | | | |||||
* | | | sprockets 2.9.x doesn't work with uglifier 2.0 yet. | Rafael Mendonça França | 2013-04-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | See https://travis-ci.org/rails/rails/jobs/6110543#L1285 for the failure cc @josh | ||||
* | | | Merge pull request #10113 from Agis-/default_scopes_predicate | Rafael Mendonça França | 2013-04-06 | 6 | -6/+35 |
|\ \ \ | |/ / |/| | | | | | | | | Deprecate ActiveRecord#Base.default_scopes? Closes #10107 | ||||
| * | | Deprecate ActiveRecord#Base.default_scopes? | Agis- | 2013-04-06 | 2 | -1/+15 |
| | | | | | | | | | | | | See #10107. | ||||
| * | | Add option to Class#class_attribute for skipping the query method | Agis- | 2013-04-06 | 4 | -5/+20 |
|/ / | |||||
* | | Bring back ActiveRecord::Base#connection_handler removed by mistake on b37399ab | Rafael Mendonça França | 2013-04-06 | 1 | -0/+4 |
| | | |||||
* | | Merge pull request #10118 from vipulnsward/remove_unused_var_task | Carlos Antonio da Silva | 2013-04-06 | 2 | -2/+1 |
|\ \ | | | | | | | remove unused variables | ||||
| * | | remove unused variables | Vipul A M | 2013-04-06 | 2 | -2/+1 |
| | | | |||||
* | | | `fast_xs` support has been removed. Use 'String#encode(xml: :attr)`. | Aaron Patterson | 2013-04-05 | 3 | -19/+2 |
|/ / | |||||
* | | updating the guide | Aaron Patterson | 2013-04-05 | 1 | -5/+5 |
| | | |||||
* | | add integration test for shorthand rake tests | Aaron Patterson | 2013-04-05 | 1 | -0/+7 |
| | | |||||
* | | rake test app/model/foo.rb and rake test models/foo works | Aaron Patterson | 2013-04-05 | 2 | -3/+47 |
| | | |||||
* | | extract test info from the command line and set up the test task | Aaron Patterson | 2013-04-05 | 2 | -5/+28 |
| | | |||||
* | | add a class for splitting up rake commands | Aaron Patterson | 2013-04-05 | 2 | -0/+70 |
| | | |||||
* | | just use ruby to run tests | Aaron Patterson | 2013-04-05 | 1 | -4/+4 |
| | | |||||
* | | removing `rails test`, updating docs to show how to use `rake test` | Aaron Patterson | 2013-04-05 | 5 | -194/+19 |
| | | |||||
* | | Merge pull request #10111 from Agis-/patch-1 | Carlos Antonio da Silva | 2013-04-05 | 1 | -4/+4 |
|\ \ | | | | | | | Remove extra whitespace | ||||
| * | | Remove extra whitespace | Agis Anastasopoulos | 2013-04-06 | 1 | -4/+4 |
| | | | |||||
* | | | Update Rake tasks to call `rails test` instead | Prem Sichanugrist | 2013-04-05 | 1 | -7/+10 |
|/ / | | | | | | | | | | | | | | | | | Also, print out deprecation warning for other rake tasks except `rake test` and `rake` (default) Conflicts: railties/lib/rails/test_unit/testing.rake railties/test/application/rake_test.rb | ||||
* | | Merge branch 'railstest' | Aaron Patterson | 2013-04-05 | 7 | -92/+95 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * railstest: do not blow away the test database on every run just check pending migrations in the current environment check pending migrations against the test db only match the default task test no longer makes sense after requiring all test files switch the testing tests to use rake a test file can be provided to rake, e.g.: switch to Rails::TestTask default task should also be in the test env ensure the schema checking is done in the dev connection Revert "Update Rake tasks to call `rails test` instead" Revert "Warning removed unused variable task_name" apps that depend on active record should load fixtures | ||||
| * \ | Merge branch 'master' into railstest | Aaron Patterson | 2013-04-05 | 49 | -94/+345 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (44 commits) Improve the changelog entry [ci skip] Fix explicit names on multiple file fields Correctly parse bigint defaults in PostgreSQL Move changelog to the top [ci skip] Fix indent and remove extra white spaces Fix scope chaining + STI failing test for #9869 Improve `belongs_to touch: true` timestamp test Sort modules in alphabetical order. Avoid an attempt to fetch old record when id was not present in touch callback Use the correct pk field from the reflected class to find the old record Refactor mail_to to not generate intermediate hashes when adding href Ensure mail_to helper does not modify the given html options hash Use inspect when writing the foreign key from the reflection Use a space after the comment sign when showing the result of commands Exclude template files for rdoc API [ci skip] template should have generic name use | to have more intent revealing code Revert "Merge pull request #10034 from benofsky/fix_skipping_object_callback_filters" stop depending on callbacks ... Conflicts: railties/test/application/rake_test.rb | ||||
| * | | | do not blow away the test database on every run | Aaron Patterson | 2013-04-05 | 1 | -10/+0 |
| | | | | |||||
| * | | | just check pending migrations in the current environment | Aaron Patterson | 2013-04-05 | 1 | -2/+2 |
| | | | | |||||
| * | | | check pending migrations against the test db | Aaron Patterson | 2013-04-03 | 2 | -26/+4 |
| | | | | |||||
| * | | | only match the default task | Aaron Patterson | 2013-04-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | test no longer makes sense after requiring all test files | Aaron Patterson | 2013-04-03 | 1 | -23/+1 |
| | | | | |||||
| * | | | switch the testing tests to use rake | Aaron Patterson | 2013-04-03 | 1 | -20/+23 |
| | | | | |||||
| * | | | a test file can be provided to rake, e.g.: | Aaron Patterson | 2013-04-03 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | rake test path/to/test.rb | ||||
| * | | | switch to Rails::TestTask | Aaron Patterson | 2013-04-03 | 2 | -25/+34 |
| | | | | |||||
| * | | | default task should also be in the test env | Aaron Patterson | 2013-04-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | ensure the schema checking is done in the dev connection | Aaron Patterson | 2013-04-03 | 1 | -0/+8 |
| | | | | |||||
| * | | | Revert "Update Rake tasks to call `rails test` instead" | Aaron Patterson | 2013-04-03 | 2 | -41/+62 |
| | | | | | | | | | | | | | | | | This reverts commit b51673fbd9563bd3ffa22e22255ca1cef80cfb6d. | ||||
| * | | | Revert "Warning removed unused variable task_name" | Aaron Patterson | 2013-04-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | This reverts commit 106e15927f0dd8060fc37eff44b823a92fa94bd2. |