aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21318 from yahonda/pr21108Rafael Mendonça França2015-09-012-3/+7
|\ | | | | Support MySQL 5.7.8 which enables show_compatibility_56=off
| * Support MySQL 5.7.8 which enables show_compatibility_56=offYasuo Honda2015-08-212-3/+7
| |
* | No need CHANGELOG entry for #21421 [ci skip]Rafael Mendonça França2015-09-011-6/+0
| |
* | Merge pull request #21421 from leighhalliday/array_inq_toggle_string_symbolRafael Mendonça França2015-09-013-11/+22
|\ \ | | | | | | ArrayInquirer to correctly find symbols or strings
| * | ArrayInquirer to correctly find symbols or stringsLeigh Halliday2015-08-283-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | The problem existed where if your ArrayInquirer values were strings but you checked them using any? with a symbol, it would not find the value. Now it will correctly check whether both the String form or the Symbol form are included in the Array. `
* | | Inline uneccessary frozen string constantSean Griffin2015-08-311-3/+1
| | | | | | | | | | | | | | | | | | | | | We are only supporting Ruby 2.2 and later in Rails 5, so we do not need an actual constant here. Additionally, referencing a constant actually does a hash lookup (because constants are not constant in Ruby >_>). This will be marginally (likely immeasurable) faster. It is less ugly.
* | | Merge pull request #21436 from claudiob/silence-callbacks-warningRafael Mendonça França2015-08-311-0/+1
|\ \ \ | | | | | | | | Silence callback deprecation warning if testing AJ
| * | | Silence callback deprecation warning if testing AJclaudiob2015-08-311-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the log returned by running ActiveJob tests is filled with: > DEPRECATION WARNING: Returning `false` in a callback will not implicitly halt a callback chain in the next release of Rails. To explicitly halt a callback chain, please use `throw :abort` instead. For instance, see https://travis-ci.org/rails/rails/builds/77978273 This happens because some setup and teardown methods [like these one](https://github.com/rails/rails/blob/master/activejob/test/cases/async_job_test.rb#L10-L17) invoke other methods like `perform_asynchronously!` that can return `false`, but not with the intention of halting the process if they do. In my opinion, these deprecation warnings can be silenced to have the log result cleaner (especially when browsing for errors).
* | | Merge pull request #21432 from yui-knk/fix/what_change_method_can_reverseSean Griffin2015-08-302-15/+34
|\ \ \ | | | | | | | | [ci skip] Update what methods `Migration#change` can reverse
| * | | [ci skip] Update what methods `Migration#change` can reverseyui-knk2015-08-312-15/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Documentations and comments about what methods `Migration#change` can reverse is out of date. For example `change_column_default` is now reversible by this [commit](https://github.com/rails/rails/pull/20018). * Comments about `CommandRecorder` dose not match with Rails Guide. For example `add_foreign_key` is listed only on Rails Guide.
* | | | Merge pull request #21433 from y-yagi/fix_typoKasper Timm Hansen2015-08-301-1/+1
|\ \ \ \ | | | | | | | | | | fix typo in method name [ci skip]
| * | | | fix typo in method name [ci skip]yuuji.yaginuma2015-08-301-1/+1
|/ / / /
* | | | Merge pull request #21429 from yui-knk/fix/revert_disable_extensionSean Griffin2015-08-302-1/+34
|\ \ \ \ | |/ / / |/| | | Make revert of `disable_extension` to work
| * | | Make revert of `disable_extension` to workyui-knk2015-08-302-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | This is fix of #11826 which miss to add `disable_extension` to `ReversibleAndIrreversibleMethods`. So `CommandRecorder#method_missing` catches `change_column_default` and @delegate's method is called.
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-08-302-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Capitalize commentsyui-knk2015-08-291-1/+1
| | | |
| * | | [ci skip] Fix file name generated by `rails generate`yui-knk2015-08-241-1/+1
| | | |
* | | | add a method for getting the http auth saltAaron Patterson2015-08-292-2/+6
| | | |
* | | | env to get_header conversionAaron Patterson2015-08-291-1/+1
| | | |
* | | | fixes example for consistency [ci skip]Xavier Noria2015-08-291-3/+3
| | | |
* | | | swaps words [ci skip]Xavier Noria2015-08-291-1/+1
| | | |
* | | | revamps the docs of strong params require [ci skip]Xavier Noria2015-08-291-9/+40
| | | | | | | | | | | | | | | | References #19565.
* | | | Merge pull request #21423 from y-yagi/rails_test_optsCarlos Antonio da Silva2015-08-281-1/+1
|\ \ \ \ | | | | | | | | | | make `ENV` a required argument
| * | | | make `ENV` a required argumentyuuji.yaginuma2015-08-291-1/+1
|/ / / /
* | | | Merge pull request #21420 from akihiro17/renderingRafael Mendonça França2015-08-282-3/+2
|\ \ \ \ | |_|/ / |/| | | Set the content-type to `text/html` if the options[:html] is true
| * | | Set the content-type to `text/html` if the options[:html] is trueakihiro172015-08-292-3/+2
|/ / / | | | | | | | | | | | | | | | In this commit, we set the content-type to `text/html` in AbstractController if the `options[:html]` is true so that we don't include ActionView::Rendering into ActionController::Metal to set it properly. I removed the if `options[:plain]` statement because `AbstractController#rendered_format` returns `Mime::TEXT` by default.
* | | revises 877e42eXavier Noria2015-08-282-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * A string in the example lacked quotes. * The tests asserted stuff about :last_name, whereas test params do not have that key. * But, the first one passed, why? After hitting my head against the wall and doing some obscure rituals realized the new #require had an important typo, wanted to iterate over the array argument (key), but it ran over its own hash keys (method #keys). * Modified the test to prevent the same typo to happen again. * The second test assigned to an unused variable safe_params that has been therefore removed. * Grammar of the second test description. * Since I was on it, reworded both test descriptions.
* | | pg, `create_schema`, `drop_schema` and `rename_table` quote schema name.Yves Senn2015-08-284-10/+67
| | | | | | | | | | | | | | | | | | | | | | | | Closes #21418. Previously schema names were not quoted. This leads to issues when a schema names contains a ".". Methods in `schema_statements.rb` should quote user input.
* | | Tiny documentation improvements [ci skip]Robin Dupret2015-08-282-7/+9
| | |
* | | [ci skip] Better description for starting up with new Rails projectShivani2015-08-281-4/+3
| | | | | | | | | | | | These changes rephrases the description with better explanation of step by step process.
* | | Merge pull request #19565 from gaurish/multiple_require_paramsKasper Timm Hansen2015-08-282-0/+25
|\ \ \ | | | | | | | | [Feature] params.require accepts array of parameters that should be present or raise error
| * | | [Feature] params.require requires array of paramsGaurish Sharma2015-08-282-0/+25
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR adds ability to accept arrays which allows you to require multiple values in one method. so instead of this: ```ruby params.require(:person).require(:first_name) params.require(:person).require(:last_name) ``` Here it will be one line for each params, so say if I require 10params, it will be 10lines of repeated code which is not dry. So I have added new method which does this in one line: ```ruby params.require(:person).require([:first_name, :last_name]) ``` Comments welcome
* | | pg docs, `connection.tables` does not use the `name` argument.Yves Senn2015-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Currently the `#tables` method does not make use of the `name` argument and always returns all the tables in the schema search path. However the docs suggest different behavior. While we should porbably adjust the implementation to provide this behavior, let's make the docs right for now (also for `4-2-stable`) and then implement the behavior on `master`.
* | | PostgreSQL, add `:if_exists` to `#drop_schema`.Yves Senn2015-08-284-13/+30
| | |
* | | Merge pull request #21417 from rousisk/docfixYves Senn2015-08-281-2/+5
|\ \ \ | | | | | | | | fix reference to undefined variable in email testing guide [ci skip]
| * | | fix reference to undefined variable in email testing guide [ci skip]Konstantinos Rousis2015-08-281-2/+5
|/ / /
* | | Merge pull request #17502 from vipulnsward/configurable-delimited-regexRafael Mendonça França2015-08-286-2/+35
|\ \ \ | | | | | | | | Support for custom regular expression for number_to_delimeted
| * | | - Extracted `DELIMITED_REGEX` to `delimited_regex` method and made use of ↵Vipul A M2015-08-286-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user passed `options[:delimited_regex]` if available. Changed `DELIMITED_REGEX` to `DEFAULT)DELIMITED_REGEX` to signify what it means. - Added tests for number to delimited and number to currency in both actionview and activesupport. Changes Changes
* | | | Merge pull request #21396 from rodzyn/code-cleanupGuillermo Iguaran2015-08-282-13/+2
|\ \ \ \ | |/ / / |/| | | Code cleanup
| * | | Code cleanupMarcin Olichwirowicz2015-08-272-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup for `ActionDispatch::Http::Parameters` - no need for required libraries and remove not used private method. Apparently this method was used in `ActionDispatch::Http::Request` - fixed by calling `Request::Utils` explicitly (as was done in other parts of the codebase)
* | | | Disable warnings in railties testsRafael Mendonça França2015-08-271-1/+1
| | | |
* | | | Merge pull request #21411 from ↵Rafael Mendonça França2015-08-271-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | byroot/perf-improvement-in-dependencies-loadable-constants 10X speed improvements for AS::Dependencies.loadable_constants_for_path
| * | | | 10X speed improvements for AS::Dependencies.loadable_constants_for_pathJean Boussier2015-08-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the autoload_paths start to grows, this methods is quite a hotspot >> ActiveSupport::Dependencies.autoload_paths.size => 49 >> Benchmark.ips { |x| x.report('baseline') { ActiveSupport::Dependencies.loadable_constants_for_path(File.expand_path('app/models/shop')) }} Calculating ------------------------------------- baseline 90.000 i/100ms ------------------------------------------------- baseline 1.073k (±20.2%) i/s - 4.950k After the patch Calculating ------------------------------------- patched 883.000 i/100ms ------------------------------------------------- patched 11.050k (±19.7%) i/s - 50.331k
* | | | | Merge pull request #21409 from piton4eg/patch-9Claudio B.2015-08-271-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Fix Configuring Active Record [ci skip]
| * | | | Fix Configuring Active Record [ci skip]Alexey Markov2015-08-271-2/+2
| | | | |
* | | | | Merge pull request #21410 from y-yagi/fix_link_in_plugin_guideSean Griffin2015-08-271-1/+0
|\ \ \ \ \ | | | | | | | | | | | | remove link to outdated article in plugins guide [ci skip]
| * | | | | remove link to outdated article in plugins guide [ci skip]yuuji.yaginuma2015-08-281-1/+0
|/ / / / / | | | | | | | | | | | | | | | linked article is a description of the plugins in Rails 2.1.
* | | | | Revert "this always sets :public to false, so just do that"Aaron Patterson2015-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cae2b5bb59212961c4a35c939381ebece48d1177. I am an idiot.
* | | | | this always sets :public to false, so just do thatAaron Patterson2015-08-271-1/+1
| | | | |
* | | | | remove dependency on `@cache_control` ivarAaron Patterson2015-08-271-6/+6
|/ / / / | | | | | | | | | | | | | | | | eventually we'll remove this instance variable, but this is the first step