aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* feature detect for FNM_EXTGLOB for older Ruby. Fixes #15053Aaron Patterson2014-05-101-5/+21
|
* minor change in AR readme [ci skip]Vijay Dev2014-05-101-1/+1
|
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-05-106-11/+49
|\
| * copy edits [ci skip]Vijay Dev2014-05-102-14/+13
| |
| * [ci skip] add example to AR#assign_attributesschneems2014-05-091-0/+10
| |
| * [ci skip] doc ActiveSupport::TimeWithZone#to_sschneems2014-05-091-2/+5
| | | | | | Current docs are wrong. Does not accept strftime inputs.
| * [ci skip] doc Http::Headers methodsschneems2014-05-091-1/+17
| |
| * fix formatting errors [ci skip]Vijay Dev2014-05-091-6/+6
| |
| * copy edits [ci skip]Vijay Dev2014-05-082-3/+2
| |
| * [ci skip] document ActionDispatch::HTTP::Headersschneems2014-05-071-0/+6
| |
| * [ci skip] document type_cast_for_writeschneems2014-05-072-0/+5
| |
| * Fix Formatting in AR ReadmeGaurish Sharma2014-05-041-2/+2
| | | | | | Don't make free form text appear in code blocks [ci skip]
* | deprecate, join, preload, eager load of instance dependent associations.Yves Senn2014-05-106-4/+56
| | | | | | | | | | | | | | Closes #15024. These operations happen before instances are created. The current behavior is misleading and can result in broken behavior.
* | Merge pull request #15049 from arthurnn/fix_ciRafael Mendonça França2014-05-091-1/+1
|\ \ | | | | | | Fix broken proc syntax for 1.9.3
| * | Fix broken proc syntax for 1.9.3Arthur Neves2014-05-091-1/+1
|/ /
* | skip dealing with params if none are providedAaron Patterson2014-05-091-4/+11
| | | | | | | | | | | | | | | | | | | | | | This lets us avoid 1. A slow call to Hash#slice 2. An is_a? test 3. Extra hash allocations (from slice) 4. String allocations etc.
* | don't mutate the options hash, so we don't have to dupAaron Patterson2014-05-091-4/+3
| | | | | | | | avoids extra hash allocations on each call
* | use fnmatch to test for case insensitive file systemsAaron Patterson2014-05-091-4/+2
| | | | | | | | | | | | this is due to: https://bugs.ruby-lang.org/issues/5994
* | use unless and || since these options are booleanAaron Patterson2014-05-091-1/+1
| |
* | Merge pull request #15045 from xanhast/patch-1Godfrey Chan2014-05-091-2/+4
|\ \ | | | | | | Documentation, add examples of using an Enum scope [ci skip]
| * | Documentation, add examples of using an Enum scopeZac2014-05-091-2/+4
|/ / | | | | When scanning the Enum API page I found it easy to miss that scopes are generated. Adding an example clarifies use and has more... *pop*...
* | test, regression test for has_many with instance dependent scope.Yves Senn2014-05-092-0/+12
| |
* | Merge pull request #15044 from zzak/travis_ruby_too_wonRafael Mendonça França2014-05-091-1/+1
|\ \ | | | | | | Only need MINOR version level to test Ruby 2.1.x on Travis
| * | Only need MINOR version level to test Ruby 2.1.x on TravisZachary Scott2014-05-091-1/+1
|/ / | | | | | | cc http://blog.travis-ci.com/2014-04-28-upcoming-build-environment-updates/
* | Merge pull request #15042 from arthurnn/revert_dirty_transactionsRafael Mendonça França2014-05-093-52/+0
|\ \ | | | | | | Reverts dirty track restore on transactions rollback
| * | Reverts "Fix bugs with changed attributes tracking when transaction gets ↵Arthur Neves2014-05-093-52/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rollback" We are reverting these commits, because there are other caveats related to dirty attributes not being restored when a transaction is rollback. For instance, nested transactions cannot proper restore the dirty attributes state after a rollback. At the moment, the dirty attributes are scoped by the transaction. When we call `.save` on a record, the dirty attributes will be reset even if the transaction gets rollback. [related #13166] [related #15018] [related #15016] [closes #15019] This reverts commits * bab48f0a3d53a08bc23ea0887219e8deb963c3d9 * b0fa7cf3ff8432cc2eef3682b34763b7f8c93cc8. * 73fb39b6faa9de593ae75ad4e3b8e065ea0e53af * 37c238927fbed059de3f26a90d8923fb377568a5. * 8d8d4f1560264cd1c74364d67fa0501f6dd2c4fa Revert "Merge pull request #13166 from bogdan/transaction-magic"
* | | just call the method and assert the return valueAaron Patterson2014-05-091-8/+1
|/ / | | | | | | do not test internals
* | Merge pull request #15041 from arthurnn/update_rubyGuillermo Iguaran2014-05-091-1/+1
|\ \ | | | | | | Use ruby 2.1.2 on travis
| * | Use ruby 2.1.2 on travisArthur Neves2014-05-091-1/+1
|/ /
* | add tests for path based url_for callsAaron Patterson2014-05-081-2/+19
| |
* | don't manipulate the testclass, just add helpers to the instanceAaron Patterson2014-05-081-10/+11
| |
* | add a test for classes with optionsAaron Patterson2014-05-081-0/+7
| |
* | add tests for the polymorphic_path methodAaron Patterson2014-05-081-0/+3
| |
* | Merge pull request #15030 from mechanicles/a-to-anRafael Mendonça França2014-05-081-1/+1
|\ \ | | | | | | Change 'a' to 'an' [ci skip]
| * | Change 'a' to 'an' [ci skip]Santosh Wadghule2014-05-091-1/+1
| | |
* | | Merge pull request #15029 from JuanitoFatas/docpatch/routingRafael Mendonça França2014-05-081-11/+11
|\ \ \ | |/ / |/| | [ci skip] Minor improvements on routing.md.
| * | [ci skip] Minor improvements on routing.md.Juanito Fatas2014-05-091-11/+11
| | |
* | | add more tests around the polymorphic url apiAaron Patterson2014-05-081-0/+12
| | |
* | | set a constant for the "anonymous" habtm model fixes #15022Aaron Patterson2014-05-082-0/+11
| | | | | | | | | | | | | | | I wanted the middle model to be anonymous, but we have to give it a name for marshal support. :'(
* | | test, regression test for unparsable PostgreSQL defaults.Yves Senn2014-05-081-0/+17
| | | | | | | | | | | | | | | This test was inspired by #14866. That PR would break this functionality and we should make sure we notice that in the future.
* | | Merge pull request #14992 from fredwu/habtm_relation_size_calculation_fixCarlos Antonio da Silva2014-05-084-1/+30
|\ \ \ | | | | | | | | Habtm relation size calculation fix. Fixes #14913, Fixes #14914.
| * | | Fixed HABTM's CollectionAssociation sizeFred Wu2014-05-084-1/+30
| | | | | | | | | | | | | | | | | | | | HABTM should fall back to using the normal CollectionAssociation's size calculation if the collection is not cached or loaded. This addresses both #14913 and #14914 for master.
* | | | test, reset changed state in PG's uuid tests.Yves Senn2014-05-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resulted in some unrelated errors on Traivs: 1) Error: PostgresqlUUIDTest#test_treat_blank_uuid_as_nil: ActiveRecord::StatementInvalid: PG::UndefinedColumn: ERROR: column "thingy" of relation "uuid_data_type" does not exist LINE 1: INSERT INTO "uuid_data_type" ("thingy") VALUES ($1) RETURNIN... ^ : INSERT INTO "uuid_data_type" ("thingy") VALUES ($1) RETURNING "id" /cc @zuhao
* | | | pg guide, inet code example. [ci skip]Yves Senn2014-05-081-3/+29
|/ / /
* | | Merge pull request #15020 from ivantsepp/contributing_to_rails_guide_fixGodfrey Chan2014-05-071-1/+1
|\ \ \ | | | | | | | | Mismatch branch name between text and code example [ci skip]
| * | | Branch name should match in text and code example.Ivan Tse2014-05-081-1/+1
|/ / / | | | | | | | | | [ci skip]
* | | Merge pull request #15016 from arthurnn/dup_attr_on_save_stateGodfrey Chan2014-05-071-1/+1
|\ \ \ | | | | | | | | Dup the changed_attributes otherwise we could lose them
| * | | Dup the changed_attributes otherwise we could lose themArthur Neves2014-05-071-1/+1
|/ / /
* | | Merge pull request #15015 from pothibo/database-configurationRafael Mendonça França2014-05-073-1/+22
|\ \ \ | | | | | | | | Use Rails::Paths::Path#existent in database_configuration
| * | | Use Rails::Paths::Path#existent in database_configurationPier-Olivier Thibault2014-05-073-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Database configuration was trying to load the first path that config.paths['config/database'] was returning even if the path didn't exist in the filesystem. Because Rails::Paths::Path has the possibility to return more than 1 path (as an array), database_configuration should filter down the paths to the existing one and then load the first one. This would make it possible to move the database.yml file and add the new path to paths['config/database'] and still load the configurations.
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-01 01:50:17 +0000