Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Fix incorrect output from rails routes when using singular resources issue #2... | Erick Reyna | 2016-11-18 | 4 | -12/+51 | |
* | | | | | Merge pull request #27092 from prathamesh-sonpatki/https-source-bundler | Rafael França | 2016-11-18 | 1 | -0/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use secure source for gems referencing "github" in the generated apps | Prathamesh Sonpatki | 2016-11-18 | 1 | -0/+5 | |
* | | | | | | Merge pull request #27098 from sina-s/fix-unexpected-session-sharing | Rafael Mendonça França | 2016-11-18 | 3 | -0/+15 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix `ActionDispatch::IntegrationTest#open_session` | Tawan Sierek | 2016-11-18 | 3 | -0/+15 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #27094 from y-yagi/remove_warnings_from_activejob_test_helper | Kasper Timm Hansen | 2016-11-18 | 1 | -4/+4 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | remove Ruby warning from Active Job test helper methods | yuuji.yaginuma | 2016-11-18 | 1 | -4/+4 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #26551 from mgpnd/FixContentLength | Rafael França | 2016-11-17 | 2 | -2/+13 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fixed CONTENT_LENGTH header in ActionController::TestRequest | Artem Rashev | 2016-11-15 | 2 | -2/+13 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #26981 from kamipo/should_not_except_order_for_exists | Rafael França | 2016-11-17 | 2 | -2/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Should except `:distinct` rather than `:order` for `exists?` | Ryuta Kamizono | 2016-11-09 | 2 | -2/+3 | |
* | | | | | | Merge pull request #27090 from tomprats/update-preprocessor-documentation | Rafael França | 2016-11-17 | 1 | -21/+11 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Updated Sprockets Documentation | Tom Prats | 2016-11-17 | 1 | -21/+11 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #27070 from jonhyman/patch-raw-true | Rafael França | 2016-11-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Removes 'raw: true' from MemCacheStore#read_multi, per https://github.com/rai... | Jonathan Hyman | 2016-11-16 | 1 | -1/+1 | |
* | | | | | | Refactor the handling of fallback exception handlers | Sean Griffin | 2016-11-17 | 1 | -10/+5 | |
* | | | | | | Merge pull request #27076 from y-yagi/fix_postgresql_array_encoding | Sean Griffin | 2016-11-17 | 2 | -4/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | use `force_encoding` instread of `encode!` to avoid `UndefinedConversionError` | yuuji.yaginuma | 2016-11-17 | 2 | -4/+4 | |
* | | | | | | | Merge pull request #26980 from kamipo/respect_new_records_for_collection_prox... | Sean Griffin | 2016-11-17 | 6 | -13/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Respect new records for `CollectionProxy#uniq` | Ryuta Kamizono | 2016-11-13 | 6 | -13/+19 | |
* | | | | | | | | Call fallback exception handlers with the right exception | Sean Griffin | 2016-11-17 | 2 | -4/+11 | |
* | | | | | | | | Remove mention of deprecated SafeERB gem from security docs for now, prior se... | Vipul A M | 2016-11-18 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #27084 from vipulnsward/fix-connection-config-mutation | Kasper Timm Hansen | 2016-11-17 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix mucking of connection_config leading to issues in prepared_statements | Vipul A M | 2016-11-17 | 1 | -3/+3 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #27078 from vipulnsward/fix-pg-prepared-statement-test | Kasper Timm Hansen | 2016-11-17 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix PG prepared statement test | Vipul A M | 2016-11-17 | 1 | -1/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #27075 from maclover7/jm-jruby-activejob | Rafael França | 2016-11-16 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Make JRUBY_OPTS a global Travis environment variable | Jon Moss | 2016-11-16 | 1 | -2/+2 | |
| * | | | | | | | | Enable JRuby testing for Active Job | Jon Moss | 2016-11-16 | 1 | -2/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #27072 from maxboisvert/use_named_parameters_in_assert_enq... | Rafael França | 2016-11-16 | 1 | -8/+8 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use named parameters instead of `assert_valid_keys` | Maxime Boisvert | 2016-11-16 | 1 | -8/+8 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #27064 from koic/bump_ruby_versions | Rafael França | 2016-11-16 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Run tests by Ruby 2.2.6 and 2.3.2 | Koichi ITO | 2016-11-16 | 1 | -3/+3 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #27074 from maclover7/jm-jruby-actionmailer | Rafael França | 2016-11-16 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Enable JRuby testing for Action Mailer | Jon Moss | 2016-11-16 | 1 | -0/+5 | |
|/ / / / / / / | ||||||
* | | | | | | | docs, add `update_all` example with SQL fragment. [ci skip] | Yves Senn | 2016-11-16 | 1 | -0/+3 | |
* | | | | | | | Merge pull request #27056 from kirs/fix-testing-isolation | Guillermo Iguaran | 2016-11-15 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix testing isolation | Kir Shatrov | 2016-11-15 | 1 | -1/+2 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #27058 from maclover7/jm-fix-26904 | Jon Moss | 2016-11-15 | 3 | -0/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Support AC::Parameters for PG HStore | Jon Moss | 2016-11-15 | 3 | -0/+19 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #27054 from kamipo/null_relation_calculate | Sean Griffin | 2016-11-15 | 1 | -5/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Refactor `NullRelation#calculate` | Ryuta Kamizono | 2016-11-16 | 1 | -5/+4 | |
|/ / / / / / | ||||||
* | | | | | | Make sure to bundle json 2.x on CI | Akira Matsuda | 2016-11-15 | 2 | -0/+4 | |
* | | | | | | Merge pull request #27048 from y-yagi/remove_alias_method_chain_from_guide | प्रथमेश Sonpatki | 2016-11-15 | 1 | -50/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | remove `alias_method_chain` from guide [ci skip] | yuuji.yaginuma | 2016-11-15 | 1 | -50/+0 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #27047 from y-yagi/remove_duplicated_entry | Rafael França | 2016-11-14 | 1 | -4/+0 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | remove duplicated changelog entry [ci skip] | yuuji.yaginuma | 2016-11-15 | 1 | -4/+0 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #27046 from conradbeach/fix-typo-layouts-and-rendering-guide | Jon Moss | 2016-11-14 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix small typo in Layouts and Rendering guide. [ci skip] | Conrad Beach | 2016-11-14 | 1 | -1/+1 | |
* | | | | | | Missing require string/filters for `squish` | Akira Matsuda | 2016-11-15 | 1 | -0/+2 | |
|/ / / / / |