aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #34373 from shiroginne/masterRobin Dupret2018-11-101-3/+3
|\ | | | | | | | | Fix typo for Action Cable Overview doc [Eileen M. Uchitelle]
| * Update `action_cable_overview.md`: fix typo.Evgeny Sugakov2018-11-101-3/+3
| | | | | | | | [ci skip]
* | Make sure we are using a working version of thor locallyRafael Mendonça França2018-11-091-3/+3
| |
* | bundle updateRafael Mendonça França2018-11-091-54/+55
| |
* | Upgrade thor to 0.20.1Rafael Mendonça França2018-11-092-10/+1
| |
* | Merge pull request #34415 from Ana06/present_associationsGannon McGibbon2018-11-091-1/+2
|\ \ | | | | | | Clarify the validation of present associations
| * | Clarify the validation of present associationsAna María Martínez Gómez2018-11-091-1/+2
| | | | | | | | | | | | | | | | | | I think that it is not clear what means that _an association is present_. Add that it is checking that the foreign key is not empty and that the referenced object exists to clarify it.
* | | Merge pull request #32881 from vfonic/update-development-deps-installRobin Dupret2018-11-093-270/+121
|\ \ \ | | | | | | | | | | | | Docs: Update Development Dependencies Install
| * | | Docs: Update Development Dependencies InstallViktor Fonic2018-11-093-270/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move all the testing related stuff to the contributing guide and redirect the reader to this guide once the installation process is finished as running tests is the logical next step. * Group documentation instructions by OS, not by gem * It eases the installation process and lessen the need to scroll through the guide * There's still a list of all additional services required for each of the gems above the instructions for each OS. * Also update a bit the instructions * Update some package names * Add `yarn` to the package list for Arch Linux and FreeBSD * Use `dnf` instead of `yum` for Fedora and CentOS * Advise the user to use `brew bundle` on macOS to lessen the maintenance burden for this OS and ease the process for the user. [ci skip]
* | | | Restore `private_constant` which is lost accidentally in #30941Ryuta Kamizono2018-11-091-1/+1
| | | | | | | | | | | | | | | | https://github.com/rails/rails/pull/30941/files#diff-fc90ec41ef75be8b2259526fe1a8b663L53
* | | | Add test for parallel tests with unmarshable exceptionyuuji.yaginuma2018-11-091-0/+24
| | | | | | | | | | | | | | | | Follow up #34131.
* | | | Use the same version of Rubocop as Code Climateyuuji.yaginuma2018-11-091-3/+3
| | | | | | | | | | | | | | | | Related to: #34406
* | | | Deprecate `t.indexes = [...]` which is not by designRyuta Kamizono2018-11-091-2/+5
| | | | | | | | | | | | | | | | Use `t.index ...` instead.
* | | | Refactor to initialize `TableDefinition` by kwargsRyuta Kamizono2018-11-092-4/+14
| | | |
* | | | Test prepared statement cache only if prepared statements is enabledRyuta Kamizono2018-11-091-1/+1
| | | |
* | | | PostgreSQL: Properly quote all `Infinity` and `NaN`Ryuta Kamizono2018-11-092-6/+26
| | | | | | | | | | | | | | | | Since quoted `Infinity` and `NaN` are valid data for PostgreSQL.
* | | | Merge pull request #31382 from fatkodima/create_table-if_not_existsAndrew White2018-11-085-4/+59
|\ \ \ \ | | | | | | | | | | Add an :if_not_exists option to create_table
| * | | | Add an :if_not_exists option to create_tablefatkodima2018-11-085-4/+59
| | | | | | | | | | | | | | | | | | | | [fatkodima & Stefan Kanev]
* | | | | Merge pull request #34407 from bogdanvlviv/remove-extra-arg-expected_databaseRyuta Kamizono2018-11-081-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Remove unused argument `expected_database`
| * | | | | Remove unused argument `expected_database`bogdanvlviv2018-11-081-5/+5
| |/ / / / | | | | | | | | | | | | | | | This argument was added in fa5a028ed9f, and #34137 but hasn't been used.
* | | | | Merge pull request #34406 from yahonda/use_rubocop_0_60_0Ryuta Kamizono2018-11-082-4/+1
|\ \ \ \ \ | |/ / / / |/| | | | Use RuboCop 0.60.0 and remove exclude files for `Style/RedundantFreeze`
| * | | | Use RuboCop 0.60.0 and remove exclude files for `Style/RedundantFreeze`Yasuo Honda2018-11-082-4/+1
|/ / / / | | | | | | | | | | | | | | | | Since https://github.com/rubocop-hq/rubocop/pull/6333 has been included into RuboCop 0.60.0.
* | | | Compile packs for testyuuji.yaginuma2018-11-081-2/+4
| | | | | | | | | | | | | | | | | | | | `Webpacker` handles testing / development packs separately by default. If do not specify `RAILS_ENV`, there is no merit to precompile.
* | | | Merge pull request #34385 from christophemaximin/guard-enum-empty-keysRyuta Kamizono2018-11-083-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | Guard Enums against definitions with blank label names
| * | | | Guard Enums against definitions with blank label namesChristophe Maximin2018-11-073-1/+27
| | | | |
* | | | | Fix broken CHANGELOG markup [ci skip]Ryuta Kamizono2018-11-083-5/+5
|/ / / / | | | | | | | | | | | | And remove trailing spaces.
* | | | Merge pull request #34181 from gmcgibbon/db_schema_cache_dump_and_clear_multi_dbEileen M. Uchitelle2018-11-074-5/+57
|\ \ \ \ | | | | | | | | | | Db schema cache dump and clear multi db
| * | | | Add multi-db support to schema cache dump and clearGannon McGibbon2018-11-074-5/+57
|/ / / / | | | | | | | | | | | | | | | | Adds support for multiple databases to `rails db:schema:cache:dump` and `rails db:schema:cache:clear`.
* | | | Merge pull request #34393 from eugeneius/always_add_to_parent_transactionRyuta Kamizono2018-11-072-1/+12
|\ \ \ \ | | | | | | | | | | Always add records to parent of nested transaction
| * | | | Always add records to parent of nested transactionEugene Kenny2018-11-072-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a record with transactional callbacks is saved, it's attached to the current transaction so that the callbacks can be run when the transaction is committed. Records can also be added manually with `add_transaction_record`, even if they have no transactional callbacks. When a nested transaction is committed, its records are transferred to the parent transaction, as transactional callbacks should only be run when the outermost transaction is committed (the "real" transaction). However, this currently only happens when the record has transactional callbacks, and not when added manually with `add_transaction_record`. If a record is added to a nested transaction, we should always attach it to the parent transaction when the nested transaction is committed, regardless of whether it has any transactional callbacks. [Eugene Kenny & Ryuta Kamizono]
* | | | | Merge pull request #34387 from yhirano55/rails_info_properties_jsonRyuta Kamizono2018-11-075-2/+37
|\ \ \ \ \ | |/ / / / |/| | | | Respond /rails/info/properties.json
| * | | | Add JSON support to rails properties route (`/rails/info/properties`).Yoshiyuki Hirano2018-11-075-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added json format, like this: { "Rails version": "6.0.0.alpha", "Ruby version": "2.5.1-p57 (x86_64-darwin17)", "RubyGems version": "2.7.6", "Rack version": "2.0.6", "JavaScript Runtime": "Node.js (V8)", "Middleware": ["Rack::Sendfile", "ActionDispatch::Static", "ActionDispatch::Executor", "ActiveSupport::Cache::Strategy::LocalCache::Middleware", "Rack::Runtime", "Rack::MethodOverride", "ActionDispatch::RequestId", "ActionDispatch::RemoteIp", "Sprockets::Rails::QuietAssets", "Rails::Rack::Logger", "ActionDispatch::ShowExceptions", "WebConsole::Middleware", "ActionDispatch::DebugExceptions", "ActionDispatch::Reloader", "ActionDispatch::Callbacks", "ActiveRecord::Migration::CheckPending", "ActionDispatch::Cookies", "ActionDispatch::Session::CookieStore", "ActionDispatch::Flash", "ActionDispatch::ContentSecurityPolicy::Middleware", "Rack::Head", "Rack::ConditionalGet", "Rack::ETag", "Rack::TempfileReaper"], "Application root": "/path/to/app", "Environment": "development", "Database adapter": "sqlite3", "Database schema version": 0 }
* | | | | Merge pull request #34392 from gmcgibbon/gem_security_note_amendRafael França2018-11-0611-31/+31
|\ \ \ \ \ | | | | | | | | | | | | Amend CVE note and security guide section wordings
| * | | | | Amend CVE note and security guide section wordingsGannon McGibbon2018-11-0611-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reword first sentence of dep management and CVE section of security guide. Also, reword and move gemspec notes above deps. [ci skip]
* | | | | | Merge pull request #34375 from y-yagi/add_connect_src_to_default_csp_initializerGuillermo Iguaran2018-11-062-0/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add `connect_src` example to content security policy initializer
| * | | | | Add `connect_src` example to content security policy initializeryuuji.yaginuma2018-11-042-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If want to use `webpack-dev-server` with CSP enabled, need to specify `connect-src`. Related to: https://github.com/rails/webpacker/commit/cd7ecf4d48496341aecd81c0c2f69fe4e50a7cd4 This is a matter of `webpacker`. But since `webpacker` is now used by default, to prevent user confusion, I think that better to include an example of `connect-src.`
* | | | | | Merge pull request #34388 from gmcgibbon/gem_security_noteKasper Timm Hansen2018-11-0611-0/+35
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add CVE note to security guide and gemspecs
| * | | | | Add CVE note to security guide and gemspecsGannon McGibbon2018-11-0611-0/+35
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #34384 from ↵Ryuta Kamizono2018-11-065-3/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | eugeneius/inspect_with_non_primary_key_id_attribute Fix inspect with non-primary key id attribute
| * | | | | Fix inspect with non-primary key id attributeEugene Kenny2018-11-065-3/+26
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `read_attribute` method always returns the primary key when asked to read the `id` attribute, even if the primary key isn't named `id`, and even if another attribute named `id` exists. For the `inspect`, `attribute_for_inspect` and `pretty_print` methods, this behaviour is undesirable, as they're used to examine the internal state of the record. By using `_read_attribute` instead, we'll get the real value of the `id` attribute.
* | | | | Merge pull request #34131 from lsylvester/defend-against-unmarshable-exceptionsEileen M. Uchitelle2018-11-051-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Fix DRb::DRbServerNotFound errors in parallel tests
| * | | | | resque errors caused by Marshal dump failures and wrap exceptions in ↵Lachlan Sylvester2018-10-091-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | marshallable DRbRemoteError
* | | | | | Merge pull request #34377 from nickcoyne/nickcoyne-patch-1Vipul A M2018-11-051-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix typo [ci-skip]
| * | | | | Fix typoNick Coyne2018-11-051-1/+1
|/ / / / / | | | | | | | | | | Just a small typo fix for the recently merged #34257
* | | | | Keep new line after the last dependencyyuuji.yaginuma2018-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | If add a package with `yarn`, it will have a newline after the last dependency so let's match with that.
* | | | | Move `resolve_sti_reflections` which is table row related code into `TableRow`Ryuta Kamizono2018-11-032-89/+78
| | | | |
* | | | | Don't pass useless `table_name` to `ModelMetadata.new`Ryuta Kamizono2018-11-033-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `model_metadata` is only used if `model_class` is given. If `model_class` is given, the `table_name` is always `model_class.table_name`.
* | | | | Don't pass unused `connection` to `FixtureSet.new`Ryuta Kamizono2018-11-032-14/+11
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `@connection` is no longer used since ee5ab22. Originally the `@connection` was useless because it is only used in `timestamp_column_names`, which is only used if `model_class` is given. If `model_class` is given, the `@connection` is always `model_class.connection`.
* | | | Checking boundable not only `IN` clause but also `NOT IN` clauseRyuta Kamizono2018-11-034-8/+24
| | | |
* | | | Merge pull request #34177 from rmacklin/convert-actioncable-to-es2015Javan Makhmali2018-11-0222-479/+3054
|\ \ \ \ | |_|/ / |/| | | Convert ActionCable javascript to ES2015 modules with a modern build environment