aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | Return `nil` instead of `false` if raise `Azure::Core::Http::HTTPError`Yoshiyuki Hirano2017-12-121-1/+1
* | | | | | | | Merge pull request #31401 from yhirano55/update_instrumentation_guide_for_act...George Claghorn2017-12-111-0/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | [ci skip] Update instrumentation guide for ActiveStorageYoshiyuki Hirano2017-12-121-0/+7
| | |/ / / / / | |/| | | | |
* / | | | | | Invoke mogrify once when transforming an imageGeorge Claghorn2017-12-111-6/+8
|/ / / / / /
* | | | | | Merge pull request #30361 from mfo/masterEileen M. Uchitelle2017-12-114-1/+25
|\ \ \ \ \ \
| * | | | | | fix(streaming_template_renderer): I18n.locale broken in layout. I18n gem stor...mfo2017-11-254-1/+25
* | | | | | | Merge pull request #31389 from yhirano55/webpack_config_in_active_storageJavan Makhmali2017-12-111-1/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | `webpack` is assigned but never used in webpack.config.jsYoshiyuki Hirano2017-12-111-1/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #31390 from lonre/patch-1Eileen M. Uchitelle2017-12-101-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update validates.rbLonre Wang2017-12-101-1/+1
|/ / / / /
* | | | | Reset schema cache after testyuuji.yaginuma2017-12-101-0/+2
* | | | | Merge pull request #31384 from rails/dont-override-serverGuillermo Iguaran2017-12-093-2/+24
|\ \ \ \ \
| * | | | | Change the system tests to set Puma as default server only when the user have...Guillermo Iguaran2017-12-093-2/+24
|/ / / / /
* | | | | Add secure `X-Download-Options` and `X-Permitted-Cross-Domain-Policies` to de...Guillermo Iguaran2017-12-094-4/+15
* | | | | Merge pull request #31379 from bogdanvlviv/ci-against-jruby_9_1_15Ryuta Kamizono2017-12-091-3/+3
|\ \ \ \ \
| * | | | | CI against JRuby 9.1.15.0bogdanvlviv2017-12-081-3/+3
* | | | | | Merge pull request #31354 from maciej-ka/docs-link_to-nil-name-exampleClaudio B2017-12-081-0/+5
|\ \ \ \ \ \
| * | | | | | docs: add example for a nil name in link_tomaciej-ka2017-12-071-0/+5
* | | | | | | Merge pull request #31355 from rails/fix-rails-env-with-rubyAaron Patterson2017-12-085-3/+82
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Set the Rails environment from an environment variableAaron Patterson2017-12-082-5/+2