aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #1 from radiospiel/tickets/26955-listen-pathsRafael Mendonça França2017-03-281-0/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | No longer listens to dirs outside of the app directory.
| * | | | | No longer listens to dirs inside of installed gemseno2016-11-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails5 uses the listen gem to watch for changes from autoload directories and from i18n directories. Changes there would be reflected by the running app, in development mode usually. However, files outside of the application directory or locally installed gems should not change during development, and rails does not need to reflect changes there if they do. This change makes sure only those paths that do not originate from the app itself are watched. This can help especially with the situation on OSX, where rb-fsevent - which implements file watching - is quite a resource hog.
* | | | | | Merge pull request #28584 from bogdanvlviv/errors-keys-values-fixRafael França2017-03-283-11/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix ActiveModel::Errors #keys, #values
| * | | | | | Fix ActiveModel::Errors #keys, #valuesbogdanvlviv2017-03-283-11/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: person.errors.keys # => [] person.errors.values # => [] person.errors[:name] # => [] person.errors.keys # => [:name] person.errors.values # => [[]] After: person.errors.keys # => [] person.errors.values # => [] person.errors[:name] # => [] person.errors.keys # => [] person.errors.values # => [] Related to #23468
* | | | | | | Merge pull request #28514 from y-yagi/follow_up_to_28056Andrew White2017-03-281-8/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix store accessors in parameters test
| * | | | | | | Fix store accessors in parameters testyuuji.yaginuma2017-03-221-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The method name must be `stored_attributes`, not `stores_attributes`. * `attribute_names` must return a non-empty value. Because `stored_attributes` is not checked if `attribute_names` is empty. Follow up to #28056
* | | | | | | | Merge pull request #28549 from jess/patch-1Rafael França2017-03-281-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | make it clear how to enable caching
| * | | | | | | add proper punctuationJess Brown2017-03-231-1/+1
| | | | | | | |
| * | | | | | | make it clear how to enable cachingJess Brown2017-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | since this is a new change, many will be coming here to toggle the true/false config and not find it. This will allow them to quickly implement the change.
* | | | | | | | Return unmapped timezones from `country_zones`Andrew White2017-03-282-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a country doesn't exist in the MAPPINGS hash then create a new `ActiveSupport::Timezone` instance using the supplied timezone id. Fixes #28431.
* | | | | | | | No need to duplicate 5-1-stable CHANGELOG. [ci skip]Yves Senn2017-03-281-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `master` changelog refer back to the `5-1-stable` changelog as a base. No need to duplicate backported entries in the changelogs on `master`.
* | | | | | | | Fix the tests to test what they should be testingRafael Mendonça França2017-03-271-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Rack::Test the headers needs to match the `HTTP_` format. The tests were passing before because they are not asserting the response was a cache hit.
* | | | | | | | Make sure that ActionController::Api can include helpersRafael Mendonça França2017-03-271-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #28554
* | | | | | | | Merge pull request #28557 from ↵Rafael França2017-03-273-1/+56
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/remove_unnecessary_files_to_api_applications_when_app_task_task_executed Remove unnecessary files to API-only Applications when `app:task` task executed
| * | | | | | | | Remove unnecessary files to API-only Applications when `app:task` task executedyuuji.yaginuma2017-03-243-1/+56
| | | | | | | | |
* | | | | | | | | Merge pull request #28546 from claudiob/drop-j-optionRafael Mendonça França2017-03-272-16/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove -j (--javascript) option from `rails new`
| * | | | | | | | | Remove -j (--javascript) option from `rails new`claudiob2017-03-233-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "-j" option was added 5 years ago (https://github.com/rails/rails/commit/d9c39c3a) when we wanted to support prototype-rails and jquery-rails. Prototype is not as popular and jQuery is not a requirement anymore. Still the "-j" option can be used to install *any* gem that ends in "-rails". This "might" open security issues and does not bring great benefits anymore. If you know which "-rails"-ending gem you want to install, you can manually add it to the Gemfile just like any other gem.
* | | | | | | | | | Apply the log_level defaultRafael Mendonça França2017-03-271-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 4.2 the default log level in production is now debug. We removed the deprecation in c2e865849beadd99866e521a93d733da7d1b5255 but we don't reflected the default value. We are not appling it. Closes #28558
* | | | | | | | | | Merge pull request #28050 from namusyaka/avoid-converting-int-into-floatRafael Mendonça França2017-03-273-0/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid converting integer as a string into float
| * | | | | | | | | | Avoid converting integer as a string into floatnamusyaka2017-02-183-0/+14
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #28488 from kamipo/preprocess_association_query_handlingRafael França2017-03-271-13/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Preprocess association query handling in predicate builder
| * | | | | | | | | | | Always need to extract `value.bound_attributes` if `value.is_a?(Relation)`Ryuta Kamizono2017-03-251-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `RelationHandler` uses `value.arel`.
| * | | | | | | | | | | Preprocess association query handling in predicate builderRyuta Kamizono2017-03-201-11/+8
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently association query is handled as a postprocess. This has two problems. 1. When `value` is a `Hash`, we need to skip the postprocess using `next`. 2. `can_be_bound?` should return false if `table.associated_with?(column_name)` is true (pass to the postprocess). These are unneeded if preprocessing association query handling.
* | | | | | | | | | | Merge pull request #27636 from ↵Rafael França2017-03-2725-98/+191
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtsmfm/disable-referential-integrity-without-superuser-privilege-take-2 Use `SET CONSTRAINTS` for `disable_referential_integrity` without superuser privileges (take 2)
| * | | | | | | | | | | Load :author_addressesYasuo Honda2017-03-261-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Use `SET CONSTRAINTS` for `disable_referential_integrity` without superuser ↵Fumiaki MATSUSHIMA2017-03-2624-97/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | privileges (take 2) Re-create https://github.com/rails/rails/pull/21233 eeac6151a5 was reverted (127509c071b4) because it breaks tests. ---------------- ref: 72c1557254 - We must use `authors` fixture with `author_addresses` because of its foreign key constraint. - Tests require PostgreSQL >= 9.4.2 because it had a bug about `ALTER CONSTRAINTS` and fixed in 9.4.2.
* | | | | | | | | | | | Merge pull request #28485 from quantumlicht/fix_migrate_with_empty_versionRafael França2017-03-274-3/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | fix migrate with empty version
| * | | | | | | | | | | | Fixes #28359Philippe Guay2017-03-264-3/+32
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add stronger assertions to rake migration tasks to make sure the user is providing a numeric VERSION An empty string was getting converted to version = 0. This would in turn pass the presence check. Address linting warning Add test for rake task and refactor code to meet expectations In particular passing VERSION=0 should not raise an error. Addressed Comments for PR #28485. Trimmed empty lines + change of wording for error message Adjust test for change of wording in error message Change condition to follow rails idioms
* | | | | | | | | | | | Merge pull request #28577 from ↵Rafael França2017-03-272-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/do_not_display_hidden_namespaces_in_destroy_command_help Do not show hidden namespaces in destroy commnad help
| * | | | | | | | | | | | Do not show hidden namespaces in destroy commnad helpyuuji.yaginuma2017-03-272-0/+6
| |/ / / / / / / / / / /
* | | | | | | | | | | | Use the stale branchRafael Mendonça França2017-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Add probot/stale configurationRafael Mendonça França2017-03-271-0/+24
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #28367 from ptoomey3/ignore-disabled-buttonsAaron Patterson2017-03-273-1/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent ujs event propagation if element disabled when event chain begins
| * | | | | | | | | | | | Prevent event propogation if element is disabled when event chain begins.Patrick Toomey2017-03-093-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing UJS event behavior relies on browsers not sending events for various events when an element is disabled. For example, imagine the following: <button type="submit" disabled="disabled">Click me</button> The above button is disabled, so browsers will not trigger a click event and all UJS behavior is prevented. However, imagine a button like this: <button type="submit" disabled="disabled"><strong>Click me</strong></button> The above is treated differently by browsers such as Chrome/Safari. These browsers do not consider the strong tag to be disabled, and will trigger click events. UJS has logic to walk up the DOM to find an associated element subject to UJS behavior. But, this logic does not take into account the disabled status of the element. I originally thought we could simply change the selectors used to match elements to ignore disabled elements. However, UJS disables some elements as part of the event chain. So, an element might match early in the chain and then fail to match later. Instead of changing the selectors I added a callback to the chain that calls `stopEverything` if an element is disabled when the event chain begins.
* | | | | | | | | | | | | Merge pull request #28541 from ota42y/fix/gemfile_generator_fixEileen M. Uchitelle2017-03-274-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | ignore system test gems on Gemfile when execute with --skip-test option
| * | | | | | | | | | | | ignore system test gems on Gemfile when execute with --skip-test optionota42y2017-03-274-2/+30
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | minor CHANGELOG formatting changes. [ci skip]Yves Senn2017-03-262-4/+2
| | | | | | | | | | | |
* | | | | | | | | | | | add field ids when generating a scaffold form.Yves Senn2017-03-264-7/+20
| |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to a6d065e. When using `form_with` you must supply field ids manually. Since the scaffold generator is using labels we need to make sure that they are linked up properly.
* | | | | | | | | | | Bump from h3 to h2 tagJon Moss2017-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "3 Days before release" should an h2, like the rest of the day headings. All of the steps are h3 tags. [ci skip]
* | | | | | | | | | | Small grammar fixJon Moss2017-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add apostrophe. [ci skip]
* | | | | | | | | | | Small grammar fixJon Moss2017-03-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add necessary commas. [ci skip]
* | | | | | | | | | | Update middleware listJon Moss2017-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Taken from `bin/rails about` run on a v5.1.0.rc1 application. [ci skip]
* | | | | | | | | | | Upgrade various Rails 5.0 references to 5.1Jon Moss2017-03-254-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RC1 is out, `5-1-stable` has been created, figured it was time to start updating this stuff :) [ci skip]
* | | | | | | | | | | Add WIP Rails 5.1 release notes to documents.yamlJon Moss2017-03-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge pull request #28571 from ↵Kasper Timm Hansen2017-03-251-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/rename_local_current_user_to_verified_user_guide Rename local variable name `current_user` to `verified_user` [ci skip]
| * | | | | | | | | | | Rename local variable name `current_user` to `verified_user` [ci skip]yuuji.yaginuma2017-03-251-3/+3
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related #28570
* | | | | | | | | | | Merge pull request #28570 from kamipo/rename_local_current_user_to_verified_userKasper Timm Hansen2017-03-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rename local variable name `current_user` to `verified_user` [ci skip]
| * | | | | | | | | | | Rename local variable name `current_user` to `verified_user` [ci skip]Ryuta Kamizono2017-03-251-2/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning local variable named `current_user` in the condition is confusing.
* | | | | | | | | | | Revert "Merge pull request #28569 from HarryCollins/patch-1"Kasper Timm Hansen2017-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 296d024b4e91c4891ae0b010249193513e63b921, reversing changes made to e341d835070c7ef9990f41e02bbf46536be0aee7. We aren't trying to compare to current_user, we're assigning that variable.
* | | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-03-252-4/+4
|\ \ \ \ \ \ \ \ \ \ \