aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not eager load ActiveRecord::BaseRafael Mendonça França2017-08-036-22/+6
| | | | Everything inside the app directory of a engine is autoload/eager loaded automatically so we don't need to require them.
* Merge branch 'active-storage-import' of github.com:rails/rails into ↵David Heinemeier Hansson2017-08-035-7/+85
|\ | | | | | | active-storage-import
| * Remove duplicated convert_direct_upload_option_to_urlRafael Mendonça França2017-08-032-7/+4
| | | | | | | | FormHelper includes FormTagHelper so we don't need to define two methods
| * Refactor convert_direct_upload_option_to_urlRafael Mendonça França2017-08-032-3/+35
| | | | | | | | Also make sure file_field doesn't mutate the original options passed in.
| * Make sure Action View doesn't break with Active StorageRafael Mendonça França2017-08-033-1/+50
| | | | | | | | | | When Active Storage is not loaded and direct_upload is used on file_field_tag we should not raise an exception.
* | Active Storage routes are now part of the default routesDavid Heinemeier Hansson2017-08-031-9/+37
|/ | | | It's worth considering whether we should hide these by default, but I'm kinda thinking no. It's very reasonable that someone would want to call these directly, so they should be documented.
* Same issue from AR getting loaded earlierDavid Heinemeier Hansson2017-08-031-3/+3
| | | | cc @rafaelfranca
* Including new default classes in loading testDavid Heinemeier Hansson2017-08-031-3/+3
|
* Active Storage loads AR earlier to extend it so require env laterDavid Heinemeier Hansson2017-08-031-3/+7
|
* There is no reason to single line methods hereRafael Mendonça França2017-08-031-4/+12
| | | | | I know those methods are unlikely to change but having one line method is hard to read and also hard to modify.
* Generating the app is where the exception is now raisedDavid Heinemeier Hansson2017-08-031-1/+1
|
* Can't initialize a message verifier without a key baseDavid Heinemeier Hansson2017-08-031-1/+3
|
* Merge pull request #30053 from ffmike/patch-2Richard Schneeman2017-08-031-1/+2
|\ | | | | Add Azure gems to README
| * Tweak requiresMike Gunderloy2017-08-021-1/+1
| | | | | | Omit azure-core (it's required by azure-storage), remove require:false to match other points.
| * Use release azure-core gemMike Gunderloy2017-08-021-1/+1
| |
| * Update README.mdMike Gunderloy2017-08-021-1/+1
| |
| * Add Azure gems to READMEMike Gunderloy2017-08-021-1/+2
|/
* Merge pull request #30046 from ↵Rafael França2017-08-0217-28/+27
|\ | | | | | | | | kamipo/fix_string_literals_violations_for_active_storage Fix `Style/StringLiterals` violations for Active Storage
| * Fix `Style/StringLiterals` violations for Active StorageRyuta Kamizono2017-08-0317-28/+27
|/ | | | | | | | | | | | ``` % be rubocop -a --only Style/StringLiterals activestorage Inspecting 74 files ........................................CCCCCCCCCC.C........CC.......C.C.. (snip) 74 files inspected, 31 offenses detected, 31 offenses corrected ```
* Merge branch 'master' into active-storage-importDavid Heinemeier Hansson2017-08-0238-110/+211
|\
| * Merge pull request #29958 from znz/file-nullMatthew Draper2017-08-025-5/+5
| |\ | | | | | | Use File::NULL instead of "/dev/null"
| | * Use File::NULL instead of "/dev/null"Kazuhiro NISHIYAMA2017-07-315-5/+5
| | |
| * | Merge pull request #29914 from ↵Matthew Draper2017-08-023-19/+30
| |\ \ | | | | | | | | | | | | | | | | kamipo/relation_merger_should_not_fill_empty_values `Relation::Merger` should not fill `values` with empty values
| | * | `get_value` and `set_value` in `Relation` are no longer used externallyRyuta Kamizono2017-07-251-9/+10
| | | |
| | * | `Relation::Merger` should not fill `values` with empty valuesRyuta Kamizono2017-07-252-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `Relation#merge` will almost fill `values` with empty values (e.g. `other.order_values` is always true, it should be `other.order_values.any?`). This means that `Relation#merge` always changes `values` even if actually `values` is nothing changed. This behavior will makes `Relation#empty_scope?` fragile. So `Relation#merge` should avoid unnecessary changes.
| * | | Merge pull request #29842 from kamipo/fix_find_by_with_rangeMatthew Draper2017-08-023-4/+12
| |\ \ \ | | | | | | | | | | Fix `find_by` with range conditions
| | * | | Fix `find_by` with range conditionsRyuta Kamizono2017-07-203-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | `StatementCache` doesn't support range conditions. So we need to through the args to `FinderMethods#find_by` if range value is passed.
| * | | | Merge pull request #29271 from rails/unlock-minitestKasper Timm Hansen2017-08-0222-75/+105
| |\ \ \ \ | | | | | | | | | | | | Unlock minitest for Rails' test suite
| | * \ \ \ Merge remote-tracking branch 'origin/master' into unlock-minitestRafael Mendonça França2017-08-012023-2034/+16833
| | |\ \ \ \
| | * \ \ \ \ Merge pull request #29995 from y-yagi/fix_test_runner_outputKasper Timm Hansen2017-07-302-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Fix test runner's output
| | | * | | | | Fix test runner's outputyuuji.yaginuma2017-07-302-2/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output changed due to specification change of `SummaryReporter#aggregated_results` in minitest 5.10.2. In my opinion, that should fix rails's test runner(proceeding with #29354). However, we still need discussion and the fix itself is minor, so I think that we can fix only the test first.
| | * | | | | Merge pull request #29823 from y-yagi/fix_record_not_unique_errorKasper Timm Hansen2017-07-171-20/+20
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Move `reset_pk_sequence!` test to `AdapterTestWithoutTransaction`
| | | * | | | | Move `reset_pk_sequence!` test to `AdapterTestWithoutTransaction`yuuji.yaginuma2017-07-171-20/+20
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If execute PostgreSQL test with specifying 53853 for seed, the following error will occur. ``` 1) Error: TransactionTest#test_restore_custom_primary_key_after_rollback: ActiveRecord::RecordNotUnique: PG::UniqueViolation: ERROR: duplicate key value violates unique constraint "movies_pkey" DETAIL: Key (movieid)=(2) already exists. : INSERT INTO "movies" ("name") VALUES ($1) RETURNING "movieid" ``` travis is here https://travis-ci.org/rails/rails/jobs/254095918 As with #29287, it seems like a problem that the value of primary key obtained from connection gets different. Therefore, fixed to execute that test within transaction.
| | * | | | | Merge pull request #29808 from ↵Kasper Timm Hansen2017-07-161-0/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/reset_colun_information_after_schema_changed Reset column information after schema changed
| | | * | | | | Reset column information after schema changedyuuji.yaginuma2017-07-161-0/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following failures. https://travis-ci.org/rails/rails/jobs/253990014
| | * | | | | Merge pull request #29380 from ↵Kasper Timm Hansen2017-07-151-0/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/insert_environment_value_to_table_before_check_environment Insert environment value to `InternalMetadata` table before check environment
| | | * | | | | Insert environment value to `InternalMetadata` after recreating the tableyuuji.yaginuma2017-06-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes `ActiveRecord::DatabaseTasksUtilsTask#test_raises_an_error_when_called_with_protected_environment` test fails. https://travis-ci.org/rails/rails/jobs/238861562 https://travis-ci.org/rails/rails/jobs/239950092 There seems to be an error because `environment` value is not exist. This is because did not set the environment after recreating the table in `SchemaMigrationsTest#test_initializes_internal_metadata_for_encoding_utf8mb4`. Therefore, we create value after the test to maintain the original state.
| | * | | | | | Stupid empty line added after merge.Kasper Timm Hansen2017-07-151-1/+0
| | | | | | | |
| | * | | | | | Bump minitest; Use double quotesKasper Timm Hansen2017-07-152-2/+2
| | | | | | | |
| | * | | | | | Merge branch 'master' into unlock-minitestKasper Timm Hansen2017-07-151037-3778/+6367
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #29479 from yahonda/unlock-minitest_mysql_booleanRafael França2017-06-161-0/+7
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | Add teardown to reset_connection at MysqlTypeLookupTest
| | | * | | | | | Add teardown to reset_connection at MysqlTypeLookupTestYasuo Honda2017-06-071-0/+7
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to address `Mysql2BooleanTest#test_column_type_without_emulated_booleans` failure
| | * | | | | | Merge pull request #29359 from y-yagi/load_schema_before_assertionMatthew Draper2017-06-061-0/+6
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Load schema before assertion
| | | * | | | | | Load schema before assertionyuuji.yaginuma2017-06-061-0/+6
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, test fails because the load schema when pluck is executed. Steps to reproduce: ``` bin/test -a postgresql -w --seed 61689 test/cases/*test.rb -n "/^(?:InheritanceComputeTypeTest#(?:test_inheritance_new_with_subclass_as_default)|CalculationsTest#(?:test_pluck_loaded_relation))$/" # Running: .F Failure: CalculationsTest#test_pluck_loaded_relation [/home/yaginuma/program/rails/master_y_yagi/rails/activerecord/test/cases/calculations_test.rb:722]: 1 instead of 0 queries were executed. Queries: SELECT c.relname FROM pg_class c LEFT JOIN pg_namespace n ON n.oid = c.relnamespace WHERE n.nspname = ANY (current_schemas(false)) AND c.relname = 'companies' AND c.relkind IN ('r','v','m'). Expected: 0 Actual: 1 bin/test test/cases/calculations_test.rb:7 ```
| | * | | | | | Merge pull request #29341 from y-yagi/explicitly_clear_type_map_before_run_testMatthew Draper2017-06-042-10/+12
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Explicitly clear type map before run `test_only_reload_type_map_once_for_every_unknown_type`
| | | * | | | | | Explicitly clear type map before run ↵yuuji.yaginuma2017-06-032-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `test_only_reload_type_map_once_for_every_unknown_type` Currently, the following test fails. ``` bin/test -a sqlite3_mem --seed 37473 test/cases/relation_test.rb ``` This is due to reset connection in `test_respond_to_for_non_selected_element` postprocessing. This reset is added with #29332 for `test_only_reload_type_map_once_for_every_unknown_type`. Since the above test expects the type map to be empty at the time of test run, I think that it is better to empty the type map before test run.
| | * | | | | | | Reset the fixture cache after (re)loading the schemaMatthew Draper2017-06-031-0/+2
| | |/ / / / / /
| | * | | | | | Merge pull request #29332 from yahonda/unlock-minitest_unknown_type_fixRafael França2017-06-021-0/+5
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Clean up `type_map` at the end of test_respond_to_for_non_selected_element
| | | * | | | | | Clean up `type_map` at the end of test_respond_to_for_non_selected_elementYasuo Honda2017-06-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `test_only_reload_type_map_once_for_every_unknown_type` expects no one already registers unknown OID to `type_map`. However, `test_respond_to_for_non_selected_element` registers it and does not clean up it. Addresses #29331 at unlock-minitest branch
| | * | | | | | | Merge branch 'master' into unlock-minitestRafael Mendonça França2017-06-0268-338/+459
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-19 14:06:29 +0000