Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #29503 from savroff/fix_current_page_engine_issue | Rafael França | 2017-06-20 | 3 | -4/+23 | |
|\ \ \ \ | ||||||
| * | | | | Add changes to CHANGELOG | savroff | 2017-06-19 | 1 | -0/+6 | |
| * | | | | Fix current_page? helper issue with engine root path | savroff | 2017-06-19 | 2 | -4/+17 | |
* | | | | | Merge pull request #28833 from bogdanvlviv/add-test-cases-for-optimistic-locking | Rafael França | 2017-06-20 | 2 | -3/+23 | |
|\ \ \ \ \ | ||||||
| * | | | | | Clean up 'Optimistic Locking' implementation | bogdanvlviv | 2017-06-12 | 1 | -3/+4 | |
| * | | | | | Add test cases for optimistic locking | bogdanvlviv | 2017-06-12 | 1 | -0/+19 | |
* | | | | | | [ci skip] Fixed the attribute name for event.detail | Prathamesh Sonpatki | 2017-06-20 | 1 | -3/+3 | |
* | | | | | | Merge pull request #29505 from utilum/assert_nil | Rafael França | 2017-06-20 | 2 | -2/+2 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | prepare for Minitest 6 | utilum | 2017-06-20 | 2 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #27990 from leonelgalan/bug/filtered_parameters_class | Rafael França | 2017-06-19 | 3 | -2/+15 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Merge branch 'master' into bug/filtered_parameters_class | Leonel Galán | 2017-06-16 | 462 | -3743/+5112 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into bug/filtered_parameters_class | Leonel Galán | 2017-05-17 | 174 | -874/+1495 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into bug/filtered_parameters_class | Leonel Galán | 2017-04-25 | 182 | -823/+2143 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into bug/filtered_parameters_class | Leonel Galán | 2017-04-03 | 498 | -5491/+9151 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fixes CodeClimate warnings | Leonel Galan | 2017-02-13 | 1 | -2/+2 | |
| * | | | | | | | | Use of ParameterFilter no longer forces `request.filtered_parameters' class t... | Leonel Galan | 2017-02-13 | 3 | -2/+15 | |
* | | | | | | | | | Merge pull request #29485 from tjschuck/nodoc_ac_conn_websocket | Rafael França | 2017-06-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | nodoc AC::Connection::WebSocket | T.J. Schuck | 2017-06-16 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #29454 from kamipo/fix_exists_queries_with_cache | Rafael França | 2017-06-19 | 3 | -51/+46 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Ensure query caching for `select_*` methods in connection adapters | Ryuta Kamizono | 2017-06-15 | 4 | -52/+41 | |
| * | | | | | | | | | | Fix `Relation#exists?` queries with query cache | Ryuta Kamizono | 2017-06-15 | 2 | -1/+7 | |
* | | | | | | | | | | | Merge pull request #29494 from kamipo/prevent_extra_scope_construction | Rafael França | 2017-06-19 | 3 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Prevent extra `scope` construction in `find_target` | Ryuta Kamizono | 2017-06-18 | 3 | -3/+5 | |
* | | | | | | | | | | | | Merge pull request #29486 from kirs/fixtures-arel | Rafael França | 2017-06-19 | 1 | -4/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Refactor #insert_fixtures to use Arel | Kir Shatrov | 2017-06-19 | 1 | -4/+11 | |
* | | | | | | | | | | | | | Merge pull request #29493 from y-yagi/deprecate_capify | Rafael França | 2017-06-19 | 4 | -10/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Deprecate an `capify!` method in generators and templates | yuuji.yaginuma | 2017-06-18 | 4 | -10/+10 | |
* | | | | | | | | | | | | | | Merge pull request #29499 from koic/ci_against_jruby_9_1_12_0 | Rafael França | 2017-06-19 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | CI against JRuby 9.1.12.0 | Koichi ITO | 2017-06-19 | 1 | -3/+3 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #29500 from y-yagi/fix_exmaple_of_parameters_to_query | Vipul A M | 2017-06-19 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix examples for `AC::Parameters#to_query` [ci skip] | yuuji.yaginuma | 2017-06-19 | 1 | -1/+6 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #29491 from kamipo/add_test_case_for_28754 | Matthew Draper | 2017-06-18 | 1 | -0/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Add a test case for #28754 | Ryuta Kamizono | 2017-06-18 | 1 | -0/+19 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #29492 from kamipo/remove_debug_print | Matthew Draper | 2017-06-18 | 1 | -13/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Remove debug print | Ryuta Kamizono | 2017-06-18 | 1 | -13/+0 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #29488 from utilum/update_gemfile | Matthew Draper | 2017-06-18 | 2 | -12/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fixes FIXME: rb-inotify 0.99 has been released | utilum | 2017-06-17 | 2 | -13/+4 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #29487 from utilum/update_feodra_package_name | Vipul A M | 2017-06-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | [ci skip] Update fedora SQLite3 package name | utilum | 2017-06-17 | 1 | -1/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #29415 from kamipo/remove_unused_defined_association | Guillermo Iguaran | 2017-06-16 | 2 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Remove unused defined association | Ryuta Kamizono | 2017-06-11 | 2 | -2/+1 | |
* | | | | | | | | | | | | Merge pull request #29455 from kirs/remove-column-with-fk-mysql | Guillermo Iguaran | 2017-06-16 | 2 | -0/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Remove FK together with column in MySQL | Kir Shatrov | 2017-06-16 | 2 | -0/+17 | |
* | | | | | | | | | | | | | Merge pull request #29392 from alexcameron89/unpersisted_create_association | Matthew Draper | 2017-06-17 | 3 | -1/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Raise on create for singular association when parent is unpersisted | Alex Kitchens | 2017-06-08 | 3 | -1/+14 | |
* | | | | | | | | | | | | | | Merge pull request #29431 from kamipo/fix_create_table_with_query_from_relation | Matthew Draper | 2017-06-17 | 2 | -7/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Fix `create_table` with query from relation | Ryuta Kamizono | 2017-06-13 | 2 | -7/+10 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #29461 from dnl/unscope_where_or | Matthew Draper | 2017-06-17 | 2 | -1/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Don't require 'unscope' to be the same for both sides of a 'or' relation. | Dan Sherson | 2017-06-15 | 2 | -1/+26 | |
* | | | | | | | | | | | | | | | Merge pull request #29470 from kamipo/use_nullable_column_instead_of_primary_key | Matthew Draper | 2017-06-17 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | |