aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove warning from integer ext testyuuji.yaginuma2015-05-141-2/+2
| | | | | | | | | this removes the following warning: ``` test/core_ext/integer_ext_test.rb:34: warning: ambiguous first argument; put parentheses or a space even after `-' operator test/core_ext/integer_ext_test.rb:38: warning: ambiguous first argument; put parentheses or a space even after `-' operator ```
* Merge pull request #20151 from imtayadeway/tw/active-record-migrations-docsZachary Scott2015-05-131-2/+2
|\ | | | | [ci skip] Improve phrasing in AR migrations docs.
| * [ci skip] Improve phrasing in AR migrations docs.Tim Wade2015-05-131-2/+2
| | | | | | | | | | | | * insert 'and' into a poorly formed sentence. * avoid using 'reverse' twice in the same sentence (which would indicate the opposite of what is meant)
* | Merge pull request #20146 from karanarora/Doc-fixesClaudio B.2015-05-131-1/+1
|\ \ | | | | | | Rails documentation standard is american english. [ci skip]
| * | Rails documentation standard is american english. [ci skip]karanarora2015-05-141-1/+1
| | |
* | | Merge pull request #20150 from karanarora/Typo-fixRafael Mendonça França2015-05-131-1/+1
|\ \ \ | |_|/ |/| | remove redundant parenthesis
| * | remove redundant parenthesiskaranarora2015-05-141-1/+1
| | |
* | | Merge pull request #20149 from karanarora/Typo-fixRafael Mendonça França2015-05-131-11/+11
|\| | | | | | | | remove redundant parenthesis.
| * | remove redundant parenthesis. karanarora2015-05-141-11/+11
| |/
* | Merge pull request #20142 from zoltankiss/comment_fixRafael Mendonça França2015-05-131-4/+4
|\ \ | | | | | | Minor comment fix
| * | Minor comment fix. [ci skip]Zoltan Kiss2015-05-131-4/+4
|/ /
* | Add Integer#positive? and Integer#negative? query methods in the vein of ↵David Heinemeier Hansson2015-05-134-0/+37
| | | | | | | | Fixnum#zero?
* | Remove not used `options` argument from `ActiveSupport::JSON.decode`Carlos Antonio da Silva2015-05-131-8/+2
| | | | | | | | | | | | In Rails 4.0, json decoding relied on MultiJson. This changed from 4.1 forward since it reached its end of life, and this extra argument was kept for compatibility. We are safe to remove it now.
* | Merge pull request #20121 from matthewrudy/remove-sanitize-hashSean Griffin2015-05-131-3/+1
|\ \ | | | | | | Remove call to sanitize_sql_hash_for_conditions
| * | remove documentation for sanitize_sql_for_conditions with a HashMatthew Rudy Jacobs2015-05-121-2/+1
| | |
| * | Remove call to sanitize_sql_hash_for_conditionsMatthew Rudy Jacobs2015-05-121-1/+0
| | | | | | | | | | | | This method has already been removed.
* | | invalid sti error message contains the full class name.Yves Senn2015-05-132-1/+12
| | | | | | | | | | | | | | | | | | | | | This can resolve confusing situation when a top level constant exists but a namespaced version is identified. Related to #19531.
* | | Merge branch 'sti-subclass-from-attributes' of ↵Yves Senn2015-05-134-6/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/agrobbin/rails into agrobbin-sti-subclass-from-attributes Conflicts: activerecord/CHANGELOG.md
| * | | allow setting of a demodulized class name when using STIAlex Robbin2015-05-114-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If your STI class looks like this: ```ruby class Company < ActiveRecord::Base self.store_full_sti_class = false class GoodCo < Company end class BadCo < Company end end ``` The expectation (which is valid) is that the `type` in the database is saved as `GoodCo` or `BadCo`. However, another expectation should be that setting `type` to `GoodCo` would correctly instantiate the object as a `Company::GoodCo`. That second expectation is what this should fix.
* | | | Merge pull request #20136 from mcfiredrill/nodoc-postgresql-add-columnYves Senn2015-05-131-3/+1
|\ \ \ \ | | | | | | | | | | :nodoc: postgresql add_column
| * | | | :nodoc: postgresql add_columnTony Miller2015-05-131-3/+1
|/ / / /
* | | | Merge pull request #20126 from drcapulet/masterRafael Mendonça França2015-05-133-10/+31
|\ \ \ \ | | | | | | | | | | Add full set of MySQL CLI options to support SSL authentication when using db:structure dump and load
| * | | | Add full set of MySQL CLI options to support SSL authentication when using ↵Alex Coomans2015-05-123-10/+31
| | |/ / | |/| | | | | | | | | | db:structure dump and load
* | | | Merge pull request #20131 from vngrs/missing_doc_about_assign_attributeRafael Mendonça França2015-05-121-1/+2
|\ \ \ \ | | | | | | | | | | Add more detailed comment about _assign_attribute method [ci skip]
| * | | | Add more detailed comment about _assign_attribute method [ci skip]Mehmet Emin İNAÇ2015-05-131-1/+2
| | | | | | | | | | | | | | | | | | | | fix minor problems
* | | | | Merge pull request #20130 from ↵Rafael Mendonça França2015-05-121-21/+33
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | vngrs/refactor_abstract_mysql_adabter_type_to_sql_method Refactor abstract_mysql_adapter type_to_sql method
| * | | | Refactor abstract_mysql_adapter type_to_sql methodMehmet Emin İNAÇ2015-05-131-21/+33
|/ / / /
* | | | Merge pull request #20128 from claudiob/remove-sudoRafael Mendonça França2015-05-127-7/+7
|\ \ \ \ | |/ / / |/| | | [ci skip] Don’t encourage `sudo gem install`
| * | | [ci skip] Don’t encourage `sudo gem install`claudiob2015-05-127-7/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think we are better off leaving `sudo` outside of the documented way of installing gems (`activerecord`, `actionpack`, …). We don’t want newbies to think that `sudo` is required or, even worse, than they actually have to type `[sudo] gem install`. In most scenarios, `sudo` is not needed to install gems, and people who do need it, probably already know about it. What do you think? :grin:
* | | Merge pull request #20119 from yui-knk/fix/active_record_queryingYves Senn2015-05-121-1/+1
|\ \ \ | | | | | | | | [ci skip] Fix `transaction` code example
| * | | [ci skip] Fix `transaction` code exampleyui-knk2015-05-121-1/+1
| | | |
* | | | Merge pull request #20112 from eagletmt/doc-fixRafael Mendonça França2015-05-111-1/+1
|\ \ \ \ | | | | | | | | | | Fix default value in guide [ci skip]
| * | | | Fix default value in guide [ci skip]Kohei Suzuki2015-05-121-1/+1
| | |/ / | |/| |
* | | | Merge pull request #20111 from ankit8898/railtie_test_refacRafael Mendonça França2015-05-112-3/+0
|\ \ \ \ | | | | | | | | | | removing unused and already required require's
| * | | | removing unused and already required require'sAnkit Gupta2015-05-112-3/+0
| |/ / / | | | | | | | | | | | | | | | | custom test - Does not include EnvHelpers and the require is not needed path generation test - require abstract_unit which has . rails/all requires rails and corresponding
* | | | remove mysterious file added with #20105 :sparkles:Yves Senn2015-05-111-0/+0
| | | | | | | | | | | | | | | | /cc @claudiob
* | | | Merge pull request #20105 from claudiob/rails31-is-outYves Senn2015-05-112-2/+1
|\ \ \ \ | |/ / / |/| | | [ci skip] Fix comment, since Rails 3.1 is out
| * | | [ci skip] Fix comment, since Rails 3.1 is outclaudiob2015-05-112-2/+1
|/ / /
* | | Merge pull request #20106 from claudiob/finder-rails3Yves Senn2015-05-111-14/+2
|\ \ \ | | | | | | | | [ci skip] Stop explaining finders for Rails 3
| * | | [ci skip] Stop explaining finders for Rails 3claudiob2015-05-101-14/+2
| | | | | | | | | | | | | | | | | | | | Now that master points at Rails 5, we might not need to explain how things used to work in Rails 3. Or we might… up to you :grin:
* | | | Merge pull request #20100 from claudiob/don-t-skip-rbx-testCarlos Antonio da Silva2015-05-101-2/+0
|\ \ \ \ | | | | | | | | | | Stop skipping a test that now works on Rubinius
| * | | | Stop skipping a test that now works on Rubiniusclaudiob2015-05-101-2/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was skipped because of an issue that, in the meantime, has been fixed: https://github.com/rubinius/rubinius/issues/3328. Using the latest Rubinius (the one currently on Travis CI), this is the result: ```sh $ ruby --version rubinius 2.5.3 (2.1.0 2482b093 2015-05-10 3.5.1 JI) [x86_64-darwin14.3.0] ``` **Before this PR** ```sh $ ruby -Itest test/cases/attribute_assignment_test.rb Run options: --seed 58569 .....S... Finished in 0.048278s, 186.4203 runs/s, 269.2738 assertions/s. 9 runs, 13 assertions, 0 failures, 0 errors, 1 skips You have skipped tests. Run with --verbose for details. ``` **After this PR** $ ruby -Itest test/cases/attribute_assignment_test.rb Run options: --seed 35720 ......... Finished in 0.029441s, 305.6961 runs/s, 475.5273 assertions/s. 9 runs, 14 assertions, 0 failures, 0 errors, 0 skips ```
* | | | Merge pull request #20101 from imtayadeway/tw/active-record-querying-docsZachary Scott2015-05-101-2/+3
|\ \ \ \ | |/ / / |/| | | [ci skip] Improve phrasing on #explain pretty printing.
| * | | [ci skip] Improve phrasing on #explain pretty printing.Tim Wade2015-05-101-2/+3
|/ / /
* | | Merge pull request #20099 from yui-knk/fix/comment_association_cacheAbdelkader Boudih2015-05-101-1/+1
|\ \ \ | | | | | | | | [ci skip] Fix comment of `ActiveRecord::Associations#association_inst…
| * | | [ci skip] Fix comment of `ActiveRecord::Associations#association_instance_get`yui-knk2015-05-111-1/+1
| |/ /
* | | Merge pull request #20097 from ankit8898/refac_test_amSantiago Pastorino2015-05-102-2/+0
|\ \ \ | | | | | | | | not needed require's
| * | | not needed require'sAnkit Gupta2015-05-102-2/+0
| |/ / | | | | | | | | | | | | - as core_ext is not used and test pass locally - mail is already required in abstract_unit
* | | Merge pull request #20096 from yui-knk/fix/testing_guideEileen M. Uchitelle2015-05-101-1/+1
|\ \ \ | |/ / |/| | [ci skip] Fix purpose of `assert_kind_of`
| * | [ci skip] Fix purpose of `assert_kind_of`yui-knk2015-05-101-1/+1
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 17:03:26 +0000