aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Refactor `disallow_raw_sql!` to avoid `split(/\s*,\s*/)` to order argsRyuta Kamizono2019-06-096-21/+56
* | | | | | | | Merge pull request #36117 from shioimm/fix_action_text_overviewYuji Yaginuma2019-06-091-0/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix installation on guides/source/action_text_overview.mdMisaki Shioi2019-06-081-0/+2
* | | | | | | | Merge pull request #36438 from freeletics/nodocEileen M. Uchitelle2019-06-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add forgotten nodoc to dump_schema method.Wojciech Wnętrzak2019-06-071-1/+1
|/ / / / / / / /
* | | | | | | | NULLS { FIRST | LAST } is safe SQL string since 6c82b6c99d86f37e61f935fb342cc...Ryuta Kamizono2019-06-071-6/+6
* | | | | | | | Remove redundant blank line at the bottom of the generated controller testyuuji.yaginuma2019-06-071-1/+1
* | | | | | | | Merge pull request #36429 from bogdan/fix-preloading-duplicate-recordsRyuta Kamizono2019-06-072-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix preloading on AR::Relation where records are duplicated by a joinBogdan Gusiev2019-06-062-1/+8
* | | | | | | | | Merge pull request #36422 from jhawthorn/parallelize_actionviewJohn Hawthorn2019-06-063-39/+13
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Run actionview tests in parallelJohn Hawthorn2019-06-052-0/+12
| * | | | | | | | Remove actionview tests which modify fixturesJohn Hawthorn2019-06-051-39/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #36431 from alexgomez54/patch-1Rafael França2019-06-061-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Include warning in docs about polymorphism in underlying tablesAlex Gomez2019-06-061-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #36270 from Edouard-chin/ec-on-rotation-constructorKasper Timm Hansen2019-06-063-4/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow `on_rotation` in MessageEncryptor to be passed in constructor:Edouard CHIN2019-06-063-4/+50
* | | | | | | | | Merge pull request #36427 from akshaymohite/masterVipul A M2019-06-061-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed a couple of typos, word 'deliberately' and database_resolver_context cl...Akshay Mohite2019-06-061-4/+4
* | | | | | | | | Merge pull request #36426 from abhaynikam/bump-codeclimate-rubocop-versionRyuta Kamizono2019-06-068-27/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump rubocop to 0.71Abhay Nikam2019-06-068-27/+20
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #36420 from kamipo/quoted_identifier_regexRyuta Kamizono2019-06-0610-68/+166
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Allow quoted identifier string as safe SQL stringRyuta Kamizono2019-06-0610-68/+166
* | | | | | | | | Merge pull request #36424 from y-yagi/unlock_selenium-webdriverYuji Yaginuma2019-06-063-14/+14
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix broken driver testyuuji.yaginuma2019-06-061-2/+2
| * | | | | | | | Unlock `selenium-webdriver` versionyuuji.yaginuma2019-06-062-12/+12
|/ / / / / / / /
* | | | | | | | Merge pull request #36371 from eileencodes/move-schema-cache-to-poolEileen M. Uchitelle2019-06-056-7/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Move schema cache from connection to pooleileencodes2019-06-056-7/+33
* | | | | | | | Fix period positionRyuta Kamizono2019-06-064-5/+5
* | | | | | | | Merge pull request #36399 from jhawthorn/named_controller_helper_moduleJohn Hawthorn2019-06-052-9/+25
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use file/line from call to helper_moduleJohn Hawthorn2019-06-031-5/+10
| * | | | | | | Give HelperMethods module a nameJohn Hawthorn2019-06-032-4/+15
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #36416 from freeletics/fix-db-prepareEileen M. Uchitelle2019-06-054-31/+99
|\ \ \ \ \ \ \
| * | | | | | | Fixed db:prepare task for multiple databases.Wojciech Wnętrzak2019-06-054-31/+99
* | | | | | | | Merge pull request #36394 from eileencodes/treat-application-record-as-primaryEileen M. Uchitelle2019-06-053-5/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Treat ActiveRecord::Base and ApplicationRecord as "primary"eileencodes2019-06-053-5/+22
* | | | | | | | | Merge pull request #36415 from Aupajo/patch-1Xavier Noria2019-06-051-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | 6.0 release notes: fix typoPete Nicholls2019-06-051-1/+1
|/ / / / / / / /
* | | | | | | | Specify a config name from `config` as well as other configs [ci skip]yuuji.yaginuma2019-06-051-1/+1
* | | | | | | | Merge pull request #36407 from y-yagi/fixes_32211Yuji Yaginuma2019-06-053-10/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Extract default log file open operation to methodyuuji.yaginuma2019-06-053-10/+21
|/ / / / / / / /
* | | | | | | | Fix rubocop violationyuuji.yaginuma2019-06-051-2/+1
* | | | | | | | Unify to use 4 spaces indentation in CHANGELOGs [ci skip]Ryuta Kamizono2019-06-055-63/+68
* | | | | | | | Merge pull request #36376 from sharang-d/reword-content_type-changeVipul A M2019-06-051-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Reword the ActionDispatch::Response#content_type change [ci skip]Sharang Dashputre2019-06-021-4/+4
* | | | | | | | | Merge pull request #36404 from mrschuster/sqlite3_collation_bugRyuta Kamizono2019-06-053-2/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix sqlite3 collation parsing when using decimal columns.Martin Schuster2019-06-043-2/+15
* | | | | | | | | | Merge pull request #36398 from jhawthorn/file_update_checker_emptyJohn Hawthorn2019-06-041-1/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Don't call listen with empty directory listJohn Hawthorn2019-06-031-1/+4
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #36405 from abhaynikam/36389-follow-up-to-fix-grammer-and-...Eileen M. Uchitelle2019-06-041-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typo in multi database guide depentent -> dependent [ci skip]Abhay Nikam2019-06-041-2/+2
|/ / / / / / / / /