aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18526 from vipulnsward/add-silence-streamRafael Mendonça França2015-02-059-150/+63
|\ | | | | Extracted silence_stream method to new module in activesupport/testing
| * - Extracted silence_stream method to new module in activesupport/testing.Vipul A M2015-01-209-150/+63
| | | | | | | | | | | | | | | | | | | | | | | | - Added include for the same in ActiveSupport::Test. - Removed occurrences of silence_stream being used elsewhere. - Reordered activesupport testcase requires alphabetically. - Removed require of silence stream from test_case - Moved quietly method to stream helper - Moved capture output to stream helper module and setup requires for the same elsewhere
* | Merge pull request #18771 from kirs/deprecate-xhrRafael Mendonça França2015-02-0510-119/+161
|\ \ | | | | | | Migrating xhr methods to keyword arguments syntax
| * | Migrating xhr methods to keyword arguments syntaxKir Shatrov2015-02-0110-119/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in `ActionController::TestCase` and `ActionDispatch::Integration` Old syntax: `xhr :get, :create, params: { id: 1 }` New syntax example: `get :create, params: { id: 1 }, xhr: true`
* | | Use keyword argumentsRafael Mendonça França2015-02-051-4/+4
| | | | | | | | | | | | | | | Also remove the default value since it will be always passed and Array(nil) returns an empty array
* | | Merge pull request #18747 from vipulnsward/merge-skip-callbackRafael Mendonça França2015-02-051-2/+2
|\ \ \ | | | | | | | | Rename AS::Callback#merge
| * | | Callback#merge merges options for a callback skip instead of a callback. ↵Vipul A M2015-02-011-2/+2
| | | | | | | | | | | | | | | | Renamed it to indicate what it actually does.
* | | | Do not run remove_connection in memory db testRafael Mendonça França2015-02-051-7/+7
| | | | | | | | | | | | | | | | This will make rake test_sqlite3_mem work again
* | | | Mark some methods as nodocRafael Mendonça França2015-02-051-6/+6
| | | | | | | | | | | | | | | | They are implementation details
* | | | Remove special case for symbols at findRafael Mendonça França2015-02-051-2/+0
| | | | | | | | | | | | | | | | Deprecated finders are not supported anymore
* | | | Merge branch 'rm-use-active-model-correctly'Rafael Mendonça França2015-02-056-28/+103
|\ \ \ \ | | | | | | | | | | | | | | | Closes #18646
| * | | | Rename method to make explicit its intentionRafael Mendonça França2015-02-053-3/+3
| | | | | | | | | | | | | | | | | | | | call is too generic
| * | | | Use kwags to make the argument meaning explicitRafael Mendonça França2015-02-053-6/+6
| | | | |
| * | | | Use new hash syntaxRafael Mendonça França2015-02-051-1/+1
| | | | |
| * | | | Change the method visibilityRafael Mendonça França2015-02-051-2/+4
| | | | | | | | | | | | | | | | | | | | Thse methods are used only inside this class
| * | | | Add tests to make sure label and placeholder respect to_modelRafael Mendonça França2015-02-052-0/+58
| | | | |
| * | | | Only check if object respond_to to_model onceRafael Mendonça França2015-02-051-6/+2
| | | | |
| * | | | placeholder doesn't exist inside this contextRafael Mendonça França2015-02-051-2/+2
| | | | |
| * | | | Merge pull request #18647 from mcls/placeholderable-to-modelRafael Mendonça França2015-02-054-28/+47
| |\ \ \ \ | | | | | | | | | | | | | | | | | | The `model_name` method should be called on `to_model`
| | * | | | Reduce duplication when generating translationsMaarten Claes2015-01-224-34/+47
| | | | | |
| | * | | | Convert with `to_model` before calling ActiveModel methods on `object`Maarten Claes2015-01-222-8/+14
| | | | | |
* | | | | | Force generated route to be insertedAndrew White2015-02-053-1/+10
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thor isn't very discerning over whether some content is present when passed to `inject_into_file`, e.g. a commented out route is detected as being present. So to prevent people scratching their heads as to why a route hasn't appeared it's better to fall on the side of having duplicate routes.
* | | | | Partial template name does no more have to be a valid Ruby identifierAkira Matsuda2015-02-065-16/+21
| | | | | | | | | | | | | | | | | | | | because the partial renderer would not create an lvar per each template since c67005f221f102fe2caca231027d9b11cf630484
* | | | | Merge pull request #18610 from amatsuda/privatize_config_accessorAkira Matsuda2015-02-063-0/+13
|\ \ \ \ \ | | | | | | | | | | | | config_accessor should better not be a public method, as with Ruby's attr_accessor
| * | | | | Privatize config_accessor as with attr_accessorAkira Matsuda2015-02-063-0/+13
|/ / / / /
* | | | | Move ruby-head to allowed failures [ci skip]Sean Griffin2015-02-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | We're about a year a way from either project releasing, their development doesn't need to break our builds for now.
* | | | | Merge pull request #18820 from tycooon/transaction-rollback-fixSean Griffin2015-02-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix transaction rollback in case of aborting thread
| * | | | | fix transaction rollback in case of aborting threadYuri Smirnov2015-02-051-1/+1
|/ / / / /
* | | | | Merge pull request #18817 from y-yagi/fix_action_controller_gem_templateArthur Nogueira Neves2015-02-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | load "rack/test" before "action_controller/railtie" in bug report templates [ci skip]
| * | | | | load "rack/test" before "action_controller/railtie" in bug report templates ↵yuuji.yaginuma2015-02-051-1/+1
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #18809 from meltheadorable/bugfix/postgres_moneySean Griffin2015-02-043-5/+7
|\ \ \ \ \ | | | | | | | | | | | | Fix bug causing table creation to fail for models with postgresql 'money' field
| * | | | | Fix test cases for money, bit and bit_varyingMelody2015-02-042-2/+4
| | | | | |
| * | | | | Add default options to 'bit' and 'bit_varying' methodsMelody2015-02-031-2/+2
| | | | | |
| * | | | | Adds default options hash for postgres money typeMelody Berton2015-02-031-1/+1
| | | | | |
* | | | | | Respect custom primary keys for associations in `Relation#where`Sean Griffin2015-02-044-2/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we query the proper columns, we go through normal handling for converting the value to a primitive which assumes it should use the table's primary key. If the association specifies a different value (and we know that we're working with an association), we should use the custom primary key instead. Fixes #18813.
* | | | | | revert 539d929b7b32302afe548e4cb06b5f4dd56e9942 [ci skip]Abdelkader Boudih2015-02-041-1/+1
| | | | | |
* | | | | | Merge pull request #18812 from yatmsu/fix_typo_in_rails_guidesAbdelkader Boudih2015-02-041-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix typo in Creating and Customizing Rails Generators & Templates guide... [ci skip]
| * | | | | Fix typo in Creating and Customizing Rails Generators & Templates guidesYasuhiko Katoh (y@su)2015-02-041-1/+1
|/ / / / /
* | | | | Don't remove all line endings from routes.rbAndrew White2015-02-033-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is a single scaffold in the routes.rb with no other lines then revoking/destroying it will create a routes.rb file with a syntax error. This is because the sentinel for the Thor `route` action didn't include the newline but the logged route code did. The fix is to add the newline to the sentinel and remove it from the the logged route code. Fixes #15913.
* | | | | rm `Column#cast_type`Sean Griffin2015-02-0314-138/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type from the column is never used, except when being passed to the attributes API. While leaving the type on the column wasn't necessarily a bad thing, I worry that it's existence there implies that it is something which should be used. During the design and implementation process of the attributes API, there have been plenty of cases where getting the "right" type object was hard, but I had easy access to the column objects. For any contributor who isn't intimately familiar with the intents behind the type casting system, grabbing the type from the column might easily seem like the "correct" thing to do. As such, the goal of this change is to express that the column is not something that should be used for type casting. The only places that are "valid" (at the time of this commit) uses of acquiring a type object from the column are fixtures (as the YAML file is going to mirror the database more closely than the AR object), and looking up the type during schema detection to pass to the attributes API Many of the failing tests were removed, as they've been made obsolete over the last year. All of the PG column tests were testing nothing beyond polymorphism. The Mysql2 tests were duplicating the mysql tests, since they now share a column class. The implementation is a little hairy, and slightly verbose, but it felt preferable to going back to 20 constructor options for the columns. If you are git blaming to figure out wtf I was thinking with them, and have a better idea, go for it. Just don't use a type object for this.
* | | | | Correct errors in counter cache updatingSean Griffin2015-02-033-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache name should be converted to a string when given, not compared as a symbol. This edge case is already adequately covered by our tests, but was masked by another issue where we were incorrectly updating the counter cache twice. When paired with a bug where we didn't update the counter cache because we couldn't find a match with the name, this made it look like everything was working fine. Fixes #10865.
* | | | | `RouteSet` should not be listed in the public API [ci skip]Sean Griffin2015-02-031-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | The use of `# :startdoc:` inside of the class was overriding the outer-most `# :nodoc:`, causing it to be listed in the documented API.
* | | | | Merge pull request #18801 from andreynering/fix-js-linkEileen M. Uchitelle2015-02-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix link [ci skip]
| * | | | | Fix link [ci skip]Andrey Nering2015-02-031-1/+1
| | | | | |
* | | | | | Merge pull request #18800 from jtperreault/masterAbdelkader Boudih2015-02-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve sentence flow in Debugging guide.
| * | | | | | [ci skip]James T. Perreault2015-02-031-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | improve sentence flow with grammar change
* | | | | | Merge pull request #18758 from yuki24/change-travel-to-stub-datetime-tooRafael Mendonça França2015-02-033-0/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Change AS::Testing::TimeHelpers#travel_to to also stub DateTime.now
| * | | | | Change AS::Testing::TimeHelpers#travel_to to also stub DateTime.nowYuki Nishijima2015-02-033-0/+17
| | | | | |
* | | | | | Merge pull request #18795 from vipulnsward/remove-magic-commentsJeremy Kemper2015-02-0377-78/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Removed magic comments (`# encoding: utf-8`) from tests since it's default from ruby 2 onwards
| * | | | | Removed magic comments # encoding: utf-8 , since its default from ruby 2.0 ↵Vipul A M2015-02-0377-78/+0
| | | | | | | | | | | | | | | | | | | | | | | | onwards.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 15:52:20 +0000