aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* typo changeflocela2019-05-161-1/+1
| | | | In Adding More RESTful Actions, Adding Member Routes: I believe the word 'that' should be added to the sentence, 'Within the block of member routes, each route name specifies the HTTP verb will be recognized.' This results in 'Within the block of member routes, each route name specifies the HTTP verb that will be recognized.'
* S3: permit uploading files larger than 5 GBGeorge Claghorn2019-05-163-6/+69
| | | Use multipart uploads for files larger than 100 MB. Dynamically calculate part size based on total object size and maximum part count.
* Permit running jobs in system testsGeorge Claghorn2019-05-165-67/+11
| | | | | Inherit from ActiveSupport::TestCase instead of ActionDispatch::IntegrationTest. Active Job automatically mixes its test helper into the latter, forcibly setting the test queue adapter before Capybara starts its app server. As a bonus, we no longer need to remove the parts of the ActionDispatch::IntegrationTest API we don’t want to expose.
* Merge pull request #36286 from vishaltelangre/dummy-erb-compiler-fixEileen M. Uchitelle2019-05-162-8/+19
|\ | | | | Fix: DummyCompiler embeds invalid YAML content
| * Fix: DummyCompiler embeds invalid YAML contentVishal Telangre2019-05-152-8/+19
| | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/36285. Follow up of https://github.com/rails/rails/pull/36237.
* | Remove outdated cross-origin redirection testsGeorge Claghorn2019-05-152-55/+0
| |
* | Inline anemic methodsGeorge Claghorn2019-05-151-10/+4
|/
* Merge pull request #36284 from kamipo/fix_eager_loading_with_string_joinsRyuta Kamizono2019-05-153-2/+23
|\ | | | | Fix eager loading associations with string joins not to raise NoMethodError
| * Fix eager loading associations with string joins not to raise NoMethodErrorRyuta Kamizono2019-05-153-2/+23
| | | | | | | | Fixes #34456.
* | edit tweaks to recent patch in configuring guide [ci skip]Xavier Noria2019-05-141-1/+2
| |
* | Merge pull request #36200 from ↵Xavier Noria2019-05-141-0/+6
|\ \ | | | | | | | | | | | | soartec-lab/update_guide_configuring_add_autoloader Added guide for `config.autoloader` [skip ci]
| * | Added guide for `config.autoloader` [skip ci]soartec-lab2019-05-071-0/+6
| | |
* | | shortens a comment [ci skip]Xavier Noria2019-05-141-1/+1
| | | | | | | | | | | | To avoid word wrap in the rendered guide.
* | | Merge pull request #36237 from eileencodes/fix-erb-in-database-yaml-againEileen M. Uchitelle2019-05-142-1/+22
|\ \ \ | | | | | | | | Fix database loading when ERB is single line ternary
| * | | Fix database loading when ERB is single line ternaryeileencodes2019-05-102-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | *sigh* this seems like the never ending bug. I don't love or even like this fix but it does _work_. Rafael suggested using `dummy_key: dummy_value` but unfortunately that doesn't work. So we're left with checking whethere there might be ternary type things in the content and then assuming that we want to replace the line with a key value pair. Technically fixes https://github.com/rails/rails/issues/36088
* | | | Merge pull request #36127 from st0012/fix_non_num_keysGannon McGibbon2019-05-133-9/+47
|\ \ \ \ | | | | | | | | | | Improve nested parameter resolving - continuation of 29888
| * | | | fixed usage of Parameters when a non-numeric key existsL.Fexon2019-05-133-9/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test for non-numeric key in nested attributes test: extra blank line between tests removed test for non-numeric key fixed (by Daniel) Update according to feedback
* | | | | Add ActionDispatch::SystemTestCase#fill_in_rich_text_areaGeorge Claghorn2019-05-1312-1161/+976
| | | | |
* | | | | Merge pull request #36092 from imechemi/update-docGannon McGibbon2019-05-131-0/+7
|\ \ \ \ \ | | | | | | | | | | | | Improve doc for :root option in as_json()
| * | | | | Improve doc for :root option in as_json() [ci skip]Tenzin Chemi2019-05-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove trailing whitespace [ci skip] Reword Root value should be string [ci skip]
* | | | | | Merge pull request #36271 from kamipo/dont_track_implicit_touch_mutationRyuta Kamizono2019-05-133-6/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't track implicit `touch` mutation
| * | | | | | Don't track implicit `touch` mutationRyuta Kamizono2019-05-133-6/+22
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This partly reverts the effect of d1107f4d. d1107f4d makes `touch` tracks the mutation whether the `touch` is occurred by explicit or not. Existing apps expects that the previous changes tracks only the changes which is explicit action by users. I'd revert the implicit `touch` mutation tracking since I'd not like to break existing apps. Fixes #36219.
* | | | | | Merge pull request #36269 from vishaltelangre/fix-ar-config-defaultRyuta Kamizono2019-05-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [skip ci] The default value of config.active_record.collection_cache_versioning without loading Railtie is false
| * | | | | | [skip ci] The default value of ↵Vishal Telangre2019-05-131-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.active_record.collection_cache_versioning without loading Railtie is false Please check https://github.com/rails/rails/pull/36260#discussion_r283266942 for reference. [Vishal Telangre, bogdanvlviv]
* | | | | | Merge pull request #36260 from ↵Eileen M. Uchitelle2019-05-131-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vishaltelangre/active_record-collection_cache_versioning-config-info [skip ci] Add missing info about 'active_record.collection_cache_versioning' configuration
| * | | | | | [skip ci] Add missing info about 'active_record.collection_cache_versioning' ↵Vishal Telangre2019-05-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration References: - https://github.com/rails/rails/commit/4f2ac80d4cdb01c4d3c1765637bed76cc91c1e35 - https://github.com/rails/rails/blob/b1c917ee2fdaa452aeb52904db0d254d85285380/railties/lib/rails/application/configuration.rb#L147-L149
* | | | | | | Merge pull request #36265 from vishaltelangre/patch-13Xavier Noria2019-05-131-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [skip ci] Fix missing punctuation mark and formatting in CHANGELOG
| * | | | | | | [skip ci] Fix missing punctuation mark and formattingVishal Telangre2019-05-131-1/+1
|/ / / / / / /
* | | | | | | adds a blank line [ci skip]Xavier Noria2019-05-131-0/+1
| | | | | | |
* | | | | | | warn about non-eager loaded dirs in zeitwerk:checkXavier Noria2019-05-131-19/+53
| | | | | | |
* | | | | | | Merge pull request #36255 from eugeneius/sqlite_savepoint_supportKasper Timm Hansen2019-05-124-7/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove SQLite version support caveats [ci skip]
| * | | | | | | Remove SQLite version support caveats [ci skip]Eugene Kenny2019-05-124-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since d1a74c1e012ed96f7179e53b9190b7da0a369e11, Active Record requires SQLite version 3.8.0 or greater, so savepoints and partial indexes are always available. That commit also added a runtime version check, so we can remove the minimum version requirement from the internal adapter documentation.
* | | | | | | | Merge pull request #36245 from vishaltelangre/patch-4Vipul A M2019-05-122-4/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] Clarity about embed metadata in signed and encrypted cookie
| * | | | | | | | [ci skip] Clarity about embed metadata in signed and encrypted cookieVishal Telangre2019-05-122-4/+5
| | | | | | | | |
* | | | | | | | | upgrading docs: one file => one constant [ci skip]Xavier Noria2019-05-121-0/+29
| | | | | | | | |
* | | | | | | | | NPM -> npm [ci skip]Xavier Noria2019-05-123-4/+4
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | According to https://www.npmjs.com/.
* | | | | | | | Merge pull request #36073 from itsWill/document_update_counters_on_relationRyuta Kamizono2019-05-121-1/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | document update_counters on relation [ci skip]
| * | | | | | | | document update_counters on relation [ci skip]Guilherme Mansur2019-05-111-1/+13
| | | | | | | | |
* | | | | | | | | Merge pull request #36257 from vipulnsward/sqlite-version-ymlRyuta Kamizono2019-05-122-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update the sqlite db yaml template to match other templates and mention proper supported version
| * | | | | | | | | Update the sqlite db yaml template to match others and mention proper ↵Vipul A M2019-05-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supported version
* | | | | | | | | | Update the 6.0 load_defaults list [ci skip] (#36258)Vipul A M2019-05-111-0/+2
|/ / / / / / / / /
* | | / / / / / / Update Webpacker in Action Text's test dummy appGeorge Claghorn2019-05-1113-564/+443
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #36160 from sharang-d/update-getting-startedVipul A M2019-05-111-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | compilation -> compression [ci skip]
| * | | | | | | | compilation -> compression [ci skip]Sharang Dashputre2019-05-021-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #36251 from vishaltelangre/patch-10Xavier Noria2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ci skip] Clarify that the minimum version of a "gem" is bumped
| * | | | | | | | | [ci skip] Clarify that the minimum version of a "gem" is bumpedVishal Telangre2019-05-121-1/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | The previous sentence does not convey whether the minimum version of SQLite3 is bumped or the minimum version of `sqlite3` gem is bumped.
* | | | | | | | | Merge pull request #36243 from vishaltelangre/patch-1Xavier Noria2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ci skip] Typo: Javascript -> JavaScript
| * | | | | | | | | [ci skip] Typo: Javascript -> JavaScriptVishal Telangre2019-05-111-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #36246 from vishaltelangre/patch-5Xavier Noria2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ci skip] Fix grammar
| * | | | | | | | | [ci skip] Fix grammarVishal Telangre2019-05-111-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ##### Singular `route exists` ##### Plural `routes exist`