aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | 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.
* | | | | | | | Merge pull request #18796 from 5minpause/masterCarlos Antonio da Silva2015-02-031-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Small enhancement for generators
| * | | | | | | | Small enhancement for generatorsHolger Frohloff2015-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes a call to #map and a subsequent call to #flatten to the more idiomatic version of #flat_map. This commit also removes an unnessecary return statement.
* | | | | | | | | Wrap method arguments with parentheses in docsCarlos Antonio da Silva2015-02-031-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | As per Rails general coding conventions. Related to #18794 [ci skip]
* | | | | | | | Merge pull request #18794 from vipulnsward/fix-dirtyAbdelkader Boudih2015-02-031-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix AM#Dirty introduction example
| * | | | | | | Person class doesn't contain finder methods, hence usage of Person.find_by ↵Vipul A M2015-02-031-1/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is wrong. Added simple initialize and made use of Person.new instead of Person.find_by to clarify the docs. [ci skip]
* | | | | | | Merge pull request #18791 from Sinjo/consistent-foreign-key-name-generationSean Griffin2015-02-023-3/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Consistent foreign key name generation
| * | | | | | | Generate consistent names for foreign keysChris Sinjakli2015-02-033-3/+16
| | | | | | | |
* | | | | | | | Merge pull request #18789 from jafrog/masterSean Griffin2015-02-021-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | A typo fix and a small clarification on `autoload_paths`
| * | | | | | | | Fix a typo in autoloading doc and note on autoload_paths [ci skip]jafrog2015-02-021-1/+2
| | | | | | | | |
* | | | | | | | | Properly lookup the limit for bigintSean Griffin2015-02-022-1/+11
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fixes #18787.
* | | | | | | | Rename `user_provided_types` to something more meaningfulSean Griffin2015-02-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `attributes_to_define_after_schema_loads` better describes the difference between `attribute` and `define_attribute`, and doesn't conflate terms since we no longer differentiate between "user provided" and "schema provided" types.
* | | | | | | | Remove unused `Column#with_type`Sean Griffin2015-02-021-6/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that type casting has nothing to do with columns, our only usage of this method is gone.
* | | | | | | Merge pull request #18779 from jduff/fix_documentation_typoAbdelkader Boudih2015-02-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix typo in Time#change docs
| * | | | | | | Fix typo in Time#change docsJohn Duff2015-02-021-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #18612 from ↵Aaron Patterson2015-02-019-5/+80
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eileencodes/fix-validates-on-associated-record-if-parent-is-validate-false Fix validations on child record when record parent has validate: false
| * | | | | | | Fix validations on child record when record parent has validate: falseeileencodes2015-02-019-5/+80
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #17621. This 5 year old (or older) issue causes validations to fire when a parent record has `validate: false` option and a child record is saved. It's not the responsibility of the model to validate an associated object unless the object was created or modified by the parent. Clean up tests related to validations `assert_nothing_raised` is not benefiting us in these tests Corrected spelling of "respects" It's better to use `assert_not_operator` over `assert !r.valid`
* | | | | | | Cache `url_helpers` separately for mailersAndrew White2015-02-011-44/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit 3b63780 re-introduced url helper caching but we need to cache a separate module for Action Mailer without paths.
* | | | | | | Merge pull request #18776 from eileencodes/cache-url-helpersAndrew White2015-02-011-42/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Cache `url_helpers`
| * | | | | | | Cache `url_helpers`eileencodes2015-02-011-42/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `url_helpers` used to be memoized. This was lost in a refactoring and this PR adds it back. We noticed this while investigating why integration tests are slower than controller tests.
* | | | | | | | add destroyed records to the currend transactionAaron Patterson2015-02-012-1/+5
| | | | | | | |
* | | | | | | | Fix Issue #15549, unbounded memory growth when saving records that have any ↵Will Bryant2015-02-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after_create callbacks (or any associations, which makes after_create callbacks for you)
* | | | | | | | make the private methods privateAaron Patterson2015-02-011-2/+2
| | | | | | | |
* | | | | | | | push add to transaction logic down to the instanceAaron Patterson2015-02-013-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the transaction object shouldn't know so much about active record objects, so let's push the conditionals in to the instance.
* | | | | | | | remove conditional that is always trueAaron Patterson2015-02-011-3/+2
| | | | | | | |
* | | | | | | | stop making calls to add_recordAaron Patterson2015-02-011-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #18770 from palkan/docs-hasone-dependentAbdelkader Boudih2015-02-011-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add note about has_one :through and :dependent
| * | | | | | | | [ci skip] add note about has_one :through and :dependentpalkan2015-02-011-0/+4
| | | | | | | | |
* | | | | | | | | Merge pull request #18756 from ajgrover/activejob_testsMatthew Draper2015-02-011-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Update queue_classic gem to use latest
| * | | | | | | | Update queue_classic gem to use latestAlex Grover2015-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove '<3.0.0' requirement for queue_classic gem. This fixes the issue that the gem was attempting to parse the queue name as a URI, causing all of the tests to fail.
* | | | | | | | | Merge pull request #18721 from sj26/pre-discard-flashAaron Patterson2015-02-014-28/+51
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Pre-discard flash messages
| * | | | | | | | | Migrate old flash behaviourSamuel Cochran2015-01-302-6/+13
| | | | | | | | | |
| * | | | | | | | | Discard from flash before persisting in sessionSamuel Cochran2015-01-292-24/+26
| | | | | | | | | |
| * | | | | | | | | Fix flash remaining after last flash deletedSamuel Cochran2015-01-292-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inside a controller functional test after the last flash is deleted it still persists the flash because to_session_value is nil. We should delete it from the session when the serialized version is nil, same as the flash middleware.
* | | | | | | | | | Merge pull request #18769 from gsamokovarov/exception-wrapper-windows-pathsAndrew White2015-02-012-2/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Show proper traces on Windows for the error pages
| * | | | | | | | | | Show proper traces on Windows for the error pagesGenadi Samokovarov2015-02-012-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an issue brought up by @daniel-rikowski in rails/web-console#91. Citing his PR proposal here: > Prior to this, backtrace lines were simply split by a single colon. > > Unfortunately that is also the drive letter delimiter in Windows paths > which resulted in a lot of empty source fragments of "C:0". ("C" from > the drive letter and 0 from "/path/to/rails/file.rb:16".to_i) > > Now the trace line is split by the first colon followed by some digits, > which works for both Windows and Unix path styles. Now, the PR was sent against web-console, because of the templates copy issue we used to had. Instead of bothering the contributor to reopen the issue against upstream Rails itself, I will make sure he gets the credit by putting his name in [rails-contributors/hard_coded_authors.rb][]. [rails-contributors/hard_coded_authors.rb]: (https://github.com/fxn/rails-contributors/blob/master/app/models/names_manager/hard_coded_authors.rb).
* | | | | | | | | | | Merge branch 'master' into mdluo-masterAaron Patterson2015-02-0129-45/+45
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Move required error message and changelog to Active Record Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846 Use Module#include instead of send :include, since now is a public method [ci skip] :scissors: warning from controller renderer test Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | | | | Move required error message and changelog to Active RecordCarlos Antonio da Silva2015-02-014-7/+7
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new association error belongs to Active Record, not Active Model. See #18700 for reference.
| * | | | | | | | | | Merge pull request #18759 from yuki24/remove-warningYves Senn2015-02-011-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | :scissors: warning from controller renderer test
| | * | | | | | | | | :scissors: warning from controller renderer testYuki Nishijima2015-01-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails/actionpack/test/controller/renderer_test.rb:89: warning: possible reference to past scope - defaults
| * | | | | | | | | | Merge pull request #18767 from robertomiranda/ruby-2.2Sean Griffin2015-01-3122-32/+32
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846
| | * | | | | | | | | | Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846robertomiranda2015-01-3122-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref: https://github.com/rails/rails/pull/18763#issuecomment-72349769
| * | | | | | | | | | | Merge pull request #18763 from robertomiranda/ruby-2.2Sean Griffin2015-01-312-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Module#include instead of send :include, since Module#include is a public method [ci skip]
| | * | | | | | | | | | Use Module#include instead of send :include, since now is a public method ↵robertomiranda2015-01-312-3/+3
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] ref https://bugs.ruby-lang.org/issues/8846
* | | | | | | | | | | Merge pull request #1 from mdluo/pr/18316Mingdong Luo2015-01-313-1/+18
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Fix n+1 query problem when eager loading nil associations (fixes #18312)
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 15:12:24 +0000