aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29285 from SamSaffron/remove_therubyracerGuillermo Iguaran2017-05-304-4/+4
|\ | | | | Replace therubyracer with mini_racer
| * Replace therubyracer with mini_racerSam2017-05-304-4/+4
|/
* Add next occur and previous occurred day of week API (#26600)Shota Iguchi2017-05-303-0/+42
|
* Add an extra test showing why collections are cachedMatthew Draper2017-05-301-0/+7
| | | | | The assert_same above obviously guarantees this will pass, but this seems less likely to be deleted just because the implementation changed.
* Merge pull request #29098 from kamipo/fix_association_with_extension_issuesMatthew Draper2017-05-3012-34/+64
|\ | | | | | | Fix association with extension issues
| * Extract `default_extensions` to avoid `klass.all`Ryuta Kamizono2017-05-302-1/+9
| | | | | | | | | | As @matthewd's suggestion, if `klass` has no default scope, it will more faster.
| * Refactor `default_scoped` to avoid creating extra relation and mergingRyuta Kamizono2017-05-281-7/+2
| |
| * Cache the association proxy objectRyuta Kamizono2017-05-283-4/+13
| | | | | | | | | | | | | | | | | | | | Some third party modules expects that association returns same proxy object each time (e.g. for stubbing collection methods: https://github.com/rspec/rspec-rails/issues/1817). So I decided that cache the proxy object and reset scope in the proxy object each time. Related context: https://github.com/rails/rails/commit/c86a32d7451c5d901620ac58630460915292f88b#commitcomment-2784312
| * Fix association with extension issuesRyuta Kamizono2017-05-289-26/+44
| | | | | | | | | | | | | | | | This fixes the following issues. * `association_scope` doesn't include `default_scope`. Should use `scope` instead. * We can't use `method_missing` for customizing existing method. * We can't use `relation_delegate_class` for sharing extensions. Should extend per association.
* | Merge pull request #29273 from ↵Rafael França2017-05-294-15/+15
|\ \ | | | | | | | | | | | | kamipo/deserialize_raw_value_from_database_for_json Deserialize a raw value from the database in `changed_in_place?` for `AbstractJson`
| * | Deserialize a raw value from the database in `changed_in_place?` for ↵Ryuta Kamizono2017-05-304-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | `AbstractJson` Structured type values sometimes caused representation problems (keys sort order, spaces, etc). A raw value from the database should be deserialized (normalized) to prevent the problems.
* | | Merge pull request #29278 from ↵Rafael França2017-05-292-1/+11
|\ \ \ | | | | | | | | | | | | | | | | kamipo/fix_uuid_column_with_null_true_and_default_nil Fix UUID column with `null: true` and `default: nil`
| * | | Fix UUID column with `null: true` and `default: nil`Ryuta Kamizono2017-05-302-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `quote_default_expression` can be passed nil value when `null: true` and `default: nil`. This addressed in that case. Fixes #29222.
* | | | Merge pull request #29279 from pvalena/utf8_in_Secrets_testRafael França2017-05-292-2/+2
|\ \ \ \ | | | | | | | | | | Do not use UTF8 in test SecretsCommandTest#test_edit_secrets
| * | | | Do not use UTF8 in test SecretsCommandTest#test_edit_secretsPavel Valena2017-05-302-2/+2
| | | | |
* | | | | Merge pull request #29275 from koic/bump_rubocop_0_49_1Rafael França2017-05-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Bump RuboCop to 0.49.1
| * | | | | Bump RuboCop to 0.49.1Koichi ITO2017-05-301-1/+1
| | |/ / / | |/| | |
* | | | | Grammar fixesJon Moss2017-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Fix indentation + remove blank lineJon Moss2017-05-291-4/+4
| |/ / / |/| | | | | | | | | | | [ci skip]
* | | | Add backticksJon Moss2017-05-291-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Grammar fixesJon Moss2017-05-291-2/+3
|/ / / | | | | | | | | | [ci skip]
* | | Add missing "not" in the doc for `assert_no_changes` [ci skip]Ryuta Kamizono2017-05-301-1/+1
| | |
* | | Remove extra block for `assert_changes` [ci skip]Ryuta Kamizono2017-05-301-1/+1
| | |
* | | Merge pull request #29191 from ↵Kasper Timm Hansen2017-05-292-6/+6
|\ \ \ | |/ / |/| | | | | | | | bogdanvlviv/pass_params_filename_lineno_to_class_eval Pass params __FILE__ and __LINE__ + 1 if class_eval with <<
| * | Pass params __FILE__ and __LINE__ + 1 if class_eval with <<bogdanvlviv2017-05-292-6/+6
| | |
* | | Merge pull request #29151 from onemanstartup/jquery_slim_fixGuillermo Iguaran2017-05-291-1/+1
|\ \ \ | | | | | | | | Check for jQuery ajax
| * | | Check for jQuery ajaxDmitriy Plekhanov2017-05-191-1/+1
| | | | | | | | | | | | jQuery slim version doesn't have ajax, so if a person include this version ajaxFilter raises error.
* | | | Merge pull request #29248 from yawboakye/rename-should-rename-table-pkeyGuillermo Iguaran2017-05-292-4/+28
|\ \ \ \ | | | | | | | | | | `rename_table` should rename primary key index name
| * | | | `rename_table` renames primary key index nameYaw Boakye2017-05-292-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formerly, `rename_table` only renamed primary key index name if the column's data type was sequential (serial, etc in PostgreSQL). The problem with that is tables whose primary keys had other data types (e.g. UUID) maintained the old primary key name. So for example, if the `cats` table has a UUID primary key, and the table is renamed to `felines`, the primary key index will still be called `cats_pkey` instead of `felines_pkey`. This PR corrects it.
* | | | | Add option for class_attribute default (#29270)David Heinemeier Hansson2017-05-2947-161/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow a default value to be declared for class_attribute * Convert to using class_attribute default rather than explicit setter * Removed instance_accessor option by mistake * False is a valid default value * Documentation
* | | | | Merge pull request #26628 from mjhoy/fix-number-to-human-25742Eileen M. Uchitelle2017-05-295-30/+79
|\ \ \ \ \ | | | | | | | | | | | | round before calculating exponent in number_to_human_converter
| * | | | | number_to_human_converter: round before calculating exponentMichael Hoy2017-03-162-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | fixes #25664
| * | | | | number_to_rounded_converter: extract rounding logicMichael Hoy2017-03-163-26/+71
| | | | | |
* | | | | | Doh. We are doing this on secrets:setup. Revert "Ignore the encrypted ↵David Heinemeier Hansson2017-05-291-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | secrets key file that is created by rails secrets:setup" This reverts commit 75500476eb7e953a06cc64e67ecc57b13ef8cc99.
* | | | | | Merge pull request #29266 from ojiry/add-elm-option-to-generator-descEileen M. Uchitelle2017-05-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Add elm option of webpack to generator description
| * | | | | | Add elm option of webpack to generator descriptionRyoji Yoshioka2017-05-291-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #29264 from gsamokovarov/assert-changes-listingMatthew Draper2017-05-291-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | List assert_{,no_}changes in the testing guide
| * | | | | | List assert_{,no_}changes in the testing guideGenadi Samokovarov2017-05-291-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This lists the `assert_changes` and `assert_no_changes` methods in the guides. [ci skip]
* | | | | | Merge pull request #29265 from koic/remove_redundant_test_assertionMatthew Draper2017-05-291-6/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove a redundant test assertion
| * | | | | | Remove a redundant test assertionKoichi ITO2017-05-291-6/+0
| |/ / / / /
* / / / / / Ignore the encrypted secrets key file that is created by rails secrets:setupDavid Heinemeier Hansson2017-05-291-0/+3
|/ / / / /
* | | | | Merge pull request #29208 from ↵Guillermo Iguaran2017-05-283-2/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/default_env_fall_back_to_default_env_when_rails_env_or_rack_env_is_empty_string `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is an empty string
| * | | | | `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is ↵Ryuta Kamizono2017-05-253-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an empty string Follow up of #27399.
* | | | | | Merge pull request #29262 from ↵Guillermo Iguaran2017-05-283-2/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/deprecate_passing_arguments_with_block_to_count_and_sum Deprecate passing arguments and block at the same time to `count` and `sum` in `ActiveRecord::Calculations`
| * | | | | | Deprecate passing arguments and block at the same time to `count` and `sum` ↵Ryuta Kamizono2017-05-293-2/+36
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in `ActiveRecord::Calculations` `select`, `count`, and `sum` in `Relation` are also `Enumerable` method that can be passed block. `select` with block already doesn't take arguments since 4fc3366. This is follow up of that.
* | | | | | Merge pull request #29258 from koic/remove_redundant_command_recorder_testMatthew Draper2017-05-291-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove a redundant test case of command_recorder_test
| * | | | | | Remove a redundant test case of command_recorder_testKoichi ITO2017-05-291-5/+0
| | | | | | |
* | | | | | | Merge pull request #29257 from ↵Kasper Timm Hansen2017-05-281-3/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clupprich/remove-action-dispatch-callbacks-to-prepare-mention Remove mentions of deprecated callbacks on ActionDispatch::Callbacks
| * | | | | | | Remove mentions of deprecated callbacks on ActionDispatch::CallbacksChristoph Lupprich2017-05-281-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Callbacks.to_prepare was removed in #27587 [ci skip]
* | | | | | | | Merge pull request #29146 from y-yagi/fix_29138Kasper Timm Hansen2017-05-282-2/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Correctly set user_supplied_options when there is no whitespace in option specification
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 05:32:33 +0000