aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rm-ntp'Rafael Mendonça França2015-02-064-27/+40
|\ | | | | | | Merge #12067 rebasing and improving the code.
| * Merge pull request #12067 from jackxxu/keep_precisionRafael Mendonça França2015-02-064-27/+40
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Enable number_to_percentage to keep the number's precision by allowing :precision option value to be nil Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/number_helper.rb activesupport/test/number_helper_test.rb
| | * Enable number_to_percentage to keep the number's precision by allowing ↵Jack Xu2013-08-283-16/+31
| | | | | | | | | | | | | | | | | | :precision to be nil number_helper.number_to_percentage(1000, precision: nil) # => "1000%"
* | | Merge pull request #18831 from colinrymer/patch-1Rafael Mendonça França2015-02-061-2/+2
|\ \ \ | | | | | | | | Indicate link_to creates an anchor element
| * | | Indicate link_to creates an anchor elementColin Rymer2015-02-061-2/+2
| |/ / | | | | | | | | | | | | | | | The `link_to` helper generates an HTML anchor element (consisting of opening and closing anchor tags and an element body). The docs currently state the a link tag is generated (which would indicate a tag like `<link>`, which is another valid HTML tag), so this change clarifies that an anchor element is actually generated. [ci skip]
* / / Revert "Improve the performance of HWIDA `select` and `reject`"Sean Griffin2015-02-061-4/+4
|/ / | | | | | | This reverts commit 9c47b874d112414df7f80f9ed852adb48ba6d268.
* | Improve the performance of HWIDA `select` and `reject`Sean Griffin2015-02-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are (potentially, depending on input) called in several places in both the router, and Active Record. The code also becomes much cleaner. This results in ~33% performance gain in both methods. Calculating ------------------------------------- before 15.696k i/100ms after 19.865k i/100ms ------------------------------------------------- before 303.064k (± 2.6%) i/s - 1.523M after 446.734k (± 2.4%) i/s - 2.245M On Ruby 2.2, a warning will be emitted about states not being copied, because we're calling `super` from a subclass. We can safely ignore it, however, since we're converting the result back into a HWIDA
* | Merge pull request #14028 from uberllama/json_escape_commentsRafael Mendonça França2015-02-061-0/+5
|\ \ | | | | | | Amended json_escape comments
| * | Amended json_escape comment to clarify that user-generated content must ↵Yuval Kordov2014-02-121-0/+5
| | | | | | | | | | | | still be html_escaped if being inserted ingot he DOM via JQuery's html() method.
* | | Merge pull request #18388 from claudiob/better-docs-for-active-model-lint-testsRafael Mendonça França2015-02-061-28/+32
|\ \ \ | | | | | | | | Better docs for AM::Lint::Tests
| * | | Better docs for AM::Lint::Testsclaudiob2015-01-071-28/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the original documentation of ActiveModel::Lint::Tests introduced in dbf20c2d to focus less on *why* the tests exist and more on *what* the tests do. For instance, `test_to_key` was documented as: > Returns an Enumerable of all (primary) key attributes... whereas `test_to_key` is simply a test meant to *fail* or *pass*, and the documentation above refers to `to_key`. [ci skip]
* | | | revises AM:Dirty example [Godfrey Chan & Xavier Noria]Xavier Noria2015-02-061-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing example seems somewhat forced: is it realistic to have a model that accepts state in its initializer but considers it has not been changed? By allowing state changes to happen only via accessors it seems more natural that new instances are considered to be unchanged (as they are in AR). [ci skip]
* | | | use parentheses here, for the beard of the Prophet! [ci skip]Xavier Noria2015-02-061-1/+1
| | | |
* | | | applies guidelines to dirty.rb [ci skip]Xavier Noria2015-02-061-11/+11
| | | |
* | | | Merge pull request #18399 from kommen/unify-structure-file-envvar-namesRafael Mendonça França2015-02-053-4/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use SCHEMA instead of DB_STRUCTURE for specifiying structure file. Conflicts: activerecord/CHANGELOG.md
| * | | | Use `SCHEMA` instead of `DB_STRUCTURE` for specifiying structure file.Dieter Komendera2015-01-083-4/+10
| |/ / / | | | | | | | | | | | | | | | | `rake test:load_structure` already uses `SCHEMA` and there's no need to maintain two different env vars.
* | | | Merge pull request #18589 from kamipo/fix_test_types_line_upRafael Mendonça França2015-02-051-2/+2
|\ \ \ \ | | | | | | | | | | Fix `test_types_line_up` when column type missing
| * | | | Fix `test_types_line_up` when column type missingRyuta Kamizono2015-01-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a column type `xml` is missing in regexp pattarn. However, `assert_equal 1, lengths.uniq.length` is success when `lengths` are all `nil` because a column type is missing. a test will be failed by using `compact` when a column type is missing.
* | | | | 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
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-16 18:04:15 +0000