aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Add rake db:prepare rake task.Roberto Miranda2019-03-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It Creates the database, loads the schema, run the migrations and initializes with the seed data (use db:reset to also drop the database first). This rake task runs in an idempotent way ref https://github.com/rails/rails/pull/33139#discussion_r195930751
* | | | | | | | | Merge pull request #35831 from ↵Kasper Timm Hansen2019-04-021-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abhaynikam/35826-updated-doc-template-rawfile-after-35826 [ci skip] Updated the doc after renaming Template::File -> Template::RawFile in #35826
| * | | | | | | | | [ci skip] Updated the doc after renaming Template::File -> Template::RawFile ↵Abhay Nikam2019-04-021-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | in #35826
* | | | | | | | | Merge pull request #35826 from cpruitt/rename-file-to-rawfileKasper Timm Hansen2019-04-025-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Rename `Template::File` to `Template::RawFile`
| * | | | | | | | | Rename File to RawFileCliff Pruitt2019-04-015-5/+5
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #35703 from y-yagi/add_database_option_to_dbconsole_commandYuji Yaginuma2019-04-023-13/+42
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Rename `connection` option to `database` in `dbconsole` command
| * | | | | | | | | Rename `connection` option to `database` in `dbconsole` commandyuuji.yaginuma2019-04-023-13/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We introduced `connection` option for specifying spec with 1acd9a6464668d4d54ab30d016829f60b70dbbeb. But now we are using the `database` to specify the same value in other commands. * https://github.com/rails/rails/blob/0a0f115031b64b5335fa88543c40df4194dfb428/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb#L11 * https://github.com/rails/rails/blob/0a0f115031b64b5335fa88543c40df4194dfb428/activerecord/lib/rails/generators/active_record/model/model_generator.rb#L17 The options provided to the users should be uniform. Since the term "database" is used in rake task etc, So I want to be able to use it in `dbconsole` command. Also I deprecated the `connection` option because I think that it would be confusing if there are multiple options to specify a same value.
* | | | | | | | | | Merge pull request #35827 from abhaynikam/35824-fix-typo-in-changelogRyuta Kamizono2019-04-021-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | [ci skip] Fix typo for recieve -> receive
| * | | | | | | | | [ci skip] Fix typo for recieve -> receiveAbhay Nikam2019-04-021-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #35824 from connorshea/add-changelog-for-webdriversRafael França2019-04-011-0/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Add Changelog entry for #35732.
| * | | | | | | | Add Changelog entry for #35732.Connor Shea2019-04-011-0/+6
|/ / / / / / / /
* | | | | | | | [ci skip] Follow up c8bf334104Kasper Timm Hansen2019-04-011-1/+2
| | | | | | | |
* | | | | | | | Only clear template caches in dev after changes (#35629)John Hawthorn2019-04-016-7/+61
| | | | | | | |
* | | | | | | | Merge pull request #35820 from sharang-d/url-to-URL-except-actionpackRyuta Kamizono2019-04-0226-41/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | url -> URL where apt except inside actionpack/
| * | | | | | | | url -> URL where apt except inside actionpack/Sharang Dashputre2019-04-0126-41/+41
| | | | | | | | |
* | | | | | | | | Merge pull request #35821 from sharang-d/url-to-URL-in-actionpackRyuta Kamizono2019-04-0210-24/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | url -> URL where apt inside actionpack/
| * | | | | | | | | url -> URL where apt inside actionpack/Sharang Dashputre2019-04-0110-24/+24
| |/ / / / / / / /
* | | | | | | | | Merge pull request #35819 from orhantoy/ruby-version-with-final-newlineRyuta Kamizono2019-04-022-1/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Include final newline in generated .ruby-version
| * | | | | | | | Include final newline in generated .ruby-versionOrhan Toy2019-04-012-1/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #35816 from ↵Ryuta Kamizono2019-04-0215-147/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/partly_revert_query_annotation_for_update_and_delete Revert unused code and re-using query annotation for `update_all` and `delete_all`
| * | | | | | | | Revert unused code and re-using query annotation for `update_all` and ↵Ryuta Kamizono2019-04-0115-147/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `delete_all` This partly reverts #35617. #35617 includes unused code (for `InsertStatement`) and re-using query annotation for `update_all` and `delete_all`, which has not been discussed yet. If a relation has any annotation, I think it is mostly for SELECT query, so re-using annotation by default is not always desired behavior for me. We should discuss about desired behavior before publishing the implementation.
* | | | | | | | | Merge pull request #35815 from sharang-d/update-action-cable-docsXavier Noria2019-04-011-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | url -> URL in Action Cable guide [ci skip]
| * | | | | | | | | url -> URL in Action Cable guide [ci skip]Sharang Dashputre2019-04-011-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #35814 from saiqulhaq/masterMatthew Draper2019-04-011-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix guides to link to edgeapi if on EDGE env
| * | | | | | | | [ci skip] Fix guides to link to edgeapi if on EDGE envM. Saiqul Haq2019-04-011-2/+2
|/ / / / / / / /
* | | | | | | | Fix typo in the value of ENCRYPTED_SIGNED_COOKIE_SALT constant (#35619)Emil Shakirov2019-04-012-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix typo in the value of ENCRYPTED_SIGNED_COOKIE_SALT constant * Fix value of cookie in with authenticated encryption flag off in tests [Emil Shakirov + Ryuta Kamizono]
* | | | | | | | Merge pull request #35727 from zinosama/zzz/update-doc-for-includesRyuta Kamizono2019-04-011-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update API doc for #includes on unnecessary #references [ci skip]
| * | | | | | | | [ci skip] Update doc for unnecessary #referenceszino2019-03-231-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update doc for #includes to clarify that #references is unnecessary when conditions are passed into #includes as a hash.
* | | | | | | | | Revert "Add ActiveStorage.service_configurations and ActiveStorage.service"George Claghorn2019-03-314-36/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 002684e36e813469c3585e193f0698784c88278b.
* | | | | | | | | Extract insert test case from #35686Kasper Timm Hansen2019-03-311-0/+14
| | | | | | | | |
* | | | | | | | | Use accessors internally; remove needless validationKasper Timm Hansen2019-03-311-6/+2
| | | | | | | | |
* | | | | | | | | Mark InsertAll as private API. Easier to add later.Kasper Timm Hansen2019-03-311-1/+1
| | | | | | | | |
* | | | | | | | | Capture some join calls.Kasper Timm Hansen2019-03-311-4/+8
| | | | | | | | |
* | | | | | | | | feat(js): Dynamic ActionCable URL (#35579)Ryan Castner2019-03-315-32/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Failing test case * feat: Dynamic Url Generation Change createWebSocketURL to be a closure that allows url to be evaluated at the time the webSocket is established * refactor: createWebSocketURL to Consumer, remove need for closure Move initial call to createWebSocketURL in createConsumer * docs: Add documentation for dynamic url and string args to createConsumer Co-Authored-By: rmacklin <rmacklin@users.noreply.github.com> [Ryan Castner, rmacklin]
* | | | | | | | | Merge pull request #19333 from palkan/dirty-storeKasper Timm Hansen2019-03-313-0/+132
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add dirty methods for store accessors
| * | | | | | | | | Add saved changes helpers for store accessorsVladimir Dementyev2019-03-252-1/+32
| | | | | | | | | |
| * | | | | | | | | Add dirty methods for store accessorspalkan2019-03-253-0/+101
| | | | | | | | | |
* | | | | | | | | | Merge pull request #35793 from jhawthorn/deprecate_layout_absolute_pathKasper Timm Hansen2019-03-312-1/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Deprecate render layout with an absolute path
| * | | | | | | | | | Deprecate render layout with an absolute pathJohn Hawthorn2019-03-292-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has similar problems to render file:. I've never seen this used, and believe it's a relic from when all templates could be rendered from an absolute path.
* | | | | | | | | | | Add ActiveStorage.service_configurations and ActiveStorage.serviceGeorge Claghorn2019-03-314-30/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow plugins to access the global service and alternative service configs before ActiveStorage::Blob loads. * Make ActiveStorage.service_configurations the default second argument to ActiveStorage::Service.configure. Plugins that just want to use an alternative service defined in config/storage.yml needn't pass in the config themselves.
* | | | | | | | | | | Follow up tweaks b89a3e7e638a50c648a17d09c48b49b707e1d90d [ci skip]Ryuta Kamizono2019-03-314-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * use backticks instead of `+` * and more (e.g. missed replacing `Array#excluding` and `Enumerable#excluding` in b89a3e7e638a50c648a17d09c48b49b707e1d90d)
* | | | | | | | | | | Merge pull request #35799 from leboshi/masterRyuta Kamizono2019-03-313-11/+29
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix callbacks on has_many :through associations
| * | | | | | | | | | | Fix callbacks on has_many :through associations (#33249)Ryan Kerr2019-03-303-10/+29
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding a child record via a has_many :through association, build_through_record would previously build the join record, and then assign the child record and source_type option to it. Because the before_add and after_add callbacks are called as part of build, however, this caused the callbacks to receive incomplete records, specifically without the other end of the has_many :through association. Collecting all attributes before building the join record ensures the callbacks receive the fully constructed record.
* | | | | | | | | | | Tweaks CHANGELOGs and docs [ci skip]Ryuta Kamizono2019-03-316-26/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add leading `#` before `=>` since hash rocket is valid Ruby code * add backticks * remove trailing spaces * and more
* | | | | | | | | | | Merge pull request #35688 from jhawthorn/render_file_rfcAaron Patterson2019-03-3013-40/+131
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | RFC: Introduce Template::File
| * | | | | | | | | | | Introduce Template::File as new render file:John Hawthorn2019-03-2713-40/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous behaviour of render file: was essentially the same as render template:, except that templates can be specified as an absolute path on the filesystem. This makes sense for historic reasons, but now render file: is almost exclusively used to render raw files (not .erb) like public/404.html. In addition to complicating the code in template/resolver.rb, I think the current behaviour is surprising to developers. This commit deprecates the existing "lookup a template from anywhere" behaviour and replaces it with "render this file exactly as it is on disk". Handlers will no longer be used (it will render the same as if the :raw handler was used), but formats (.html, .xml, etc) will still be detected (and will default to :plain). The existing render file: behaviour was the path through which Rails apps were vulnerable in the recent CVE-2019-5418. Although the vulnerability has been patched in a fully backwards-compatible way, I think it's a strong hint that we should drop the existing previously-vulnerable behaviour if it isn't a benefit to developers.
* | | | | | | | | | | | Require railties for all Active Storage dependenciesGeorge Claghorn2019-03-301-0/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Specify Active Storage's dependency on Active JobGeorge Claghorn2019-03-302-1/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #35802 from abhaynikam/fix-typo-for-zeitwerk-mode-test-casesRyuta Kamizono2019-03-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Fix typo directores -> directories
| * | | | | | | | | | | | [ci skip] Fix typo directores -> directoriesAbhay Nikam2019-03-301-1/+1
|/ / / / / / / / / / / /