aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #31568 from bogdanvlviv/update-action_view_overview-guideRyuta Kamizono2017-12-271-6/+8
|\ | | | | Update "Action View Overview" guide [ci skip]
| * Update "Action View Overview" guide [ci skip]bogdanvlviv2017-12-261-6/+8
| | | | | | | | | | | | - Provide full / Fix generated HTML by `form_for` in the example. - Provide full params in the example. - Express params[:person] in the sentence.
* | Merge pull request #31570 from y-yagi/ci_against_250Matthew Draper2017-12-271-1/+8
|\ \ | |/ |/| CI against ruby 2.5.0
| * CI against ruby 2.5.0yuuji.yaginuma2017-12-271-1/+8
|/
* SQLite: Add more test cases for adding primary keyRyuta Kamizono2017-12-262-58/+100
|
* Make `sql_type` of primary key in SQLite to comparable with an integer (#28008)Ryuta Kamizono2017-12-262-2/+2
| | | | | Originally I tried to add `assert_equal pk.sql_type, ref.sql_type`. But the assert failed even though the same type due to `sql_type` of primary key in SQLite is upper case. Prefer lower case like other types.
* Merge pull request #31562 from fatkodima/sqlite_migration_compatibilityRyuta Kamizono2017-12-262-1/+20
|\ | | | | Fix `add_column` with :primary_key type compatibility for SQLite
| * Fix `add_column` with :primary_key type compatibility for SQLitefatkodima2017-12-252-1/+20
| |
* | Prevent to install gems when run test (#31564)Yuji Yaginuma2017-12-262-4/+12
| | | | | | | | | | | | `invoke_all` cause `bundle install`. This will install gems actually defined in `Gemfile`. To avoid this, stubbed `bundle_command`. Fixes #31557
* | Merge pull request #31563 from Dorian/prevent-shadowing-outer-variablesYuji Yaginuma2017-12-261-4/+4
|\ \ | |/ |/| Prevent shadowing outer variables
| * prevent shadowing outer variablesDorian Marié2017-12-251-4/+4
|/
* Don't pass `object_id` to `refute_nil` since `object_id` never to be nilRyuta Kamizono2017-12-261-6/+6
| | | | And prefer `assert_same` over `assert_equal`.
* Merge pull request #31558 from hsbt/test-rubygems-2.7.4Ryuta Kamizono2017-12-251-1/+1
|\ | | | | Try to update rubygems 2.7.4
| * To use rubygems-2.7.4 on Travis CISHIBATA Hiroshi2017-12-251-1/+1
|/
* Merge pull request #27780 from ↵Ryuta Kamizono2017-12-254-5/+15
|\ | | | | | | | | | | mikelikesbikes/fix-update-attribute-callbacks-issue save attributes changed by callbacks after update_attribute
| * save attributes changed by callbacks after update_attributeMike Busch2017-12-223-5/+11
| | | | | | | | | | | | | | | | update_attribute previously stopped execution, before saving and before running callbacks, if the record's attributes hadn't changed. [The documentation](http://api.rubyonrails.org/classes/ActiveRecord/Persistence.html#method-i-update_attribute) says that "Callbacks are invoked", which was not happening if the persisted attributes hadn't changed.
* | Ensure to use repo's Gemfile in applicationyuuji.yaginuma2017-12-251-0/+5
| | | | | | | | | | | | | | | | | | Puma gets bundler's info from `Bundler::ORIGINAL_ENV` for restart. https://github.com/puma/puma/blob/f6f3892f4d82638fb7a2a57d993641b1486ee88a/lib/puma/launcher.rb#L168 So, specified `BUNDLE_GEMFILE` env for use same Gemfile in the restart. Fixes #31351
* | Move `test_skip_bundle` to `AppGeneratorTest`yuuji.yaginuma2017-12-242-9/+9
| | | | | | | | `skip_bundle` option was removed from plugin generator in 9b72fcc3c22a6f75f37f52dd6cb682bc00c51cf0.
* | Active Storage: Fix direct uploads in IE 11Javan Makhmali2017-12-232-4/+18
| | | | | | | | | | Fixes #31531 Closes #31540
* | Merge pull request #31545 from ↵Ryuta Kamizono2017-12-231-0/+3
|\ \ | | | | | | | | | | | | | | | | | | JanBussieck/add-hwia-inheritance-removal-to-5.1-release-notes [docs] Add mention of removal of HWIA interface from `AC:Parameters` [ci skip]
| * | [docs] Add mention of removal of HWIA interface from `AC:Parameters`Jan Bussieck2017-12-221-0/+3
| | | | | | | | | | | | [ci skip]
* | | Use `delayed_job` masteryuuji.yaginuma2017-12-232-4/+9
| | | | | | | | | | | | | | | For pass Active Job integration tests with Ruby 2.5. Ref: https://github.com/collectiveidea/delayed_job/pull/996
* | | Merge pull request #31538 from ↵Eileen M. Uchitelle2017-12-221-2/+2
|\ \ \ | | | | | | | | | | | | | | | | yhirano55/add_cloud_service_links_to_readme_in_active_storage Add cloud service's links to README of Active Storage [ci skip]
| * | | Add cloud service's links to README of Active Storage [ci skip]Yoshiyuki Hirano2017-12-221-2/+2
| | | |
* | | | Merge pull request #31544 from ↵Eileen M. Uchitelle2017-12-222-6/+30
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | mrreynolds/activestorage-combined-minimagick-options Add support for combined MiniMagick transformations
| * | | Add support for combined MiniMagick transformationsRobert Glaser2017-12-222-6/+30
| | | |
* | | | Test that cache stores build unversioned keysGeorge Claghorn2017-12-221-0/+12
| | | |
* | | | Revert "Remove code duplication in ActiveSupport::Cache"George Claghorn2017-12-221-11/+26
|/ / / | | | | | | | | | This reverts commit 57f0e3d1300d01444d2a311560c055d26968dc3f.
* | | Merge pull request #31543 from hsbt/update-bundler-1-16Ryuta Kamizono2017-12-227-13/+1
|\ \ \ | | | | | | | | Relax bundler version on Travis CI
| * | | Revert "Specify bundler version in template files"SHIBATA Hiroshi2017-12-226-12/+0
| | | | | | | | | | | | | | | | This reverts commit b106242f52272c4a5ced7a0e9d1dcb1b50542501.
| * | | Relax bundler version on Travis CISHIBATA Hiroshi2017-12-221-1/+1
| | |/ | |/|
* / | Add test case for using sanitize method in the scope definitionRyuta Kamizono2017-12-221-2/+10
|/ / | | | | | | Context: https://github.com/rails/rails/pull/29301#issuecomment-353200233
* | Merge pull request #31541 from hsbt/fix-travis-failureRyuta Kamizono2017-12-221-1/+1
|\ \ | | | | | | Temporary disabled using rubygems 2.7.
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 09:03:50 +0000