Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | put the changelog entry in the right file :sweat: [ci skip] | Yves Senn | 2015-03-06 | 1 | -0/+7 |
| | |||||
* | `number_to_percentage` and `precision: 0` work with `NAN` and `INFINITY`. | Yves Senn | 2015-03-06 | 4 | -1/+16 |
| | | | | Closes #19227. | ||||
* | Merge pull request #19224 from davydovanton/doc-update-seconds-since-midnight | Abdelkader Boudih | 2015-03-06 | 1 | -1/+5 |
|\ | | | | | [ci skip] Update documentation for Time#seconds_since_midnight | ||||
| * | [ci skip] Update documentation for Time#seconds_since_midnight | Anton Davydov | 2015-03-06 | 1 | -1/+5 |
| | | |||||
* | | Change *args to arg in CallbackSequence#call | eileencodes | 2015-03-05 | 1 | -7/+7 |
| | | | | | | | | | | | | `CallbackSequence#call` can only ever take one argument. Using `*args` here produces unnecessary array allocations. Since it only ever takes one argument we should use `arg` instead of `*args`. | ||||
* | | don't need to rescue Exception in this case | Aaron Patterson | 2015-03-05 | 2 | -1/+7 |
| | | |||||
* | | :cut: remove unnecessary rescue Exceptions | Aaron Patterson | 2015-03-05 | 3 | -3/+3 |
| | | |||||
* | | remove unnecessary rescue | Aaron Patterson | 2015-03-05 | 1 | -2/+0 |
|/ | |||||
* | pass a config to the route set | Aaron Patterson | 2015-03-05 | 5 | -12/+43 |
| | | | | | This way we can get the relative_url_root from the application without setting another global value | ||||
* | Merge pull request #19222 from davydovanton/doc-delete-excess-white | Arthur Nogueira Neves | 2015-03-05 | 1 | -1/+1 |
|\ | | | | | [ci skip] Delete excess white in documentation | ||||
| * | [ci skip] Delete excess white in documentation | Anton Davydov | 2015-03-05 | 1 | -1/+1 |
|/ | |||||
* | Revert "Allow failures with Active Job" | Jeremy Kemper | 2015-03-05 | 1 | -4/+1 |
| | | | | | | | Travis is green. Let's keep it that way rather than let AJ languish as a second-class citizen. This reverts commit 2a6b3e14cff61639978a55f47aea9ff4c8e72758. | ||||
* | Merge pull request #19220 from ↵ | Kasper Timm Hansen | 2015-03-05 | 1 | -1/+6 |
|\ | | | | | | | | | davydovanton/doc-add-info-about-sanitize-to-highlight [ci skip] Add information about sanitize option in TextHelper#highlight | ||||
| * | [ci skip] Add information about sanitize option in TextHelper#highlight | Anton Davydov | 2015-03-05 | 1 | -1/+6 |
| | | |||||
* | | Use ruby 2.2.1 on Travis | Sean Griffin | 2015-03-05 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #19215 from ↵ | Sean Griffin | 2015-03-05 | 3 | -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 bug | Genadi Samokovarov | 2015-03-05 | 3 | -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_fix | Kasper Timm Hansen | 2015-03-05 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Added doc [ci skip] | ||||
| * | | | nodoc filtered_location [ci skip] | Sushruth Sivaramakrishnan | 2015-03-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #19217 from tgxworld/run_actionpack_tests_in_random_order | Yves Senn | 2015-03-05 | 1 | -5/+0 |
|\ \ \ \ | |_|_|/ |/| | | | Run ActionPack test cases in random order. | ||||
| * | | | Run ActionPack test cases in random order. | Guo Xiang Tan | 2015-03-06 | 1 | -5/+0 |
|/ / / | |||||
* | | | Merge pull request #19214 from sivsushruth/doc_fix | Arthur Nogueira Neves | 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 #19180 from sivsushruth/master | Arthur Nogueira Neves | 2015-03-05 | 1 | -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 Sivaramakrishnan | 2015-03-04 | 1 | -0/+5 |
| | | | |||||
* | | | Some documentation edits [ci skip] | Robin Dupret | 2015-03-05 | 7 | -22/+30 |
| | | | | | | | | | | | | | | | | | | * Fix a few typos * Wrap some lines around 80 chars * Rephrase some statements | ||||
* | | | Merge pull request #19212 from sivsushruth/doc_fix | Robin Dupret | 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 #19211 from keepcosmos/add-enum-testcase | Yves Senn | 2015-03-05 | 1 | -0/+14 |
|\ \ \ | | | | | | | | | added a testcase for ActiveRecord::Enum | ||||
| * | | | 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 |
| | | | |