aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Don't call `scope.eager_loading?` when `reflection_scope.where_clause` is emptyRyuta Kamizono2017-09-021-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | If `reflection_scope.where_clause` is empty, `scope` isn't changed. So `scope.eager_loading?` is always false.
* | | | | Merge pull request #30503 from yahonda/bump_postgresql_and_ruby_versionsRyuta Kamizono2017-09-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Bump PostgreSQL version to the latest version 9.6 at Travis CI
| * | | | | Bump PostgreSQL version to the latest version 9.6 at Travis CIYasuo Honda2017-09-011-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Travis CI new default Ubuntu Trusty supports 9.6 https://docs.travis-ci.com/user/database-setup/#Using-a-different-PostgreSQL-Version
* | | | | Merge pull request #30499 from yahonda/diag_floatRyuta Kamizono2017-09-022-9/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Remove unnecessary `to_i` for old sqlite3 adapter
| * | | | sqlite3 adapter returns integer value which used to be stringYasuo Honda2017-09-012-9/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `to_i` was added for SQLite3 adapter which did not handle number but sqlite3 gem already supports it then `to_i` is unnecessary. else condition is kept for adapters which return string, i.e. mysql(not mysql2) and sqlserver. Renamed `test_cache_does_not_wrap_string_results_in_arrays` to `test_cache_does_not_wrap_results_in_arrays` to explain the current behavior. most of adapters return integer, not only string. * Refer these commits: "future proofing the sqlite3 adapter code" https://github.com/rails/rails/commit/beda2d43d6ac5c3435fc2fba0cbd108c20fe1c67 "Refactor calculation test to remove unneeded SQLite special case." https://github.com/rails/rails/commit/47d568ed3fc701934ebe80b276f3d8bf6951c93f "no need to to_i, sqlite does that for us" https://github.com/rails/rails/commit/6cf44a1bd64ba10497742d70ad78fe68faa16e99
* | | | Merge pull request #29850 from yahonda/test_with_mariadb_102_on_trustyRyuta Kamizono2017-09-012-1/+5
|\ \ \ \ | | | | | | | | | | CI with the latest stable(GA) version of MariaDB 10.2
| * | | | Skip `test_remove_column_with_multi_column_index`Yasuo Honda2017-09-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when tested with MariaDB 10.2.8 or higher Refer #30485 https://mariadb.com/kb/en/the-mariadb-library/alter-table/#drop-column-if-exists-col_name-cascaderestrict > MariaDB starting with 10.2.8 > Dropping a column that is part of a multi-column UNIQUE constraint is not permitted.
| * | | | CI with the latest stable(GA) version of MariaDB 10.2Yasuo Honda2017-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | - Travis CI is migrating Ubuntu version to Trusty - MariaDB 10.2 is supported on Ubuntu Trusty
* | | | | `add_reference` should respect column position for both reference id and ↵Ryuta Kamizono2017-09-012-1/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | type columns Fixes #30496.
* | | | Remove unused requireRyuta Kamizono2017-09-011-2/+0
| | | | | | | | | | | | | | | | This is no longer used since 79a5ea9eadb4d43b62afacedc0706cbe88c54496.
* | | | :warning: assigned but unused variable - messageAkira Matsuda2017-09-011-6/+6
| | | |
* | | | Unused variablesAkira Matsuda2017-09-011-2/+2
| | | |
* | | | Hash#transform_keys is in Ruby 2.5+Akira Matsuda2017-09-011-2/+2
| | | | | | | | | | | | | | | | since r59328
* | | | Suppress "unused variable" in Ruby 2.5Akira Matsuda & yui-knk2017-09-011-3/+4
| | | |
* | | | double assign is no longer an effective workaround for unused variable warningAkira Matsuda2017-09-011-1/+1
| | | | | | | | | | | | | | | | `def a() x = x = 1; end` warns since Ruby 2.5 (r59585)
* | | | Merge pull request #30492 from y-yagi/remove_neeless_silence_warningsRyuta Kamizono2017-09-011-4/+1
|\ \ \ \ | | | | | | | | | | Remove needless `silence_warnings`
| * | | | Remove needless `silence_warnings`yuuji.yaginuma2017-09-011-4/+1
| | | | | | | | | | | | | | | | | | | | Since ff30db1, warning is not show.
* | | | | Merge pull request #29233 from matthewd/redefine-methodMatthew Draper2017-09-0118-67/+98
|\ \ \ \ \ | | | | | | | | | | | | Clarify intentions around method redefinitions
| * | | | | Self-alias doesn't suppress the warning on Ruby 2.2Matthew Draper2017-09-011-8/+17
| | | | | |
| * | | | | Clarify intentions around method redefinitionsMatthew Draper2017-09-0118-67/+89
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use remove_method or remove_possible_method just before a new definition: at best the purpose is unclear, and at worst it creates a race condition. Instead, prefer redefine_method when practical, and silence_redefinition_of_method otherwise.
* | | | | Have attachments touch their recordsGeorge Claghorn2017-08-311-1/+1
| | | | |
* | | | | Merge pull request #30490 from ↵Richard Schneeman2017-08-311-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/fix_cant_modify_forzen_string_error_in_XmlMini_JDOM Fix `can't modify frozen String` error in `XmlMini_JDOM`
| * | | | | Fix `can't modify frozen String` error in `XmlMini_JDOM`yuuji.yaginuma2017-09-011-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, `XmlMini_JDOM` raises an error as follwing: ``` RuntimeError: can't modify frozen String org/jruby/RubyString.java:2264:in `concat' activesupport/lib/active_support/xml_mini/jdom.rb:177:in `block in empty_content?' org/jruby/RubyRange.java:485:in `each' activesupport/lib/active_support/xml_mini/jdom.rb:174:in `empty_content?' activesupport/lib/active_support/xml_mini/jdom.rb:86:in `collapse' activesupport/lib/active_support/xml_mini/jdom.rb:66:in `merge_element!' activesupport/lib/active_support/xml_mini/jdom.rb:84:in `block in collapse' org/jruby/RubyRange.java:485:in `each' activesupport/lib/active_support/xml_mini/jdom.rb:82:in `collapse' activesupport/lib/active_support/xml_mini/jdom.rb:66:in `merge_element!' activesupport/lib/active_support/xml_mini/jdom.rb:51:in `parse' activesupport/lib/active_support/xml_mini.rb:101:in `parse' ``` We already have tests about `XmlMini_JDOM`. But it is not running in CI. https://github.com/rails/rails/blob/master/activesupport/test/xml_mini/jdom_engine_test.rb
* | | | | Merge pull request #30486 from rosa/ignore-deleted-gcs-files-on-deletionGeorge Claghorn2017-08-311-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Ignore files already deleted on GCS file deletions
| * | | | Ignore files already deleted on GCS file deletionsRosa Gutierrez2017-08-311-1/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relying on the GET request issued first to fetch the file we want to delete is not enough to avoid this error. If the file is deleted after our GET request but before the DELETE request we'll get a NotFound error that after all means that the file is already deleted, so it can be safely ignored.
* | | | Merge pull request #30481 from Persola/masterRyuta Kamizono2017-08-311-1/+1
|\ \ \ \ | |/ / / |/| | | In Action View Overview guide, remove reference to custom helpers [ci skip]
| * | | In Action View Overview guide, remove reference to custom helpersLuke Persola2017-08-301-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #30323 from yhirano55/support_multiple_version_for_gem_methodMatthew Draper2017-08-313-9/+25
|\ \ \ \ | | | | | | | | | | Support multiple versions arguments for `gem` method of Generators
| * | | | Support multiple versions arguments for `gem` method of GeneratorsYoshiyuki Hirano2017-08-193-9/+25
| | | | |
* | | | | Merge pull request #30377 from keepcosmos/delegate-missing-methodsMatthew Draper2017-08-312-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Delegate :rindex, :slice, :rotate(missing) to 'records'
| * | | | | Delegate :rindex, :slice, :rotate to 'records'keepcosmos2017-08-242-4/+4
| | | | | |
* | | | | | Merge pull request #30392 from koic/unify_source_control_keep_file_nameMatthew Draper2017-08-312-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Unify the internal source control .keep file name
| * | | | | | Unify the internal source control .keep file nameKoichi ITO2017-08-242-0/+0
| | | | | | |
* | | | | | | Merge pull request #30425 from ↵Matthew Draper2017-08-311-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wassimk/WAM-update-rubocop-to-latest-in-code-climate Run CodeClimate with the latest Rubocop
| * | | | | | | Run latest Rubocop in CodeClimateWassim Metallaoui2017-08-261-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #30477 from yhirano55/update_rdoc_mainMatthew Draper2017-08-311-42/+60
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Update RDOC_MAIN.rdoc
| * | | | | | | Update RDOC_MAIN.rdoc [ci skip]Yoshiyuki Hirano2017-08-311-42/+60
| | | | | | | |
* | | | | | | | Merge pull request #29964 from gwincr11/cg-partial-cachingEileen M. Uchitelle2017-08-301-0/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add documentation about template partial caching
| * | | | | | | | Add documentation about template partial cachingCory Gwin @gwincr112017-08-301-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivation: - #29423 surfaced some confusion about how template caching works when using partials across files with different mime types. This doc attempts to explain how this can be accomplished.
* | | | | | | | | Merge pull request #30462 from ↵Ryuta Kamizono2017-08-304-2/+37
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/fix_cant_modify_forzen_string_error_in_db_tasks Fix `can't modify frozen String` error in `DatabaseTasks`
| * | | | | | | | | Fix `can't modify frozen String` error in `DatabaseTasks`yuuji.yaginuma2017-08-304-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, `db:structure:dump` task raises an error as follwing: ``` can't modify frozen String activerecord/lib/active_record/tasks/sqlite_database_tasks.rb:77:in `run_cmd_error' activerecord/lib/active_record/tasks/sqlite_database_tasks.rb:72:in `run_cmd' activerecord/lib/active_record/tasks/sqlite_database_tasks.rb:52:in `structure_dump' activerecord/lib/active_record/tasks/database_tasks.rb:219:in `structure_dump' activerecord/lib/active_record/railties/databases.rake:279:in `block (3 levels) in <main>' railties/lib/rails/commands/rake/rake_command.rb:23:in `block in perform' railties/lib/rails/commands/rake/rake_command.rb:20:in `perform' railties/lib/rails/command.rb:48:in `invoke' railties/lib/rails/commands.rb:18:in `<main>' ```
* | | | | | | | | | RefactorGeorge Claghorn2017-08-291-12/+10
|/ / / / / / / / /
* | | | | | | | | Merge pull request #30460 from yhirano55/update_activejob_docRyuta Kamizono2017-08-301-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update activejob doc [ci skip]
| * | | | | | | | | Update activejob doc [ci skip]Yoshiyuki Hirano2017-08-301-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Fix replacing a singular attachmentGeorge Claghorn2017-08-294-7/+50
| | | | | | | | |
* | | | | | | | | Merge pull request #30457 from yhirano55/update_action_mailer_docRyuta Kamizono2017-08-303-8/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update Action Mailer doc [ci skip]
| * | | | | | | | | Update Action Mailer doc [ci skip]Yoshiyuki Hirano2017-08-303-8/+8
| |/ / / / / / / /
* | | | | | | | | Merge pull request #30456 from yhirano55/update_activestorage_docsRyuta Kamizono2017-08-304-9/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Update Active Storage docs [ci skip]
| * | | | | | | | Update Active Storage docs [ci skip]Yoshiyuki Hirano2017-08-304-9/+17
|/ / / / / / / /
* | | | | | | | Use YAML syntax highlight for `config/locales/en.yml` [ci skip]Ryuta Kamizono2017-08-291-1/+1
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-21 11:08:47 +0000