aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #36309 from alexandergraul/number_to_human_size_examplesRyuta Kamizono2019-05-212-2/+2
|\ \ | | | | | | Correct human file size examples [ci skip]
| * | Correct human file size examples [ci skip]Alexander Graul2019-05-202-2/+2
|/ / | | | | | | | | | | | | | | | | | | The `number_to_human_size` helpers in Action View and Active Support calculate the "human size" with a base of 1024. The examples should reflect that so they don't confuse the reader. The updated documentations use the values from: helper.number_to_human_size(1500)
* | Merge pull request #36306 from cseelus/responsive-rescues-layoutKasper Timm Hansen2019-05-201-4/+9
|\ \ | | | | | | Make rescues layout responsive
| * | Make rescues layout responsiveChris Seelus2019-05-201-4/+9
| | |
* | | Merge pull request #36302 from eugeneius/parameters_transform_keys_enumeratorRyuta Kamizono2019-05-203-9/+24
|\ \ \ | |/ / |/| | | | | Return parameters enumerator from transform_keys/!
| * | Return parameters enumerator from transform_keys/!Eugene Kenny2019-05-183-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously calling `ActionController::Parameters#transform_keys/!` without passing a block would return an enumerator for the underlying hash, which was inconsistent with the behaviour when a block was passed: ActionController::Parameters.new(foo: "bar").transform_keys { |k| k } => <ActionController::Parameters {"foo"=>"bar"} permitted: false> ActionController::Parameters.new(foo: "bar").transform_keys.each { |k| k } => {"foo"=>"bar"} An enumerator for the parameters is now returned instead, ensuring that evaluating it produces another parameters object instead of a hash: ActionController::Parameters.new(foo: "bar").transform_keys.each { |k| k } => <ActionController::Parameters {"foo"=>"bar"} permitted: false>
* | | Merge pull request #36304 from kamipo/fix_through_association_with_joinsRyuta Kamizono2019-05-192-17/+19
|\ \ \ | | | | | | | | Implicit through table joins should be appeared before user supplied joins
| * | | Implicit through table joins should be appeared before user supplied joinsRyuta Kamizono2019-05-192-17/+19
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #36293 was an issue for through association with `joins` for a long time, but since #35864 through association with `left_joins` would also be affected by the issue. Implicit through table joins should be appeared before user supplied joins, otherwise loading through association with joins will cause a statement invalid error. Fixes #36293. ``` % ARCONN=postgresql bundle exec ruby -w -Itest test/cases/associations/has_many_through_associations_test .rb -n test_through_association_with_joins Using postgresql Run options: -n test_through_association_with_joins --seed 7116 # Running: E Error: HasManyThroughAssociationsTest#test_through_association_with_joins: ActiveRecord::StatementInvalid: PG::UndefinedTable: ERROR: missing FROM-clause entry for table "posts" LINE 1: ... "comments_posts" ON "comments_posts"."post_id" = "posts"."i... ^ : SELECT "comments".* FROM "comments" INNER JOIN "comments" "comments_posts" ON "comments_posts"."post_id" = "posts"."id" INNER JOIN "posts" ON "comments"."post_id" = "posts"."id" WHERE "posts"."author_id" = $1 rails test test/cases/associations/has_many_through_associations_test.rb:61 Finished in 0.388657s, 2.5730 runs/s, 0.0000 assertions/s. 1 runs, 0 assertions, 0 failures, 1 errors, 0 skips ```
* | | Allow filling in the only rich-text area without a locatorGeorge Claghorn2019-05-192-7/+17
| | |
* | | Prefer Capybara::Node::Element#execute_scriptGeorge Claghorn2019-05-191-4/+1
|/ /
* | Merge pull request #36122 from ↵Gannon McGibbon2019-05-182-0/+69
|\ \ | | | | | | | | | | | | cseelus/respect-operating-system-color-scheme-for-errors Regard operating system color scheme for rescues
| * | Implement dark color scheme for rescues layoutChris Seelus2019-05-182-0/+69
| | |
* | | Merge pull request #36299 from shioimm/rename-hash-to-jarRyuta Kamizono2019-05-181-2/+2
|\ \ \ | | | | | | | | Rename `hash` to `jar` in CookieJar.build
| * | | Rename `hash` to `jar` in CookieJar.buildshioimm2019-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In CookieJar.build, the name `hash` is used as block parameter name for tap method. However, it is actually not hash but a CookieJar's instance. The name `hash` was confusing, so replace with `jar`.
* | | | Merge pull request #36282 from yoones/add-skip-options-to-command-line-guideEileen M. Uchitelle2019-05-181-0/+22
|\ \ \ \ | | | | | | | | | | List available skip options in command line guide
| * | | | List available skip options in command line guide [ci skip]Younes SERRAJ2019-05-151-0/+22
| | |/ / | |/| |
* | | | Merge pull request #36263 from vishaltelangre/add-undefined-acronymEileen M. Uchitelle2019-05-181-2/+2
|\ \ \ \ | | | | | | | | | | [skip ci] Add undefined STI acronym to the heading which is referred under its section
| * | | | [skip ci] Add undefined STI acronym to the heading which is referred under ↵Vishal Telangre2019-05-121-2/+2
| | | | | | | | | | | | | | | | | | | | its section
* | | | | Merge pull request #36296 from jhawthorn/dont_fear_the_reaperAaron Patterson2019-05-181-7/+25
|\ \ \ \ \ | |_|_|/ / |/| | | | Use a single thread for all ConnectionPool Reapers
| * | | | Use a single thread for all ConnectionPool ReapersJohn Hawthorn2019-05-171-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Previously we would spawn one thread per connection pool, which ends up being wasteful for apps with several connection pools.
* | | | | Deduplicate ActionText::RichText embedsGeorge Claghorn2019-05-172-1/+10
| | | | | | | | | | | | | | | | | | | | Fix that an ActiveRecord::RecordNotUnique error would be raised when saving rich-text content with the same file attached multiple times.
* | | | | Merge pull request #36291 from flocela/patch-1Rafael França2019-05-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | typo change
| * | | | | 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
|/ / / / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 23:02:07 +0000