aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Leave all our tests as order_dependent! for now"Matthew Draper2015-03-066-30/+0
| | | | | | | | | | | | This reverts commit 2f52f969885b2834198de0045748436a4651a94e. Conflicts: actionmailer/test/abstract_unit.rb actionview/test/abstract_unit.rb activemodel/test/cases/helper.rb activerecord/test/cases/helper.rb activesupport/test/abstract_unit.rb railties/test/abstract_unit.rb
* Merge pull request #19215 from ↵Sean Griffin2015-03-053-7/+5
|\ | | | | | | | | gsamokovarov/revert-ruby-2-2-0-kwarg-crash-workarounds Revert work arounds for upstream Ruby 2.2.0 kwargs bug
| * Revert work arounds for upstream Ruby 2.2.0 kwargs bugGenadi Samokovarov2015-03-053-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug caused a segfault and you can find more info about it at: https://bugs.ruby-lang.org/issues/10685. We did a couple of work arounds, but 2.2.1 rolled out and those aren't needed anymore. Here are the reverted commits: - Revert "Work around for upstream Ruby bug #10685", commit 707a433870e9e06af688f85a4aedc64a90791a64. - Revert "Fix segmentation fault in ActionPack tests", commit 22e0a22d5f98e162290d9820891d8191e720ad3b. I'm also bumping the Ruby version check to 2.2.1 to prevent future segfaults.
* | Merge pull request #19218 from sivsushruth/doc_fixKasper Timm Hansen2015-03-051-1/+1
|\ \ | | | | | | Added doc [ci skip]
| * | nodoc filtered_location [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
| | |
* | | Merge pull request #19217 from tgxworld/run_actionpack_tests_in_random_orderYves Senn2015-03-051-5/+0
|\ \ \ | | | | | | | | Run ActionPack test cases in random order.
| * | | Run ActionPack test cases in random order.Guo Xiang Tan2015-03-061-5/+0
|/ / /
* | | Merge pull request #19214 from sivsushruth/doc_fixArthur Nogueira Neves2015-03-051-1/+1
|\| | | | | | | | Doc fix [ci skip]
| * | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
| | |
* | | Merge pull request #19180 from sivsushruth/masterArthur Nogueira Neves2015-03-051-0/+5
|\ \ \ | |_|/ |/| | If TZInfo-data is not present in windows, let the user know.
| * | If TZInfo-data is not present in windows, let the user know.Sushruth Sivaramakrishnan2015-03-041-0/+5
| | |
* | | Some documentation edits [ci skip]Robin Dupret2015-03-057-22/+30
| | | | | | | | | | | | | | | | | | * Fix a few typos * Wrap some lines around 80 chars * Rephrase some statements
* | | Merge pull request #19212 from sivsushruth/doc_fixRobin Dupret2015-03-051-1/+1
|\ \ \ | | |/ | |/| Doc fix [ci skip]
| * | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
| | |
* | | Merge pull request #19211 from keepcosmos/add-enum-testcaseYves Senn2015-03-051-0/+14
|\ \ \ | | | | | | | | added a testcase for ActiveRecord::Enum
| * | | add ActiveRecord::Enum testcase about multiple enums declaring at a timekeepcosmos2015-03-051-0/+14
|/ / /
* | | Merge pull request #19210 from sivsushruth/doc_fixAbdelkader Boudih2015-03-051-1/+1
|\| | | | | | | | Doc fix [ci skip]
| * | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
| | |
* | | add regression test. Closes #18400.Yves Senn2015-03-051-0/+6
| | |
* | | Merge pull request #19209 from sivsushruth/doc_fixAbdelkader Boudih2015-03-051-1/+1
|\| | | | | | | | Doc fix [ci skip]
| * | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
| | |
* | | Merge pull request #19207 from sivsushruth/doc_fixAbdelkader Boudih2015-03-051-2/+2
|\| | | | | | | | Doc fix [ci skip]
| * | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-2/+2
| | |
* | | Merge pull request #19206 from sivsushruth/doc_fixAbdelkader Boudih2015-03-051-1/+1
|\| | | | | | | | Doc fix [ci skip]
| * | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
| | |
* | | Merge pull request #19205 from sivsushruth/doc_fixAbdelkader Boudih2015-03-051-1/+1
|\| | | | | | | | Doc fix [ci skip]
| * | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
| | |
* | | Merge pull request #19203 from sivsushruth/doc_fixRichard Schneeman2015-03-041-1/+1
|\| | | | | | | | Doc fix [ci skip]
| * | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
| | |
* | | Merge pull request #19202 from sivsushruth/doc_fixArthur Nogueira Neves2015-03-041-1/+1
|\| | | | | | | | Doc fix [ci skip]
| * | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
|/ /
* | Merge pull request #19144 from y-yagi/fix_streaming_bufferRafael Mendonça França2015-03-043-1/+13
|\ \ | | | | | | fix ActionView::Template::Error when using Streaming with capture.
| * | fix ActionView::Template::Error when using Streaming with capture.yuuji.yaginuma2015-03-013-1/+13
| | | | | | | | | | | | can't acquire a encoding from StreamingBuffer. fixes #12001
* | | Merge pull request #19185 from kamipo/correctly_dump_serial_and_bigserialRafael Mendonça França2015-03-048-27/+100
|\ \ \ | | | | | | | | Correctly dump `serial` and `bigserial`
| * | | Remove duplicated testRyuta Kamizono2015-03-041-20/+0
| | | | | | | | | | | | | | | | | | | | `PostgresqlLargeKeysTest` is duplicated `PrimaryKeyBigSerialTest` in `primary_keys_test.rb`.
| * | | Correctly dump `serial` and `bigserial`Ryuta Kamizono2015-03-046-4/+93
| | | |
| * | | Add `Column#bigint?` methodRyuta Kamizono2015-03-043-3/+7
| | | |
* | | | Merge pull request #19189 from ↵Richard Schneeman2015-03-041-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | mraidel/activesupport_cache_fetch_multi_documentation_fix fixes documentation for returned hash in cache.fetch_multi
| * | | | fixes documentation for returned hash in cache.fetch_multiMichael Raidel2015-03-041-2/+5
| | | | |
* | | | | Drop request class from RouteSet constructor.Aaron Patterson2015-03-043-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | If you would like to use a custom request class, please subclass and implemet the `request_class` method.
* | | | | Merge pull request #19197 from teeceepee/improve_docsRafael Mendonça França2015-03-042-16/+16
|\ \ \ \ \ | |_|/ / / |/| | | | Fix spelling [ci skip]
| * | | | Fix spelling [ci skip]Yu Haidong2015-03-042-16/+16
|/ / / /
* | | | add CHANGELOG entry for #19176. [ci skip]Yves Senn2015-03-041-0/+4
| | | |
* | | | Merge pull request #19195 from y-yagi/patch-1Xavier Noria2015-03-041-1/+1
|\ \ \ \ | | | | | | | | | | fix spelling, `ERb` -> `ERB` [ci skip]
| * | | | fix spelling, `ERb` -> `ERB` [ci skip]yuuji.yaginuma2015-03-041-1/+1
|/ / / /
* | | | Merge pull request #19191 from tjschuck/cache_timestamp_format_guide_updateAaron Patterson2015-03-031-1/+1
|\ \ \ \ | | | | | | | | | | Update cache_timestamp_format default value in guides
| * | | | Update cache_timestamp_format default value in guidesT.J. Schuck2015-03-031-1/+1
| | |_|/ | |/| | | | | | [ci skip]
* | | | Merge pull request #19194 from mrgilman/fix-spelling-errorEileen M. Uchitelle2015-03-031-1/+1
|\ \ \ \ | |/ / / |/| | | Fix spelling error in has_secure_password documentation [ci skip]
| * | | Fix spelling error in has_secure_password documentation [ci skip]Melanie Gilman2015-03-031-1/+1
|/ / /
* | | Merge pull request #18777 from yasyf/issue_15209Rafael Mendonça França2015-03-033-1/+24
|\ \ \ | | | | | | | | Take DST into account when locating TimeZone from Numeric
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 16:24:49 +0000