aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Temporary disabled using rubygems 2.7.SHIBATA Hiroshi2017-12-221-1/+1
| | | | | RubyGems 2.7 promote bundler-1.16 to default gems. It conflicts Travis environment and user installed bundler.
* Merge pull request #31537 from yhirano55/pass_options_to_rails_blob_urlRafael França2017-12-211-1/+1
|\ | | | | Pass options to rails_blob_url
| * Pass options to rails_blob_urlYoshiyuki Hirano2017-12-221-1/+1
| |
* | Merge pull request #31536 from yhirano55/remove_needless_url_forGeorge Claghorn2017-12-211-1/+1
|\ \ | |/ |/| [ci skip] Remove needless from doc for ActiveStorage::Variant
| * [ci skip] Remove needless from doc for ActiveStorage::VariantYoshiyuki Hirano2017-12-221-1/+1
|/
* Merge pull request #31530 from 6temes/removes_os_specific_dir_separatorGuillermo Iguaran2017-12-201-1/+1
|\ | | | | Removes OS specific directory separator
| * Removes OS specific directory separatorDaniel Lopez2017-12-211-1/+1
|/
* Merge pull request #31520 from yahonda/introduce_frozen_error_classRyuta Kamizono2017-12-208-5/+17
|\ | | | | Handle `FrozenError` if it is available
| * Handle `FrozenError` if it is availableYasuo Honda2017-12-208-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pull request handles `FrozenError` introduced by Ruby 2.5. Refer https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/61131 Since `FrozenError` is a subclass of `RuntimeError` minitest used by master branch can handle it, though it would be better to handle `FrozenError` explicitly if possible. `FrozenError` does not exist in Ruby 2.4 or lower, `frozen_error_class` handles which exception is expected to be raised. This pull request is intended to be merged to master, then backported to `5-1-stable` to address #31508
* | Merge pull request #31521 from zinovyev/fix-mysql-get-lock-bigintRyuta Kamizono2017-12-201-2/+2
|\ \ | | | | | | Fix Illegal parameter data type bigint for operation 'get_lock' error
| * | Fix Illegal parameter data type bigint for operation 'get_lock' errorIvan Zinovyev2017-12-201-2/+2
| | |
* | | Add test case that configure `config.active_support.hash_digest_class`yuuji.yaginuma2017-12-201-0/+18
|/ / | | | | | | Follow up of #31289.
* | Remove passing needless empty string `options` in `create_table`Ryuta Kamizono2017-12-203-7/+4
| | | | | | | | Follow up of #31177.
* | Place args normalization from `left_outer_joins` to `left_outer_joins!`Ryuta Kamizono2017-12-201-4/+2
| | | | | | | | Like other query bang methods.
* | Merge pull request #31519 from ↵Ryuta Kamizono2017-12-203-7/+3
|\ \ | | | | | | | | | | | | eugeneius/verbose_query_logs_new_framework_defaults Remove verbose_query_logs from new_framework_defaults_5_2.rb
| * | Remove verbose_query_logs from new_framework_defaults_5_2.rbEugene Kenny2017-12-203-7/+3
|/ / | | | | | | | | | | | | | | | | | | | | The `app:update` rake task will regenerate `development.rb` so that it contains this option; that means we're currently adding it to existing apps in two places, which is unnecessary and confusing. Also: - Remove inaccurate comment about which stack frames are ignored - Clarify that the feature uses `caller_locations`, not `caller` - Remove unused return value in `extract_callstack`
* | Merge pull request #31177 from ↵Matthew Draper2017-12-205-6/+88
|\ \ | | | | | | | | | | | | albertoalmagro/remove-default-mysql-engine-from-ar-5-2 Remove default ENGINE=InnoDB for Mysql2 adapter
| * | Remove default ENGINE documentation for MySQL and MariaDBAlberto Almagro2017-12-111-2/+1
| | | | | | | | | | | | | | | Removes default ENGINE documentation hint for MySQL and MariaDB as we aren't taking measures to set the default ENGINE anymore.
| * | Remove default ENGINE=InnoDB for Mysql2 adapterAlberto Almagro2017-12-114-4/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit ENGINE=InnoDB was added by default to Mysql2 adapter +create_table+ if no +options+ option was provided. This default ENGINE was lost as soon as something was passed in at +options+ option, making its goal and propagation inconsistent, as the programmer needed to remember including ENGINE=InnoDB when something was passed in. This commit removes default ENGINE as its use isn't needed anymore for current MySQL and MariaDB versions. It adds compatibility support and tests to ensure that default ENGINE is still present for migrations with version 5.1 and before. It also ensures we still dump the ENGINE option to +schema.rb+ in order to avoid inconsistencies.
* | | Fix `count(:all)` to correctly work `distinct` with custom SELECT listRyuta Kamizono2017-12-204-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `count(:all)` with `distinct` doesn't work correctly because SELECT list is always replaced to `*` or primary key in that case even if having custom SELECT list. And also, PostgreSQL has a limitation that ORDER BY expressions must appear in select list for SELECT DISTINCT. Therefore, we should not replace custom SELECT list when using `count(:all)` with `distinct`. Closes #31277.
* | | Merge pull request #31483 from ↵Ryuta Kamizono2017-12-203-9/+60
|\ \ \ | | | | | | | | | | | | | | | | yhirano55/fix_validation_callbacks_on_multiple_context_in_active_model Bugfix: validation callbacks on multiple context
| * | | Fix validation callbacks on multiple contextYoshiyuki Hirano2017-12-203-9/+60
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found a bug that validation callbacks don't fire on multiple context. So I've fixed it. Example: ```ruby class Dog include ActiveModel::Validations include ActiveModel::Validations::Callbacks attr_accessor :history def initialize @history = [] end before_validation :set_before_validation_on_a, on: :a before_validation :set_before_validation_on_b, on: :b after_validation :set_after_validation_on_a, on: :a after_validation :set_after_validation_on_b, on: :b def set_before_validation_on_a; history << "before_validation on a"; end def set_before_validation_on_b; history << "before_validation on b"; end def set_after_validation_on_a; history << "after_validation on a" ; end def set_after_validation_on_b; history << "after_validation on b" ; end end ``` Before: ``` d = Dog.new d.valid?([:a, :b]) d.history # [] ``` After: ``` d = Dog.new d.valid?([:a, :b]) d.history # ["before_validation on a", "before_validation on b", "after_validation on a", "after_validation on b"] ```
* | | Remove outdated comments [ci skip]Ryuta Kamizono2017-12-191-4/+0
| | |
* | | Merge pull request #31492 from prathamesh-sonpatki/rm-assert-nothing-raisedEileen M. Uchitelle2017-12-191-4/+2
|\ \ \ | | | | | | | | assert_nothing_raised not required here, we can assert directly for the actual result
| * | | assert_nothing_raised not required here, we can assert directly for the ↵Prathamesh Sonpatki2017-12-191-4/+2
| | | | | | | | | | | | | | | | actual result
* | | | Quote primary key in the subselect generated by mysql2 adapterRyuta Kamizono2017-12-193-4/+12
| | | | | | | | | | | | | | | | Otherwise it will occur syntax error if primary key is a reserved word.
* | | | Using subselect for `delete_all` with `limit` or `offset`Ryuta Kamizono2017-12-194-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | Arel doesn't support subselect generation for DELETE unlike UPDATE yet, but we already have that generation in connection adapters. We can simply use the subselect generated by that one.
* | | | Using subselect generated by the connection adapter for `update_all` with ↵Ryuta Kamizono2017-12-192-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `offset` Most RDBMS (except SQLite) requires subselect for UPDATE with OFFSET, but Arel doesn't support executable subselect generation for MySQL's UPDATE yet. We need to use the subselect generated by the connection adapter for now, it works well. Fixes #30148.
* | | | Merge pull request #31501 from dixitp012/active_record_basic_guideRyuta Kamizono2017-12-191-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Added Object Relational Mapping wiki link
| * | | | [ci skip] Added Object Relational Mapping wiki linkDixit Patel2017-12-191-1/+1
|/ / / /
* | | | Delete MiniMagick tempfile when transformation failsGeorge Claghorn2017-12-181-1/+7
| | | |
* | | | Merge pull request #31475 from ↵Matthew Draper2017-12-193-4/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | shioyama/reset_column_information_redefine_child_attribute_methods Undefine attribute methods of descendants when resetting column information
| * | | | Add changelog entry for e1ceb10Chris Salzberg2017-12-171-0/+5
| | | | |
| * | | | Undefine attribute methods on all descendants when resetting column infoChris Salzberg2017-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't do this, then we end up with an inconsistent situation where a parent class may e.g. reset column information, but child classes will contine to see attribute methods as already generated, and thus not pick up this new column (falling through to method_missing).
| * | | | Add failing testChris Salzberg2017-12-171-3/+8
| | | | |
* | | | | Implicitly skip bootsnap for `rails new --dev`yuuji.yaginuma2017-12-192-1/+12
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Specifying the `--dev` option is when want to change the codebase, as it is not necessary to cache it. Context: https://github.com/rails/rails/pull/31485#issuecomment-352452653
* | | | Merge pull request #31348 from y-yagi/fix_31283Kasper Timm Hansen2017-12-1813-27/+94
|\ \ \ \ | | | | | | | | | | Raise an error only when `require_master_key` is specified
| * | | | Raise an error only when `require_master_key` is specifiedyuuji.yaginuma2017-12-1813-27/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent errors from being raise in environments where credentials is unnecessary. Context: https://github.com/rails/rails/issues/31283#issuecomment-348801489 Fixes #31283
* | | | | Merge pull request #31497 from aried3r/patch-2Kasper Timm Hansen2017-12-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Update new_framework_defaults_5_2.rb.tt
| * | | | | Update new_framework_defaults_5_2.rb.ttAnton Rieder2017-12-181-1/+1
| | | | | | | | | | | | | | | | | | Be consistent in comments when mentioning AES.
* | | | | | Ensure MiniMagick tempfiles are properly unlinked after image transformationGeorge Claghorn2017-12-181-9/+18
|/ / / / /
* | | | | Merge pull request #31449 from PHedkvist/headless_api_docEileen M. Uchitelle2017-12-181-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Add headless browser support in api docs [ci skip]
| * | | | | Add headless browser support in api docs [ci skip]Pierre Hedkvist2017-12-181-0/+3
| | | | | |
* | | | | | Merge pull request #31485 from y-yagi/skip_bootsnap_optionEileen M. Uchitelle2017-12-184-0/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add `skip_bootsnap` option
| * | | | | | Add `skip_bootsnap` optionyuuji.yaginuma2017-12-164-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `bootsnap` is a useful gem normally. However, `bootsnap` is unnecessary when generating a Rails application to be used only for testing. So I want to control whether use this or not by option.
* | | | | | | Merge pull request #31479 from iamvery/reword-delegate-allow-nil-paragraphEileen M. Uchitelle2017-12-181-5/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Clarify docs for delegate :allow_nil option
| * | | | | | | Clarify docs for delegate :allow_nil optionJay Hayes2017-12-151-5/+2
| | | | | | | |
* | | | | | | | Merge pull request #31490 from eugeneius/hash_digest_class_truncateEileen M. Uchitelle2017-12-184-15/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't include ellipsis in truncated digest output
| * | | | | | | | Don't include ellipsis in truncated digest outputEugene Kenny2017-12-174-15/+7
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `truncate` to limit the length of the digest has the unwanted side effect of adding an ellipsis when the input is longer than the limit. Also: - Don't instantiate a new object for every digest - Rename the configuration option to `hash_digest_class` - Update the CHANGELOG entry to describe how to use the feature
* | | | | | | | Convert non-web image (e.g. PSD) variants to PNGGeorge Claghorn2017-12-183-12/+53
| |_|_|/ / / / |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 07:24:05 +0000