aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix the docs for supported keyword args for Rails 5 style integration ↵Prathamesh Sonpatki2016-06-211-7/+11
| | | | | | controller tests [ci skip] - Fixes #25394.
* Merge pull request #25433 from prathamesh-sonpatki/cleanup-app-generator-codeGuillermo Iguaran2016-06-201-2/+0
|\ | | | | No need to have conditional based on api options in assets
| * No need to have conditional based on api options in assetsPrathamesh Sonpatki2016-06-201-2/+0
| | | | | | | | | | | | - As assets are removed for API only apps anyways, so we don't need any conditional upfront. - assets are removed for API apps here - https://github.com/rails/rails/blob/94ef224aa61ace3fa643eab161ff9056b7d90a62/railties/lib/rails/generators/rails/app/app_generator.rb#L266-L273.
* | Merge pull request #25420 from michaeldever/mdever_actioncable_development_portsGuillermo Iguaran2016-06-201-1/+1
|\ \ | |/ |/| Allow actioncable connections from all ports in development
| * Allow actioncable connections from any port in developmentMichael Dever2016-06-161-1/+1
| |
* | Merge pull request #25436 from prathamesh-sonpatki/fix-testsRichard Schneeman2016-06-192-3/+3
|\ \ | | | | | | Fix failing railties tests
| * | Fix failing railties testsPrathamesh Sonpatki2016-06-182-3/+3
|/ / | | | | | | | | | | | | | | | | | | - Railties tests related to fetching asset URL started failing after the release of sprockets 3.6.1 on Travis. - This was due to the change in https://github.com/rails/sprockets/pull/311/files which changed the logic in `concat_javascript_sources` to add `;` at the end of file if the source did not end with semicolon. - Bumped up sprockets minor version and fixed the failing tests.
* | Merge pull request #25426 from Shopify/fix-activejob-loggerRafael França2016-06-173-2/+16
|\ \ | | | | | | Fix jobs overriding AJ::Base#logger
| * | Fix jobs overriding AJ::Base#loggerJean Boussier2016-06-173-2/+16
| | |
* | | Merge pull request #23301 from ppworks/improve_mysqldumpArthur Nogueira Neves2016-06-172-4/+5
|\ \ \ | |/ / |/| | Improve mysqldump
| * | Skip comments when exec mysqldumpNaoto Koshikawa2016-01-282-4/+5
| | |
* | | Merge pull request #25302 from ↵Sean Griffin2016-06-172-6/+87
|\ \ \ | | | | | | | | | | | | | | | | schneems/schneems/evented-file-boot-at-check-time-master EventedFileUpdateChecker boots once per process
| * | | Lock the whole boot step, get rid of unneeded hashschneems2016-06-131-5/+9
| | | |
| * | | Test how evented file checker handles forksschneems2016-06-081-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pretty proud of this. We are testing distributed processes synchronized via pipes which makes it deterministic. Pretty cool. We boot a listener in the parent process we then fork. Before we touch the file we verify the fork is booted using pipes. Then the parent process will touch the file while the fork waits on a pipe. Once the parent process signals that the file has been touched we continue inside of the fork.
| * | | Listen earlier in EventedFileUpdateCheckerschneems2016-06-061-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | Some files like routes.rb may be very large and vary between the initialization of the app and the first request. In these scenarios if we are using a forked process we cannot rely on the files to be unchanged between when the code is booted and the listener is started. For that reason we start a listener on the main process immediately, when we detect that a process does not have a listener started we force the updated state to be true, so we are guaranteed to catch any changes made between the code initialization and the fork.
| * | | [ci skip] document EventedFileUpdateCheckerschneems2016-06-061-0/+28
| | | |
| * | | EventedFileUpdateChecker boots once per processschneems2016-06-062-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need one file checker booted per process as talked about in #24990. Before we do a check to see if any updates have been registered by the listener we first check to make sure that the current process has booted a listener. We are intentionally not starting a listener when the checker is created. This way we can avoid #25259 in which puma warns of multiple threads created before fork. As written the listener for each process will be invoked by the `ActionDispatch::Executor` middleware when the `updated?` method is called. This is the first middleware on the stack and will be invoked before application code is read into memory. The downside of this approach is that the API is a little less obvious. I.e. that you have to call `updated?` to get the listener to start is not intuitive. We could make `boot!` not private if we want to make the API a little nicer. Alternatively we could boot when the checker is initialized however this reintroduces the puma threads warning, and also means that in cases of `rails server` or when using `preload!` that we have extra threads notifying of changes on a process that we don't care about. [close #24990] [close #25259]
* | | | Merge pull request #25421 from maclover7/jm-mv-filesSean Griffin2016-06-172-0/+0
|\ \ \ \ | | | | | | | | | | Move code style configuration files to root directory
| * | | | Move code style configuration files to root directoryJon Moss2016-06-162-0/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think these are meant to be in the root directory, not in `/activerecord`? :grimacing: r? @sgrif [ci skip]
* | | | Merge pull request #24773 from ralinc/fix-silent-fail-on-psql-commandArthur Nogueira Neves2016-06-163-3/+18
|\ \ \ \ | | | | | | | | | | PostgreSQL: Fix db:structure:load silent failure on SQL error
| * | | | PostgreSQL: Fix db:structure:load silent failure on SQL errorRalin Chimev2016-05-103-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command line flag "-v ON_ERROR_STOP=1" should be used when invoking psql to make sure errors are not suppressed. Example: psql -v ON_ERROR_STOP=1 -q -f awesome-file.sql my-app-db Fixes #23818.
* | | | | Move quiet option to development.rbRafael Mendonça França2016-06-162-3/+3
| |_|_|/ |/| | | | | | | | | | | | | | | This option is used in a initializer hook that runs before the config/initializers files so it will not work if it is set there.
* | | | Merge pull request #25411 from javan/fix-digesting-different-formatsMatthew Draper2016-06-175-6/+49
|\ \ \ \ | | | | | | | | | | Fix digesting non-HTML templates with non-unique logical names
| * | | | Add test for nested html dependencies with same logical name as templates ↵Javan Makhmali2016-06-151-2/+6
| | | | | | | | | | | | | | | | | | | | for other formats
| * | | | Move and rename testJavan Makhmali2016-06-151-7/+7
| | | | |
| * | | | Fix finding templates for digesting for */* requests that render a ↵Javan Makhmali2016-06-154-3/+30
| | | | | | | | | | | | | | | | | | | | non-default (html) template
| * | | | Explicity find with the rendered format to handle searching multiple view ↵Javan Makhmali2016-06-153-4/+2
| | | | | | | | | | | | | | | | | | | | paths correctly
| * | | | Fix digesting templates with identical logical names when requesting a ↵Javan Makhmali2016-06-153-4/+18
| | | | | | | | | | | | | | | | | | | | format other than the first default
* | | | | Merge pull request #25416 from alexcameron89/masterRafael França2016-06-161-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | [ci skip] Remove duplicate alias documentation in ActiveModel::Validations
| * | | | [ci skip] Remove duplicate alias documentation in ActiveModel::ValidationsAlex Kitchens2016-06-161-2/+0
|/ / / /
* | | | Merge pull request #25271 from kamipo/prevent_range_error_for_existsSean Griffin2016-06-153-10/+6
|\ \ \ \ | | | | | | | | | | Prevent `RangeError` for `FinderMethods#exists?`
| * | | | Prevent `RangeError` for `FinderMethods#exists?`Ryuta Kamizono2016-06-163-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `FinderMethods#exists?` should return a boolean rather than raising an exception. `UniquenessValidator#build_relation` catches a `RangeError` because it includes type casting due to a string value truncation. But a string value truncation was removed at #23523 then type casting in `build_relation` is no longer necessary. aa06231 removes type casting in `build_relation` then a `RangeError` moves to `relation.exists?`. This change will remove the catching a `RangeError`.
| * | | | Avoid type casting in uniqueness validatorRyuta Kamizono2016-06-041-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Type casting in uniqueness validator is for a string value truncation. It was removed at #23523.
* | | | | Merge pull request #25407 from pjscopeland/doc/correct-pg-exampleRafael França2016-06-151-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Correct example in PostgreSQL guide
| * | | | | Example had results the wrong way round [ci skip]Patrick Copeland2016-06-161-2/+2
|/ / / / /
* | | | | Merge pull request #25339 from prathamesh-sonpatki/reuse-validate-index-lengthRafael França2016-06-151-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Reuse validate index length
| * | | | | Reuse existing validate_index_length! methodPrathamesh Sonpatki2016-06-091-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/commit/1ea6cc11211dc89e3e14b2b641a3cca8a0a91d55.
* | | | | | Merge pull request #25402 from alexcameron89/masterRafael França2016-06-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Change AS::Callback to ActiveSupport::Callbacks in doc [ci skip]
| * | | | | | Change AS::Callback to ActiveSupport::Callbacks in doc [ci skip]Alex Kitchens2016-06-141-1/+1
|/ / / / / /
* | | | | | Fix postgresql query_cache testArthur Neves2016-06-141-0/+1
| | | | | |
* | | | | | Respect the current `connected?` method when calling `cache`Arthur Neves2016-06-142-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we enable query caching we check if the connection is connected. Before this fix we were always checking against the main connection, and not the model connection.
* | | | | | Remove not needed line on testArthur Neves2016-06-141-1/+0
| | | | | |
* | | | | | Merge pull request #25401 from jwgoh/docs/request-responseRichard Schneeman2016-06-141-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add Rack doc link for request and response object [ci skip]
| * | | | | | Add Rack doc link for request and response object [ci skip]Jun Wan Goh2016-06-141-2/+2
|/ / / / / /
* | | | | | Merge pull request #25399 from ↵Robin Dupret2016-06-141-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | wynksaiddestroy/fix-typo-and-simply-after-commit-example [skip ci] Fix typo and simplify after_commit example
| * | | | | | [skip ci] Fix typo and simplify after_commit examplewynksaiddestroy2016-06-141-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | The beginning of the note on the :on option is not capitalised correctly. The :destroy symbol in the after_commit example is unnecessarily wrapped in an array.
* | | | | | Fix error message to talk about the scale not precision of the typeRafael Mendonça França2016-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #25391
* | | | | | Fix missing requires for object/blankRafael Mendonça França2016-06-132-1/+3
| | | | | |
* | | | | | Merge pull request #25390 from gsamokovarov/abstact-unit-presence-requireRafael França2016-06-131-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Require "active_support/core_ext/object/blank" for railties abstract unit
| * | | | | | Require "active_support/core_ext/object/blank" for railties abstract unitGenadi Samokovarov2016-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #25380 I moved an `active_support/core_ext/object/blank` in the `activesupport/lib/active_support/testing/assertions.rb`, however it caused a chain reaction, resulting in failing railties tests. Moving the require to `railties/test/isolation/abstract_unit.rb` and `activesupport/test/abstract_unit.rb`.