aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* yarnpkg: correct exec syntaxJake Teton-Landis2018-01-231-1/+2
| | | Previous change didn’t expand this array of arguments
* Merge pull request #31487 from fatkodima/improve_cache_fault_toleranceRafael França2018-01-225-10/+137
|\ | | | | Improve fault tolerance for redis cache store
| * Improve fault tolerance for redis cache storefatkodima2018-01-235-10/+137
|/
* Add missing requireGeorge Claghorn2018-01-221-3/+5
|
* Merge pull request #31765 from utilum/langRafael França2018-01-221-1/+1
|\ | | | | remove text repetition
| * remove text repetitionutilum2018-01-221-1/+1
| | | | | | | | [ci skip]
* | Merge pull request #31447 from fatkodima/redis_cache-connection_poolRafael Mendonça França2018-01-229-74/+167
|\ \ | |/ |/| | | Add support for connection pooling on RedisCacheStore
| * Add support for connection pooling on RedisCacheStorefatkodima2018-01-229-74/+167
| |
* | Merge pull request #31763 from utilum/image_not_truncatedRafael França2018-01-221-2/+1
|\ \ | | | | | | Update guide text not to contradict image
| * | Update guide text not to contradict imageutilum2018-01-221-2/+1
|/ / | | | | | | | | | | | | The bottom line in the image of `ActionController::UnknownFormat`is not truncated. Now the text does not say it is. [ci skip]
* | Merge pull request #31549 from fatkodima/foreign_tablesRyuta Kamizono2018-01-234-1/+128
|\ \ | | | | | | Support for PostgreSQL foreign tables
| * | Support for PostgreSQL foreign tablesfatkodima2018-01-224-1/+128
| |/
* / Fix building has_one through recordRyuta Kamizono2018-01-234-14/+22
|/ | | | Fixes #31762.
* Merge pull request #30535 from leonelgalan/becomes_and_default_inheritanceRyuta Kamizono2018-01-232-1/+18
|\ | | | | Ignores a default subclass when `becomes(Parent)`
| * Ignores a default subclass when `becomes(Parent)`Leonel Galan2018-01-222-1/+18
|/ | | | | | | | | | | Fixes issue described in #30399: A default value on the inheritance column prevented `child.becomes(Parent)` to return an instance of `Parent` as expected, instead it returns an instance of the default subclass. The change was introduced by #17169 and it was meant to affect initialization, alone. Where `Parent.new` is expected to return an instance of the default subclass.
* Merge pull request #24964 from vipulnsward/true-falseMatthew Draper2018-01-231-2/+2
|\ | | | | Don't perform unnecessary check with false, just use true/false values
| * Dont perform unnecessary check with false, just use true/false values for ↵Vipul A M2016-05-111-2/+2
| | | | | | | | @active on SQLite adapter.
* | Merge pull request #31710 from eugeneius/indestructible_through_recordRyuta Kamizono2018-01-226-5/+24
|\ \ | | | | | | Don't update counter cache when through record was not destroyed
| * | Don't update counter cache when through record was not destroyedEugene Kenny2018-01-146-5/+24
| | | | | | | | | | | | | | | | | | When removing a record from a has many through association, the counter cache was being updated even if the through record halted the callback chain and prevented itself from being destroyed.
* | | Pass desired driver to Redis client constructor rather than munging global ↵George Claghorn2018-01-211-16/+12
| | | | | | | | | | | | config
* | | Merge pull request #31753 from justjake/patch-1George Claghorn2018-01-211-1/+1
|\ \ \ | | | | | | | | bin/yarn: Pass through arguments with spaces
| * | | bin/yarn: Pass through arguments with spacesJake Teton-Landis2018-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Previously, the `bin/yarn` wrapper would "unquote" arguments to yarn like this: `yarn run add-copyright "(c) 2017, 2018 MyCompany"` That results in an ARGV of ['run', 'add-copyright', '(c) 2017, 2018 MyCompany'] in the yarn wrapper, but a ARGV in the yarn executable of ['run', 'add-copyright', '(c)', '2017,', '2018', MyCompany']
* | | | Merge pull request #31757 from composerinteralia/define-attributeRyuta Kamizono2018-01-221-1/+1
|\ \ \ \ | | | | | | | | | | Use singular define_attribute_method
| * | | | Use singular define_attribute_methodDaniel Colson2018-01-211-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | `define_attribute_methods` splats the arguments, then calls out to `define_attribute_method` for each. When defining a singule attribute, using the singular version of the method saves us an array and an extra method call.
* / / / PERF: Recover `changes_applied` performance (#31698)Ryuta Kamizono2018-01-224-75/+45
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #30985 caused `object.save` performance regression since calling `changes` in `changes_applied` is very slow. We don't need to call the expensive method in `changes_applied` as long as `@attributes` is tracked by mutation tracker. https://gist.github.com/kamipo/1a9f4f3891803b914fc72ede98268aa2 Before: ``` Warming up -------------------------------------- create_string_columns 73.000 i/100ms Calculating ------------------------------------- create_string_columns 722.256 (± 5.8%) i/s - 3.650k in 5.073031s ``` After: ``` Warming up -------------------------------------- create_string_columns 96.000 i/100ms Calculating ------------------------------------- create_string_columns 950.224 (± 7.7%) i/s - 4.800k in 5.084837s ```
* | | Cope with videos with undefined display aspect ratiosGeorge Claghorn2018-01-203-2/+15
| | |
* | | Merge pull request #31641 from ckoenig/remove_frozen_string_literalYuji Yaginuma2018-01-201-4/+6
|\ \ \ | | | | | | | | Use dup'ed options hash
| * | | Work on a dup'ed options hashChristof Koenig2018-01-091-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, at least using JRuby, the replacements in convert_database_option_for_jruby won't work. Thus a call to bundle exec rails app:update fails. Simply replacing those replace statements doesn't seem to work either, since the options hash seems to be frozen, too.
* | | | More exercise `ActiveModel::Dirty` testsRyuta Kamizono2018-01-201-3/+24
| | | |
* | | | Merge pull request #31749 from jameslovejoy/fix-documentationRyuta Kamizono2018-01-202-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix typos and improve text_helper documentation regarding sanitization [ci skip]
| * | | | Fix typos. Improve text_helper documentation.James Lovejoy2018-01-192-7/+7
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Use helper methodGeorge Claghorn2018-01-191-1/+2
| | | |
* | | | Preserve display aspect ratio for videos with rectangular samplesGeorge Claghorn2018-01-194-19/+62
| | | |
* | | | Merge pull request #31732 from ↵Matthew Draper2018-01-1913-15/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | koic/enable_autocorrect_for_lint_end_alignment_cop Enable autocorrect for `Lint/EndAlignment` cop
| * | | | Enable autocorrect for `Lint/EndAlignment` copKoichi ITO2018-01-1813-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ### Summary This PR changes .rubocop.yml. Regarding the code using `if ... else ... end`, I think the coding style that Rails expects is as follows. ```ruby var = if cond a else b end ``` However, the current .rubocop.yml setting does not offense for the following code. ```ruby var = if cond a else b end ``` I think that the above code expects offense to be warned. Moreover, the layout by autocorrect is unnatural. ```ruby var = if cond a else b end ``` This PR adds a setting to .rubocop.yml to make an offense warning and autocorrect as expected by the coding style. And this change also fixes `case ... when ... end` together. Also this PR itself is an example that arranges the layout using `rubocop -a`. ### Other Information Autocorrect of `Lint/EndAlignment` cop is `false` by default. https://github.com/bbatsov/rubocop/blob/v0.51.0/config/default.yml#L1443 This PR changes this value to `true`. Also this PR has changed it together as it is necessary to enable `Layout/ElseAlignment` cop to make this behavior.
* | | | | Remove unused `connection` argument from `MigrationContext#current_version`Ryuta Kamizono2018-01-191-3/+3
| | | | |
* | | | | Remove unused `migration_context` in `DatabaseTasks`Ryuta Kamizono2018-01-191-4/+0
| | | | | | | | | | | | | | | | | | | | This was added in #31727, but it is unused.
* | | | | Restore `test_migrations_status_with_schema_define_in_subdirectories`Ryuta Kamizono2018-01-191-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test case which was added in #28287 checks that `ActiveRecord::Schema.define` loads migration versions in subdirectories. It should be kept it as it was.
* | | | | Merge pull request #31738 from tcopeland/doc_typoRyuta Kamizono2018-01-191-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix minor typo [ci skip]
| * | | | | Fix minor typo [ci skip]Tom Copeland2018-01-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Updated the method counts and unified them all on numerals.
* | | | | | Update Gemfile.lock to reflect websocket-driver 0.7.0yuuji.yaginuma2018-01-191-1/+1
|/ / / / / | | | | | | | | | | | | | | | Follow up to e1473e0cbfbd97eeea2bc6eefd73bec0d4863359
* | | / / Testing actioncable against websocket-driver 0.7.0 (#30711)Jared Beck2018-01-181-1/+1
| |_|/ / |/| | | | | | | | | | | * Depend on websocket-driver >= 0.6.1
* | | | Merge pull request #31663 from Edouard-chin/remove-without-sql-modeRafael França2018-01-181-0/+22
|\ \ \ \ | | | | | | | | | | Added a test around `NO_AUTO_VALUE_ON_ZERO`:
| * | | | Added a test around `NO_AUTO_VALUE_ON_ZERO`:Edouard CHIN2018-01-171-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The mysql `NO_AUTO_VALUE_ON_ZERO` mode should be disabled when inserting fixtures in bulk, this PR adds a test to make sure we don't remove it by mistake - If we live this mode enabled, a statement like this wouldn't work and a `Duplicate entry '0' for key 'PRIMARY'` error will be raised. That's because `DEFAULT` on auto_increment will return 0 ```sql INSERT INTO `aircraft` (`id`, `name`, `wheels_count`) VALUES (DEFAULT, 'first', 2), (DEFAULT, 'second', 3) ```
* | | | | Add locale selector to email preview (#31596)Hitoshi Nakashima2018-01-183-18/+97
| | | | | | | | | | | | | | | | | | | | - Add set_locale to detect suitable locale - Make feature compatible with Rails 5.x
* | | | | Support hash as first argument in `assert_difference`. (#31600)Julien Meichelbeck2018-01-183-7/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Support hash as first argument for `assert_difference`. This allows to specify multiple numeric differences in the same assertion. Example: assert_difference 'Article.count' => 1, 'Notification.count' => 2 do # post :create, params: { article: {...} } end * Support error message when passing a hash as a first parameter * Format CHANGELOG properly [Julien Meichelbeck + Rafael Mendonça França]
* | | | | Merge pull request #31424 from sobrinho/sobrinho/connection-pool-memcacheRafael Mendonça França2018-01-184-11/+101
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Support for connection pooling on mem cache store
| * | | | | Support for connection pooling on mem cache storeGabriel Sobrinho2018-01-184-11/+101
| | | | | |
* | | | | | Merge pull request #31577 from prathamesh-sonpatki/upgrade-guide-bootsnapEileen M. Uchitelle2018-01-181-0/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Added a note about bootsnap in the Rails 5.2 upgrade guide [ci skip]
| * | | | | Added a note about bootsnap in the Rails 5.2 upgrade guide [ci skip]Prathamesh Sonpatki2017-12-271-0/+11
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 22:12:39 +0000