aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #26815 from olivierlacan/log-query-sourceEileen M. Uchitelle2017-12-148-7/+97
|\ \ \ \ \ \
| * | | | | | Log call site for all queriesOlivier Lacan2017-12-138-7/+97
* | | | | | | Enable `Layout/LeadingCommentSpace` to not allow cosmetic changes in the futureRyuta Kamizono2017-12-1432-88/+83
|/ / / / / /
* | | | | | Use released `resque-scheduler` instead of master versionyuuji.yaginuma2017-12-142-12/+7
* | | | | | Merge pull request #31433 from jordan-brough/preserve-deprecated-method-visib...Rafael França2017-12-132-0/+29
|\ \ \ \ \ \
| * | | | | | Preserve original method visibility when deprecating a methodJordan Brough2017-12-132-0/+29
* | | | | | | Merge pull request #31435 from yahonda/deprecated_bigdecimal_newRafael França2017-12-1313-24/+24
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Suppress `warning: BigDecimal.new is deprecated` in activerecordYasuo Honda2017-12-1313-24/+24
* | | | | | | Merge pull request #31432 from yhirano55/add_a_space_to_comment_in_active_jobRafael França2017-12-131-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [ci skip] Add a space to comment in SidekiqAdapterYoshiyuki Hirano2017-12-141-1/+1
| |/ / / / /
* | | | | | Merge pull request #31429 from meinac/expose_activestorage_routesGeorge Claghorn2017-12-132-19/+38
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Expose Active Storage routesMehmet Emin INAC2017-12-132-19/+38
|/ / / / /
* | | | | Merge pull request #31428 from yahonda/report_on_exception_true_in_ruby25Rafael França2017-12-132-0/+5
|\ \ \ \ \
| * | | | | Suppress expected exceptions by `report_on_exception` = `false` in Ruby 2.5Yasuo Honda2017-12-132-0/+5
* | | | | | Merge pull request #30474 from yhirano55/make_it_same_title_in_index_and_pageEileen M. Uchitelle2017-12-135-12/+12
|\ \ \ \ \ \
| * | | | | | Make it same title in index and page [ci skip]Yoshiyuki Hirano2017-08-315-12/+12
* | | | | | | Exclude ActiveStorage::Filename{#parameters,::Parameters} from API docs [ci s...George Claghorn2017-12-132-2/+2
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #31391 from 5t111111/fix-active_storage-installation-failu...Eileen M. Uchitelle2017-12-131-1/+5
|\ \ \ \ \ \
| * | | | | | Invoke app-prefixed active storage task when in engineHirofumi Wakasugi2017-12-131-1/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Fix inheritance object creation from relationRyuta Kamizono2017-12-133-12/+60
* | | | | | Merge pull request #31425 from chiastolite/optimize_foregin_keys_queryRyuta Kamizono2017-12-131-2/+3
|\ \ \ \ \ \
| * | | | | | Optimizing information_schema query for `foreign_keys`Hiroyuki Morita2017-12-131-2/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #31423 from bogdanvlviv/fix-protected_environments-with-sy...Ryuta Kamizono2017-12-134-16/+51
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update 'Configuring Rails Applications' guidebogdanvlviv2017-12-121-0/+4
| * | | | | Convert protected_environments to an array of stringsbogdanvlviv2017-12-123-16/+47
|/ / / / /
* | | | | Make `sanitize_sql_` methods publicyuuji.yaginuma2017-12-135-152/+151
* | | | | Merge pull request #31405 from bogdanvlviv/fix-conflicts-counter_cache-with-t...Rafael França2017-12-126-8/+128
|\ \ \ \ \
| * | | | | Fix conflicts `counter_cache` with `touch: true` by optimistic locking.bogdanvlviv2017-12-126-8/+128
* | | | | | Merge pull request #31421 from tcopeland/trivial_typoRafael França2017-12-121-1/+1
|\ \ \ \ \ \
| * | | | | | Fix doc typo [ci skip]Tom Copeland2017-12-121-1/+1
|/ / / / / /
* | | | | | Merge pull request #31403 from Edouard-chin/fix-quoted-columnnameRafael França2017-12-122-1/+9
|\ \ \ \ \ \
| * | | | | | Quote colum_names when building select:Edouard CHIN2017-12-112-1/+9
* | | | | | | Merge pull request #31418 from yahonda/revert_31339_to_address_31369Eileen M. Uchitelle2017-12-121-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Revert "only install ffmpeg and mupdf on activestorage builds"Yasuo Honda2017-12-121-1/+4
* | | | | | | | Merge pull request #31416 from meinac/minor_fix_on_active_support_changelogRyuta Kamizono2017-12-121-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | [ci skip] Fix Active Support Changelog about :race_condition_ttlMehmet Emin INAC2017-12-121-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #31414 from fatkodima/ignore_tables-commentRyuta Kamizono2017-12-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove stale comment about `ActiveRecord::SchemaDumper.ignore_tables` [skip ci]fatkodima2017-12-121-1/+1
|/ / / / / / /
* | | | | | | Enable `Layout/SpaceBeforeComma` rubocop rule, and fixed moreRyuta Kamizono2017-12-1224-43/+46
* | | | | | | Merge pull request #31411 from eugeneius/time_helpers_redefine_methodRyuta Kamizono2017-12-121-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Prevent race condition when resetting time stubsEugene Kenny2017-12-121-1/+2
* | | | | | | | Merge pull request #31410 from swrobel/patch-3Ryuta Kamizono2017-12-121-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix secrets command deprecation messageStefan Wrobel2017-12-111-1/+1
* | | | | | | | Merge pull request #31402 from yhirano55/update_routing_guide_for_direct_methodRyuta Kamizono2017-12-121-0/+43
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | [ci skip] Update routing guide for DirectYoshiyuki Hirano2017-12-121-0/+43
* | | | | | | | Fix optimizing GIF variants using mogrify's -layers optionGeorge Claghorn2017-12-111-5/+7
* | | | | | | | Revert "Invoke mogrify once when transforming an image"George Claghorn2017-12-111-8/+6
* | | | | | | | Merge pull request #31407 from Edouard-chin/remove-create-fixtures-helperRafael França2017-12-111-4/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | `create_fixtures` doesn't work since at least a94220b66c9e4890007f66b092b25f8...Edouard CHIN2017-12-111-4/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #31399 from yhirano55/return_nil_if_raise_http_errorGeorge Claghorn2017-12-111-1/+1
|\ \ \ \ \ \ \