aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] More asset guide touch upsKasper Timm Hansen2019-04-171-4/+5
* Merge pull request #35994 from soartec-lab/update_guide_asset_pipeline_change...Kasper Timm Hansen2019-04-171-14/+6
|\
| * Guide updated in line with changes in rails commands [skip ci]soartec-lab2019-04-161-14/+6
* | Only retry tests on CIKasper Timm Hansen2019-04-171-1/+3
* | Fix bin/update references after 8927eba83cKasper Timm Hansen2019-04-173-10/+1
* | Merge pull request #33139 'bin-idempotent-setup'Kasper Timm Hansen2019-04-173-50/+14
|\ \
| * | Factorize bin/update in bin/setup, and make bin/setup idempotentDavid Stosik2019-04-173-50/+14
| * | Merge branch 'collection-cache-versioning'Kasper Timm Hansen2019-04-165-15/+93
| |\ \
* | \ \ Merge pull request #34378 'collection-cache-versioning'Kasper Timm Hansen2019-04-165-15/+93
|\ \ \ \ | |/ / / |/| / / | |/ /
| * / Add collection cache versioningLachlan Sylvester2019-04-165-15/+93
|/ /
* | running test with_info_handler methodMauri Mustonen2019-04-162-1/+8
* | Merge pull request #35997 from tjoyal/Rails/MailersController/do-not-leak-I18...Rafael França2019-04-162-2/+12
|\ \
| * | [Rails::MailersController] Do not leak I18n global setting changesThierry Joyal2019-04-162-2/+12
* | | Merge pull request #35996 from utilum/warning_useless_useKasper Timm Hansen2019-04-161-2/+2
|\ \ \ | |/ / |/| |
| * | Squash warning: possibly useless use of a constantutilum2019-04-161-2/+2
|/ /
* | Merge pull request #35995 from soartec-lab/update_guide_command_line_sample_codeEileen M. Uchitelle2019-04-161-6/+5
|\ \
| * | Update the generate command sample codes [skip ci]soartec-lab2019-04-171-6/+5
|/ /
* | Merge pull request #35946 from alimi/cache-full-mysql-database-versionKasper Timm Hansen2019-04-164-5/+18
|\ \
| * | Make changes per PR feedbackAli Ibrahim2019-04-122-9/+3
| * | Cache full MySQL version in schema cacheAli Ibrahim2019-04-114-6/+25
* | | Merge pull request #35985 from jhawthorn/lazy_backtrace_cleanKasper Timm Hansen2019-04-163-2/+16
|\ \ \ | |_|/ |/| |
| * | Find query_source_location using lazy EnumeratorJohn Hawthorn2019-04-153-2/+16
* | | Merge pull request #35989 from koic/bump_rubocop_to_0_67_2Ryuta Kamizono2019-04-166-6/+14
|\ \ \
| * | | Bump RuboCop to 0.67.2Koichi ITO2019-04-166-6/+14
* | | | Merge pull request #35988 from sharang-d/format-documentationRyuta Kamizono2019-04-161-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Format a comment to not show up as code [ci skip]Sharang Dashputre2019-04-161-2/+2
|/ / /
* | | Add CHANGELOG entry for d1107f4d1e2573948d4941ac44511a0af6241f80Ryuta Kamizono2019-04-161-1/+7
* | | Merge pull request #35962 from y-yagi/migrate_config_file_to_new_settingsYuji Yaginuma2019-04-161-6/+4
|\ \ \
| * | | Migrate Code Climate config file to new configurationyuuji.yaginuma2019-04-161-6/+4
|/ / /
* / / Don't refer `@transaction_state` directlyRyuta Kamizono2019-04-161-5/+5
|/ /
* | Merge pull request #35975 from xithan/masterRafael França2019-04-153-12/+22
|\ \
| * | mounted routes with non-word charactersxithan2019-04-153-12/+22
* | | Merge pull request #35977 from prathamesh-sonpatki/rm-required-in-generatorsRafael França2019-04-152-14/+3
|\ \ \
| * | | Remove `required: true` from the model generator templatePrathamesh Sonpatki2019-04-152-14/+3
* | | | Merge pull request #35959 from jhawthorn/unbound_templatesRafael França2019-04-157-14/+237
|\ \ \ \
| * | | | Add additional test for sharing templatesJohn Hawthorn2019-04-121-1/+18
| * | | | Avoid duplication using _find_allJohn Hawthorn2019-04-121-11/+7
| * | | | Support disabling cache for DigestorJohn Hawthorn2019-04-123-22/+51
| * | | | De-dup Templates, introduce UnboundTemplateJohn Hawthorn2019-04-124-10/+82
| * | | | Add tests against resolverJohn Hawthorn2019-04-113-0/+109
* | | | | Merge pull request #35927 from arbox/masterRafael França2019-04-151-0/+5
|\ \ \ \ \
| * | | | | Mark the section on PostgreSQL to be work in progress [ci skip]Andrei Beliankou2019-04-121-0/+1
| * | | | | Add section on PostgreSQL to the guides index [ci skip]Andrei Beliankou2019-04-101-0/+4
* | | | | | Merge pull request #35906 from yoones/notes-tags-registrationRafael França2019-04-154-2/+72
|\ \ \ \ \ \
| * | | | | | Adds `register_tags`Younes SERRAJ2019-04-124-2/+72
* | | | | | | Merge pull request #35899 from eileencodes/fix-connection-when-handler-doesnt...Eileen M. Uchitelle2019-04-152-17/+51
|\ \ \ \ \ \ \
| * | | | | | | Ensure a handler is set when using `connected_to`eileencodes2019-04-082-17/+51
* | | | | | | | Merge pull request #35974 from mrhead/remove-unused-modulesGeorge Claghorn2019-04-151-4/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Remove unused modules from StrongParametersPatrik Bóna2019-04-151-4/+0
|/ / / / / / /
* | | | | | | Fix dirty tracking for `touch`Ryuta Kamizono2019-04-155-9/+50