aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #36703 from y-yagi/script-src-xxx_and_style-src-xxxy-yagi2019-07-192-0/+28
|\
| * Add support for script-src-attr / elem and style-src-attr / elem directivesyuuji.yaginuma2019-07-182-0/+28
* | Merge pull request #36695 from kamipo/revert_unnecessary_changeRyuta Kamizono2019-07-181-1/+1
|\ \ | |/ |/|
| * Revert "Merge pull request #36676 from wjessop/change_activestorage_metadata_...Ryuta Kamizono2019-07-171-1/+1
* | Merge pull request #36603 from y-yagi/add_skip_collision_check_optionYuji Yaginuma2019-07-182-2/+15
|\ \
| * | Add `skip-collision-check` option to generatoryuuji.yaginuma2019-07-052-2/+15
* | | Merge pull request #36691 from Edouard-chin/ec-system-test-routeRafael França2019-07-172-6/+13
|\ \ \
| * | | Don't include routes helpers inside System test class:Edouard CHIN2019-07-162-6/+13
* | | | Merge pull request #36700 from cpruitt/revert-36690-make-parameterize-require...Eileen M. Uchitelle2019-07-172-15/+2
|\ \ \ \
| * | | | Revert "Make UTF-8 string requirement explicit for `ActiveSupport::Inflector....Cliff Pruitt2019-07-172-15/+2
|/ / / /
* | | | Merge pull request #36690 from cpruitt/make-parameterize-requires-utf-8-explicitEileen M. Uchitelle2019-07-172-2/+15
|\ \ \ \
| * | | | Make UTF-8 string requirement explicit for `transliterate`Cliff Pruitt2019-07-162-2/+15
* | | | | Merge pull request #36696 from inopinatus/support_beginless_rangesRyuta Kamizono2019-07-173-2/+30
|\ \ \ \ \
| * | | | | Support beginless ranges in hash conditions.Josh Goodall2019-07-173-2/+30
|/ / / / /
* | | | | Merge pull request #36635 from abhaynikam/36332-fix-engine-documentation-to-r...Kasper Timm Hansen2019-07-171-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixed the engine documentation to not mention of assets/javascripts in app di...Abhay Nikam2019-07-091-1/+1
* | | | | Merge pull request #36694 from kirs/timeout-error-superclassRafael França2019-07-163-5/+12
|\ \ \ \ \
| * | | | | [ActiveRecord] Superclass for aborted queriesKir Shatrov2019-07-163-5/+12
|/ / / / /
* | | | | Add missing period [ci skip]Rafael Mendonça França2019-07-161-1/+1
* | | | | Merge pull request #36692 from kirs/mysql2-adapter-timeoutRafael França2019-07-163-1/+23
|\ \ \ \ \
| * | | | | Raise specific exception on Mysql2::Error::TimeoutErrorKir Shatrov2019-07-163-1/+23
* | | | | | Merge pull request #36648 from louim/patch-1Rafael França2019-07-161-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update message verifier documentation [ci skip]Louis-Michel Couture2019-07-101-2/+2
* | | | | | Merge pull request #36667 from gmcgibbon/clarify_logger_set_in_log_subscriber...Gannon McGibbon2019-07-161-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Specify log subscribers need a logger set before they can receive eventsGannon McGibbon2019-07-151-0/+3
* | | | | | Merge pull request #36685 from Shopify/as-depedencies-unhook-fixRafael França2019-07-161-3/+23
|\ \ \ \ \ \
| * | | | | | Fix Loadable.exclude_from to also reset Kernel#requireJean Boussier2019-07-161-3/+23
* | | | | | | Merge pull request #36639 from Edouard-chin/ec-am-errors-fullmessagesRafael França2019-07-168-131/+173
|\ \ \ \ \ \ \
| * | | | | | | Switch to use `class_attribute`:Edouard CHIN2019-07-162-4/+16
| * | | | | | | Move the `ActiveModel:Errors#full_message` method to the `Error` class:Edouard CHIN2019-07-168-131/+161
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Reuse the exception class name in all places in the wrapperRafael Mendonça França2019-07-161-3/+4
* | | | | | | Make the selent exceptions configurable on the exception wrapperRafael Mendonça França2019-07-161-1/+5
* | | | | | | Merge pull request #31634 from afcapel/reduce-routing-error-log-noiseRafael Mendonça França2019-07-164-3/+34
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Reduce log noise handling ActionController::RoutingErrorsAlberto Fernández Capel2019-05-284-3/+34
* | | | | | | Merge pull request #36557 from sikachu/fix-source-annotation-extractor-annota...Matthew Draper2019-07-162-3/+41
|\ \ \ \ \ \ \
| * | | | | | | Fix problem with accessing constant proxy subclassPrem Sichanugrist2019-07-052-3/+41
* | | | | | | | Merge pull request #36672 from jbaranov/strong-params-hashRafael França2019-07-162-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Add hash method to ActionController::ParametersEugene Baranov2019-07-142-0/+13
* | | | | | | | | Merge pull request #36676 from wjessop/change_activestorage_metadata_duration...Rafael França2019-07-161-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Different versions of ffprobe can return subtly different video lengthsWill Jessop2019-07-141-1/+1
* | | | | | | | | | Merge pull request #36656 from Edouard-chin/ec-local-cache-referenceRafael França2019-07-152-1/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Return a copy of the cache entry when local_cache exists:Edouard CHIN2019-07-112-1/+13
* | | | | | | | | | | active_support/core_ext/object/duplicable is not in use hereRyuta Kamizono2019-07-162-2/+0
* | | | | | | | | | | Merge pull request #36654 from Edouard-chin/ec-errors-deleteRafael França2019-07-152-1/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Returns `nil` when `AM::Errors#delete` doesn't delete anything:Edouard CHIN2019-07-112-1/+7
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #36649 from Edouard-chin/ec-errors-strit-match-collectionRafael França2019-07-152-2/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix `AM::Errors.added?` trying to generate a message:Edouard CHIN2019-07-102-2/+24
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #36640 from Edouard-chin/ec-uniq-validation-fixRafael França2019-07-152-2/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix errors getting duplicated when passed validations options:Edouard CHIN2019-07-102-2/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Remove caveat for older Ruby's `dup` behavior [ci skip]Ryuta Kamizono2019-07-161-9/+0