Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add ActiveRecord::Enum testcase about multiple enums declaring at a time | keepcosmos | 2015-03-05 | 1 | -0/+14 |
| | |||||
* | Merge pull request #19210 from sivsushruth/doc_fix | Abdelkader Boudih | 2015-03-05 | 1 | -1/+1 |
|\ | | | | | Doc fix [ci skip] | ||||
| * | Doc fix [ci skip] | Sushruth Sivaramakrishnan | 2015-03-05 | 1 | -1/+1 |
| | | |||||
* | | add regression test. Closes #18400. | Yves Senn | 2015-03-05 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #19209 from sivsushruth/doc_fix | Abdelkader Boudih | 2015-03-05 | 1 | -1/+1 |
|\| | | | | | Doc fix [ci skip] | ||||
| * | Doc fix [ci skip] | Sushruth Sivaramakrishnan | 2015-03-05 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #19207 from sivsushruth/doc_fix | Abdelkader Boudih | 2015-03-05 | 1 | -2/+2 |
|\| | | | | | Doc fix [ci skip] | ||||
| * | Doc fix [ci skip] | Sushruth Sivaramakrishnan | 2015-03-05 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #19206 from sivsushruth/doc_fix | Abdelkader Boudih | 2015-03-05 | 1 | -1/+1 |
|\| | | | | | Doc fix [ci skip] | ||||
| * | Doc fix [ci skip] | Sushruth Sivaramakrishnan | 2015-03-05 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #19205 from sivsushruth/doc_fix | Abdelkader Boudih | 2015-03-05 | 1 | -1/+1 |
|\| | | | | | Doc fix [ci skip] | ||||
| * | Doc fix [ci skip] | Sushruth Sivaramakrishnan | 2015-03-05 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #19203 from sivsushruth/doc_fix | Richard Schneeman | 2015-03-04 | 1 | -1/+1 |
|\| | | | | | Doc fix [ci skip] | ||||
| * | Doc fix [ci skip] | Sushruth Sivaramakrishnan | 2015-03-05 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #19202 from sivsushruth/doc_fix | Arthur Nogueira Neves | 2015-03-04 | 1 | -1/+1 |
|\| | | | | | Doc fix [ci skip] | ||||
| * | Doc fix [ci skip] | Sushruth Sivaramakrishnan | 2015-03-05 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #19144 from y-yagi/fix_streaming_buffer | Rafael Mendonça França | 2015-03-04 | 3 | -1/+13 |
|\ | | | | | fix ActionView::Template::Error when using Streaming with capture. | ||||
| * | fix ActionView::Template::Error when using Streaming with capture. | yuuji.yaginuma | 2015-03-01 | 3 | -1/+13 |
| | | | | | | | | can't acquire a encoding from StreamingBuffer. fixes #12001 | ||||
* | | Merge pull request #19185 from kamipo/correctly_dump_serial_and_bigserial | Rafael Mendonça França | 2015-03-04 | 8 | -27/+100 |
|\ \ | | | | | | | Correctly dump `serial` and `bigserial` | ||||
| * | | Remove duplicated test | Ryuta Kamizono | 2015-03-04 | 1 | -20/+0 |
| | | | | | | | | | | | | | | | `PostgresqlLargeKeysTest` is duplicated `PrimaryKeyBigSerialTest` in `primary_keys_test.rb`. | ||||
| * | | Correctly dump `serial` and `bigserial` | Ryuta Kamizono | 2015-03-04 | 6 | -4/+93 |
| | | | |||||
| * | | Add `Column#bigint?` method | Ryuta Kamizono | 2015-03-04 | 3 | -3/+7 |
| | | | |||||
* | | | Merge pull request #19189 from ↵ | Richard Schneeman | 2015-03-04 | 1 | -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_multi | Michael Raidel | 2015-03-04 | 1 | -2/+5 |
| | | | | |||||
* | | | | Drop request class from RouteSet constructor. | Aaron Patterson | 2015-03-04 | 3 | -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_docs | Rafael Mendonça França | 2015-03-04 | 2 | -16/+16 |
|\ \ \ \ | |_|/ / |/| | | | Fix spelling [ci skip] | ||||
| * | | | Fix spelling [ci skip] | Yu Haidong | 2015-03-04 | 2 | -16/+16 |
|/ / / | |||||
* | | | add CHANGELOG entry for #19176. [ci skip] | Yves Senn | 2015-03-04 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #19195 from y-yagi/patch-1 | Xavier Noria | 2015-03-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix spelling, `ERb` -> `ERB` [ci skip] | ||||
| * | | | fix spelling, `ERb` -> `ERB` [ci skip] | yuuji.yaginuma | 2015-03-04 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #19191 from tjschuck/cache_timestamp_format_guide_update | Aaron Patterson | 2015-03-03 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update cache_timestamp_format default value in guides | ||||
| * | | | Update cache_timestamp_format default value in guides | T.J. Schuck | 2015-03-03 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge pull request #19194 from mrgilman/fix-spelling-error | Eileen M. Uchitelle | 2015-03-03 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Fix spelling error in has_secure_password documentation [ci skip] | ||||
| * | | | Fix spelling error in has_secure_password documentation [ci skip] | Melanie Gilman | 2015-03-03 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #18777 from yasyf/issue_15209 | Rafael Mendonça França | 2015-03-03 | 3 | -1/+24 |
|\ \ \ | | | | | | | | | Take DST into account when locating TimeZone from Numeric | ||||
| * | | | Take DST into account when locating TimeZone from Numeric. | Yasyf Mohamedali | 2015-03-03 | 3 | -1/+24 |
| |/ / | | | | | | | | | | | | | | | | When given a specific offset, use the first result found where the total current offset (including any periodic deviations such as DST) from UTC is equal. | ||||
* | | | Tiny documentation edits [ci skip] | Robin Dupret | 2015-03-03 | 2 | -2/+2 |
| | | | |||||
* | | | Remove line wrapping from the benchmark/ips output | Piotr Szotkowski | 2015-03-03 | 1 | -4/+4 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #18775 from yasyf/issue_5122 | Rafael Mendonça França | 2015-03-03 | 4 | -1/+25 |
|\ \ \ | |/ / |/| | | | | | Fallback to RAILS_RELATIVE_URL_ROOT in `url_for` | ||||
| * | | Fallback to RAILS_RELATIVE_URL_ROOT in `url_for`. | Yasyf Mohamedali | 2015-02-24 | 4 | -1/+25 |
| | | | | | | | | | | | | | | | | | | Fixed an issue where the `RAILS_RELATIVE_URL_ROOT` environment variable is not prepended to the path when `url_for` is called. If `SCRIPT_NAME` (used by Rack) is set, it takes precedence. | ||||
* | | | Merge pull request #19176 from imajes/master | Yves Senn | 2015-03-03 | 2 | -1/+17 |
|\ \ \ | | | | | | | | | Fixes reference for schema_format to AR::Base from AS::Base | ||||
| * | | | Fixes reference for schema_format to AR::Base from AS::Base | James Cox | 2015-03-03 | 2 | -1/+17 |
| | | | | |||||
* | | | | Remove mention of long-gone initializer and config | Jeremy Kemper | 2015-03-03 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | Serving public files from multiple paths was removed in afc828828ffffe7edeb4648a9d2aa4731191ae21 | ||||
* | | | | Merge pull request #19186 from kamipo/remove_unused_line | Carlos Antonio da Silva | 2015-03-03 | 1 | -1/+0 |
|\ \ \ \ | | | | | | | | | | | Remove unused line | ||||
| * | | | | Remove unused line | Ryuta Kamizono | 2015-03-03 | 1 | -1/+0 |
|/ / / / | |||||
* | | | | Merge pull request #19171 from JuanitoFatas/doc/more-examples | Sean Griffin | 2015-03-02 | 1 | -0/+16 |
|\ \ \ \ | | | | | | | | | | | Add more documents for AR connection_adapters abstract schema_definitions. [ci skip] | ||||
| * | | | | Add more documents for AR connection_adapters abstract schema_definitions. ↵ | Juanito Fatas | 2015-03-03 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] - Add example to column_exists? - Add example to index_exists? - Add document for foreign_key - Add document for foreign_key_exists? | ||||
* | | | | | Merge pull request #19147 from gsamokovarov/work-around-ruby-10695 | Eileen M. Uchitelle | 2015-03-02 | 3 | -3/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Work around for upstream Ruby bug #10685 | ||||
| * | | | | | Work around for upstream Ruby bug #10685 | Genadi Samokovarov | 2015-03-01 | 3 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In f6e293ec54f02f83cdb37502bea117f66f87bcae we avoided a segfault in the tests, however I think we should try to avoid the crash, as it may happen in user code as well. Here is what I distiled the bug down to: ```ruby # Rails case - works on 2.0, 2.1; crashes on 2.2 require 'action_dispatch' ActionDispatch::Response.new(200, "Content-Type" => "text/xml") # General case - works on 2.0, 2.1; crashes on 2.2 def foo(optional = {}, default_argument: nil) end foo('quux' => 'bar') ``` | ||||
* | | | | | | Merge pull request #15806 from tgxworld/partition_routes_during_setup | Aaron Patterson | 2015-03-02 | 4 | -8/+39 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Partition routes during setup. |