aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | Do not use private API in bug report templatesyuuji.yaginuma2017-06-222-8/+4
* | | | | | | | | | | | Merge pull request #29529 from abraham-chan/fix-hash-conditions-documentationRyuta Kamizono2017-06-221-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix hash conditions documentation [ci skip]Abraham Chan2017-06-221-2/+0
* | | | | | | | | | | | | Merge pull request #29525 from y-yagi/fix_ruby_warningsKasper Timm Hansen2017-06-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove unused variableyuuji.yaginuma2017-06-221-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #29513 from kirs/fixture-yaml-fallbackRafael França2017-06-211-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Avoid begin/rescue in fixture quotingKir Shatrov2017-06-201-5/+4
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #27063 from MaxLap/merge_keep_inner_joinRafael França2017-06-213-5/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Keep INNER JOIN when merging relationsMaxime Lapointe2017-06-203-5/+40
| | |_|/ / / / / / / / | |/| | | | | | | | |
* / | | | | | | | | | Fix call-seq typo s/==/<=>/ [ci skip]Ryuta Kamizono2017-06-211-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #28914 from bogdanvlviv/fix-touch-with-optimistic-lockingRafael França2017-06-204-3/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix ActiveRecord::Persistence#touch with lockingbogdanvlviv2017-06-214-3/+33
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #28926 from bogdanvlviv/fix-destroy-with-locking_column-va...Rafael França2017-06-203-1/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix destroy with locking_column value nullbogdanvlviv2017-06-203-1/+31
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #29510 from padi/minor_docs_updateRafael França2017-06-202-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adds missing minor doc about tools/test.rb [ci skip]Marc Ignacio2017-06-212-1/+3
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #29504 from kirs/fixtures-arel-bulkRafael França2017-06-209-11/+117
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use bulk INSERT to insert fixturesKir Shatrov2017-06-209-11/+117
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Shrink image files in the guides using ImageOptimAkira Matsuda2017-06-2139-0/+0
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | 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
| |/ / / / / / / / / / / / / / / /