aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29503 from savroff/fix_current_page_engine_issueRafael França2017-06-203-4/+23
|\
| * Add changes to CHANGELOGsavroff2017-06-191-0/+6
| * Fix current_page? helper issue with engine root pathsavroff2017-06-192-4/+17
* | Merge pull request #28833 from bogdanvlviv/add-test-cases-for-optimistic-lockingRafael França2017-06-202-3/+23
|\ \
| * | Clean up 'Optimistic Locking' implementationbogdanvlviv2017-06-121-3/+4
| * | Add test cases for optimistic lockingbogdanvlviv2017-06-121-0/+19
* | | [ci skip] Fixed the attribute name for event.detailPrathamesh Sonpatki2017-06-201-3/+3
* | | Merge pull request #29505 from utilum/assert_nilRafael França2017-06-202-2/+2
|\ \ \
| * | | prepare for Minitest 6utilum2017-06-202-2/+2
|/ / /
* | | Merge pull request #27990 from leonelgalan/bug/filtered_parameters_classRafael França2017-06-193-2/+15
|\ \ \
| * \ \ Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-06-16462-3743/+5112
| |\ \ \
| * \ \ \ Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-05-17174-874/+1495
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-25182-823/+2143
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-03498-5491/+9151
| |\ \ \ \ \ \
| * | | | | | | Fixes CodeClimate warningsLeonel Galan2017-02-131-2/+2
| * | | | | | | Use of ParameterFilter no longer forces `request.filtered_parameters' class t...Leonel Galan2017-02-133-2/+15
* | | | | | | | Merge pull request #29485 from tjschuck/nodoc_ac_conn_websocketRafael França2017-06-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | nodoc AC::Connection::WebSocketT.J. Schuck2017-06-161-1/+1
* | | | | | | | | Merge pull request #29454 from kamipo/fix_exists_queries_with_cacheRafael França2017-06-193-51/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ensure query caching for `select_*` methods in connection adaptersRyuta Kamizono2017-06-154-52/+41
| * | | | | | | | | Fix `Relation#exists?` queries with query cacheRyuta Kamizono2017-06-152-1/+7
* | | | | | | | | | Merge pull request #29494 from kamipo/prevent_extra_scope_constructionRafael França2017-06-193-3/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Prevent extra `scope` construction in `find_target`Ryuta Kamizono2017-06-183-3/+5
* | | | | | | | | | | Merge pull request #29486 from kirs/fixtures-arelRafael França2017-06-191-4/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Refactor #insert_fixtures to use ArelKir Shatrov2017-06-191-4/+11
* | | | | | | | | | | | Merge pull request #29493 from y-yagi/deprecate_capifyRafael França2017-06-194-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Deprecate an `capify!` method in generators and templatesyuuji.yaginuma2017-06-184-10/+10
* | | | | | | | | | | | | Merge pull request #29499 from koic/ci_against_jruby_9_1_12_0Rafael França2017-06-191-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | CI against JRuby 9.1.12.0Koichi ITO2017-06-191-3/+3
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #29500 from y-yagi/fix_exmaple_of_parameters_to_queryVipul A M2017-06-191-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix examples for `AC::Parameters#to_query` [ci skip]yuuji.yaginuma2017-06-191-1/+6
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #29491 from kamipo/add_test_case_for_28754Matthew Draper2017-06-181-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add a test case for #28754Ryuta Kamizono2017-06-181-0/+19
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #29492 from kamipo/remove_debug_printMatthew Draper2017-06-181-13/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove debug printRyuta Kamizono2017-06-181-13/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #29488 from utilum/update_gemfileMatthew Draper2017-06-182-12/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixes FIXME: rb-inotify 0.99 has been releasedutilum2017-06-172-13/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #29487 from utilum/update_feodra_package_nameVipul A M2017-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | [ci skip] Update fedora SQLite3 package nameutilum2017-06-171-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #29415 from kamipo/remove_unused_defined_associationGuillermo Iguaran2017-06-162-2/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unused defined associationRyuta Kamizono2017-06-112-2/+1
* | | | | | | | | | | Merge pull request #29455 from kirs/remove-column-with-fk-mysqlGuillermo Iguaran2017-06-162-0/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove FK together with column in MySQLKir Shatrov2017-06-162-0/+17
* | | | | | | | | | | | Merge pull request #29392 from alexcameron89/unpersisted_create_associationMatthew Draper2017-06-173-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Raise on create for singular association when parent is unpersistedAlex Kitchens2017-06-083-1/+14
* | | | | | | | | | | | | Merge pull request #29431 from kamipo/fix_create_table_with_query_from_relationMatthew Draper2017-06-172-7/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix `create_table` with query from relationRyuta Kamizono2017-06-132-7/+10
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #29461 from dnl/unscope_where_orMatthew Draper2017-06-172-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Don't require 'unscope' to be the same for both sides of a 'or' relation.Dan Sherson2017-06-152-1/+26
* | | | | | | | | | | | | | Merge pull request #29470 from kamipo/use_nullable_column_instead_of_primary_keyMatthew Draper2017-06-171-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 17:11:53 +0000