aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use `rubocop-0-52` channelYasuo Honda2018-02-231-1/+1
* Merge pull request #32091 from utilum/update_rubocopRafael França2018-02-221-10/+9
|\
| * Update rubocop to the latest versionutilum2018-02-231-10/+9
* | Merge pull request #32089 from bogdanvlviv/fix-plugin-generated-filesRafael França2018-02-223-3/+17
|\ \ | |/ |/|
| * Improve generated file `app/views/application.html.erb` of pluginbogdanvlviv2018-02-232-1/+14
| * Comment `require "active_storage/engine"` in `bin/rails` of plugin if `--skip...bogdanvlviv2018-02-232-2/+3
* | Merge pull request #32090 from bogdanvlviv/remove-passing-extra-arguments-to-...Rafael França2018-02-223-4/+4
|\ \
| * | Remove passing extra arguments to ActiveJob Callbacksbogdanvlviv2018-02-233-4/+4
| |/
* | Revert "Merge pull request #32075 from eileencodes/delete-default-configuration"eileencodes2018-02-223-1/+20
* | Revert "Reject empty database yamls"eileencodes2018-02-221-1/+1
|/
* Merge pull request #32085 from rails/add-timezone-support-to-activejobAndrew White2018-02-2210-1/+103
|\
| * Add support for timezones to Active JobAndrew White2018-02-2210-1/+103
* | Merge pull request #32018 from rails/add-nonce-support-to-cspAndrew White2018-02-2216-52/+207
|\ \
| * | Add support for automatic nonce generation for Rails UJSAndrew White2018-02-1916-52/+207
* | | Merge pull request #32084 from buehmann/fix/escape-quoted-column-name-in-regexpRyuta Kamizono2018-02-221-1/+1
|\ \ \
| * | | Properly escape column name embedded into regexpAndreas Bühmann2018-02-221-1/+1
|/ / /
* | / Reject empty database yamlseileencodes2018-02-221-1/+1
| |/ |/|
* | Add cop for preferring 'Foo.method' over 'Foo::method'Andrew White2018-02-224-3/+7
* | Merge pull request #32076 from utilum/use_dotAndrew White2018-02-224-8/+9
|\ \
| * | We should call methods with `.method_name` not `::method_name`.utilum2018-02-224-8/+9
* | | Do not add routes when actions are not specifiedYuji Yaginuma2018-02-222-0/+8
|/ /
* | Call `YAML.load` correctlyeileencodes2018-02-212-2/+2
* | Merge pull request #32075 from eileencodes/delete-default-configurationEileen M. Uchitelle2018-02-213-20/+1
|\ \
| * | Delete default configurationeileencodes2018-02-213-20/+1
* | | Update to sinatra 2.0.1Andrew White2018-02-211-5/+5
* | | Add note to Active Storage guide about S3 permissions [ci skip]Andrew White2018-02-211-0/+2
* | | Allow S3 tests against buckets in other regionsAndrew White2018-02-212-2/+2
* | | Merge pull request #32064 from yahonda/ci_with_jruby_headRyuta Kamizono2018-02-211-3/+3
|\ \ \
| * | | CI with `jruby-head` compatible with Ruby 2.4.1Yasuo Honda2018-02-211-3/+3
|/ / /
* | | Hoist update for clarityGeorge Claghorn2018-02-202-8/+8
* | | Undocument ActiveStorage::IdentificationGeorge Claghorn2018-02-201-1/+1
* | | Correct Range header syntaxGeorge Claghorn2018-02-201-1/+1
* | | Merge pull request #32026 from bogdanvlviv/improve-30941Rafael França2018-02-206-39/+69
|\ \ \
| * | | Fix error message about unknown `ActiveJob` argument serializerbogdanvlviv2018-02-172-2/+2
| * | | Fix docs of ActiveJob custom argument serializersbogdanvlviv2018-02-173-36/+35
| * | | Add argument serializer `TimeWithZoneSerializer`bogdanvlviv2018-02-173-1/+32
* | | | Merge pull request #32062 from bogdanvlviv/test_mini_magick_gem_when_skip_act...Yuji Yaginuma2018-02-201-8/+9
|\ \ \ \
| * | | | Ensure that `mini_magick` is absent after `rails new` with `--skip-active-sto...bogdanvlviv2018-02-201-8/+9
|/ / / /
* | | | Merge pull request #26743 from mtsmfm/remove-unicode-tableRafael França2018-02-194-439/+15
|\ \ \ \
| * | | | Remove `AS::Multibyte`'s unicode tableFumiaki MATSUSHIMA2018-02-204-439/+15
|/ / / /
* | | | Merge pull request #32032 from utilum/method_redefinedAndrew White2018-02-191-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Avoid method_redefined warnings in RouteSet::NamedRouteCollectionutilum2018-02-191-2/+2
* | | | Merge pull request #32054 from rails/fix-generation-of-empty-cspAndrew White2018-02-194-69/+73
|\ \ \ \ | |/ / / |/| | |
| * | | Remove trailing semi-colon from CSPAndrew White2018-02-193-39/+39
| * | | Don't accidentally create an empty CSPAndrew White2018-02-192-3/+33
| * | | Revert "Merge pull request #32045 from eagletmt/skip-csp-header"Andrew White2018-02-193-31/+5
* | | | Merge pull request #32052 from rails/fix-country-zones-with-multiple-mappingsAndrew White2018-02-193-2/+31
|\ \ \ \ | |/ / / |/| | |
| * | | Return all mappings for a timezone id in `country_zones`Andrew White2018-02-193-2/+31
|/ / /
* | | Merge pull request #32051 from dixitp012/rubocop_single_spaceRyuta Kamizono2018-02-191-1/+1
|\ \ \
| * | | rubocop single space after assignmentDixit Patel2018-02-191-1/+1
|/ / /