aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #31037 from jeffreyguenther/activestorage-guideGeorge Claghorn2017-12-142-1/+550
|\ \ \ \ \
| * | | | | Tweak whitespaceJeffrey Guenther2017-12-141-0/+1
| * | | | | Formatting updatesJeffrey Guenther2017-12-141-14/+19
| * | | | | Merge branch 'master' into activestorage-guideJeffrey Guenther2017-12-14164-504/+1138
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Generate tmpname on its ownyuuji.yaginuma2017-12-151-1/+6
* | | | | | Merge pull request #31460 from yahonda/deprecated_bigdecimal_new_ap_av_aj_as_...Ryuta Kamizono2017-12-1511-24/+24
|\ \ \ \ \ \
| * | | | | | Suppress `warning: BigDecimal.new is deprecated`Yasuo Honda2017-12-1511-24/+24
|/ / / / / /
* | | | | | RedisCacheStore - Fix Default Error HandlerJesse Doyle2017-12-141-3/+5
* | | | | | Merge pull request #31434 from olivierlacan/boot-feedbackSean Griffin2017-12-142-0/+8
|\ \ \ \ \ \
| * | | | | | Provide instant feedback when booting RailsOlivier Lacan2017-12-132-0/+8
* | | | | | | Merge pull request #31452 from yahonda/deprecated_bigdecimal_new_activemodelSean Griffin2017-12-143-23/+23
|\ \ \ \ \ \ \
| * | | | | | | Suppress `warning: BigDecimal.new is deprecated` in Active ModelYasuo Honda2017-12-143-23/+23
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #31451 from yahonda/hash_digest_class_not_initializedRyuta Kamizono2017-12-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Address `warning: instance variable @hash_digest_class not initialized`Yasuo Honda2017-12-141-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #31453 from yahonda/report_on_exception_true_in_ruby25_mysql2Ryuta Kamizono2017-12-151-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Suppress expected exceptions by `report_on_exception` = `false`Yasuo Honda2017-12-141-0/+2
| |/ / / / /
* / / / / / Update nokogiri version on GemfileGuillermo Iguaran2017-12-142-10/+13
|/ / / / /
* | | | | Merge pull request #31289 from witlessbird/fips-compatibilityEileen M. Uchitelle2017-12-1413-12/+81
|\ \ \ \ \
| * | | | | Introduced `ActiveSupport::Digest` that allows to specify hash function imple...Dmitri Dolguikh2017-12-1213-12/+81
* | | | | | 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
|\ \ \ \ \ \