aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Grouping thread locals in the ActiveRecord scopes so that thewangjohn2013-04-083-6/+57
| | | | | current_scope and ignore_default_scope locals are brought together under a registry object.
* Merge pull request #9604 from sgrif/live_streaming_exceptionsRafael Mendonça França2013-04-082-1/+103
|\ | | | | Exceptions raised when using ActionController::Live cause server crash
| * Exception handling for controllers using ActionController::LiveSean Griffin2013-03-182-1/+103
| | | | | | | | | | | | | | | | | | Any exceptions that occured at the view or controller level for a controller using ActionController::Live would cause the server to either hang with an open socket indefinitely, or immediately crash (depending on whether the server was launched with rails s or directly). Changed the behavior of exceptions to act the same as streaming templates for html requests, and allow for an on_error callback if needed.
* | Merge pull request #10122 from wangjohn/adding_documentation_to_form_builderRafael Mendonça França2013-04-081-2/+55
|\ \ | | | | | | | | | | | | Added documentation to the FormBuilder class Closes #10115
| * | Added documentation to the FormBuilder class, should helpwangjohn2013-04-061-2/+55
| | | | | | | | | | | | | | | clarify issue #10115. Also made the field_helpers an explicit list of methods.
* | | Merge pull request #10130 from Agis-/patch-2Carlos Antonio da Silva2013-04-081-3/+3
|\ \ \ | | | | | | | | Mark unused block parameters.
| * | | Remove unused block parametersAgis Anastasopoulos2013-04-071-3/+3
| | | |
* | | | Merge pull request #10131 from Agis-/metal_helperCarlos Antonio da Silva2013-04-081-1/+0
|\ \ \ \ | |/ / / |/| | | Remove unecessary variable call since `sort!` always returns the sorted array
| * | | Remove unecessary variable call, `#sort!` always returns an arrayAgis Anastasopoulos2013-04-071-1/+0
|/ / /
* | | Minor AR changelog improvements [ci skip]Carlos Antonio da Silva2013-04-071-4/+3
| | |
* | | Avoid iterating over records hash when not necessaryCarlos Antonio da Silva2013-04-071-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_valueCarlos Antonio da Silva2013-04-072-3/+3
|\ \ \ | | | | | | | | each to each_value; remove unused vars
| * | | each to each_value; remove unused varsVipul A M2013-04-072-3/+3
|/ / /
* | | Merge pull request #10123 from ↵Carlos Antonio da Silva2013-04-061-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+wangjohn2013-04-061-3/+3
|/ / | | | | | | method to signify an exception possibly being raised.
* | Merge pull request #10101 from wangjohn/refactoring_routing_mapperAndrew White2013-04-061-12/+13
|\ \ | | | | | | Refactoring some reused code into a method (inside of the routes mapper)
| * | Refactoring some reused code into a method (inside of the routeswangjohn2013-04-051-12/+13
| | | | | | | | | | | | mapper) and adding a constant for all the possible scopes.
* | | Forgot to lock the uglifier version in our GemfileRafael Mendonça França2013-04-061-1/+1
| | | | | | | | | | | | Related with 575838795019f7402992e3bfa83a0c5048cf143d
* | | Merge pull request #10121 from Agis-/patch-2Rafael Mendonça França2013-04-061-1/+1
|\ \ \ | | | | | | | | Fix markdown formatting
| * | | Fix markdown formattingAgis Anastasopoulos2013-04-061-1/+1
| | | |
* | | | Merge pull request #10120 from vipulnsward/change_merge_on_new_hashRafael Mendonça França2013-04-061-3/+3
|\ \ \ \ | |/ / / |/| | | change some more merge to merge! on new hashes
| * | | change some more merge to merge! on new hashesVipul A M2013-04-061-3/+3
| | | |
* | | | sprockets 2.9.x doesn't work with uglifier 2.0 yet.Rafael Mendonça França2013-04-061-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_predicateRafael Mendonça França2013-04-066-6/+35
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Deprecate ActiveRecord#Base.default_scopes? Closes #10107
| * | | Deprecate ActiveRecord#Base.default_scopes?Agis-2013-04-062-1/+15
| | | | | | | | | | | | | | | | See #10107.
| * | | Add option to Class#class_attribute for skipping the query methodAgis-2013-04-064-5/+20
|/ / /
* | | Bring back ActiveRecord::Base#connection_handler removed by mistake on b37399abRafael Mendonça França2013-04-061-0/+4
| | |
* | | Merge pull request #10118 from vipulnsward/remove_unused_var_taskCarlos Antonio da Silva2013-04-062-2/+1
|\ \ \ | | | | | | | | remove unused variables
| * | | remove unused variablesVipul A M2013-04-062-2/+1
| | | |
* | | | `fast_xs` support has been removed. Use 'String#encode(xml: :attr)`.Aaron Patterson2013-04-053-19/+2
|/ / /
* | | updating the guideAaron Patterson2013-04-051-5/+5
| | |
* | | add integration test for shorthand rake testsAaron Patterson2013-04-051-0/+7
| | |
* | | rake test app/model/foo.rb and rake test models/foo worksAaron Patterson2013-04-052-3/+47
| | |
* | | extract test info from the command line and set up the test taskAaron Patterson2013-04-052-5/+28
| | |
* | | add a class for splitting up rake commandsAaron Patterson2013-04-052-0/+70
| | |
* | | just use ruby to run testsAaron Patterson2013-04-051-4/+4
| | |
* | | removing `rails test`, updating docs to show how to use `rake test`Aaron Patterson2013-04-055-194/+19
| | |
* | | Merge pull request #10111 from Agis-/patch-1Carlos Antonio da Silva2013-04-051-4/+4
|\ \ \ | | | | | | | | Remove extra whitespace
| * | | Remove extra whitespaceAgis Anastasopoulos2013-04-061-4/+4
| | | |
* | | | Update Rake tasks to call `rails test` insteadPrem Sichanugrist2013-04-051-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 Patterson2013-04-057-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 railstestAaron Patterson2013-04-0549-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 runAaron Patterson2013-04-051-10/+0
| | | | |
| * | | | just check pending migrations in the current environmentAaron Patterson2013-04-051-2/+2
| | | | |
| * | | | check pending migrations against the test dbAaron Patterson2013-04-032-26/+4
| | | | |
| * | | | only match the default taskAaron Patterson2013-04-031-1/+1
| | | | |
| * | | | test no longer makes sense after requiring all test filesAaron Patterson2013-04-031-23/+1
| | | | |
| * | | | switch the testing tests to use rakeAaron Patterson2013-04-031-20/+23
| | | | |
| * | | | a test file can be provided to rake, e.g.:Aaron Patterson2013-04-031-1/+10
| | | | | | | | | | | | | | | | | | | | rake test path/to/test.rb
| * | | | switch to Rails::TestTaskAaron Patterson2013-04-032-25/+34
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 09:24:38 +0000