aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix ActiveModel::Errors deprecation messages failing when used on its ownRadan Skoric2015-03-211-0/+1
| | | | | | Deprecation messages in ActiveModel::Errors are using String#squish from ActiveSupport but were not explicitly requiring it, causing failures when used outside rails.
* Merge pull request #19438 from yui-knk/fix/commentArthur Nogueira Neves2015-03-201-1/+2
|\ | | | | [ci skip] Check a result of `valid?` instead of `create`
| * [ci skip] Check a result of `valid?` instead of `create`yui-knk2015-03-211-1/+2
|/
* Revert "Use `def setup` instead of `setup do`"eileencodes2015-03-201-4/+2
| | | | This reverts commit 044f9ab7a4d6646ddce4560bb83b58cdc0baa751.
* `rake initializer` -> `rake initializers`Godfrey Chan2015-03-203-6/+7
| | | | | | Also edited the copy to be more consistent with `rake routes`. See #19323.
* Merge pull request #19433 from agfor/fix_host_with_x_forwarded_host_headerRafael Mendonça França2015-03-203-1/+12
|\ | | | | Fix handling of empty X_FORWARDED_HOST header.
| * Fix handling of empty X_FORWARDED_HOST header.adam2015-03-203-1/+12
| | | | | | | | | | | | Previously, an empty X_FORWARDED_HOST header would cause Actiondispatch::Http:URL.raw_host_with_port to return nil, causing Actiondispatch::Http:URL.host to raise a NoMethodError.
* | Mark some constants as nodoc and remove unneeded namespaceRafael Mendonça França2015-03-202-12/+10
| |
* | Merge pull request #19413 from kirs/replace-alias_method_chainRafael Mendonça França2015-03-203-22/+24
|\ \ | | | | | | Replace occurences of alias_method_chain with their Module#prepend counterpart
| * | Use Module#prepend instead of alias_method_chainKir Shatrov2015-03-203-22/+24
| | | | | | | | | | | | | | | | | | | | | Thanks @fbernier for suggestion! <3 At this moment we can use Module#prepend in all all cases except of Range because of the bug [1] in MRI 2.2 [1] https://bugs.ruby-lang.org/issues/10847
* | | Merge pull request #19421 from jcoyne/translate_defaults_with_nilRafael Mendonça França2015-03-203-1/+14
| |/ |/| | | | | Strip nils out of default translations. Fixes #19419
* | Merge pull request #19432 from cllns/more-inclusive-wordingRafael Mendonça França2015-03-201-1/+1
|\ \ | | | | | | Testing Guide: Change 'girlfriend' to 'partner'
| * | Change 'girlfriend' to 'partner'Sean Collins2015-03-201-1/+1
|/ /
* | Revert "Merge pull request #19404 from dmathieu/remove_rack_env"Jeremy Kemper2015-03-2016-31/+120
| | | | | | | | | | | | | | Preserving RACK_ENV behavior. This reverts commit 7bdc7635b885e473f6a577264fd8efad1c02174f, reversing changes made to 45786be516e13d55a1fca9a4abaddd5781209103.
* | Revert "Merge pull request #19411 from dmathieu/rack_env_changelog"Jeremy Kemper2015-03-201-7/+0
| | | | | | | | | | | | | | Preserving RACK_ENV behavior. This reverts commit b19990c82c6a9beff0cd058dc2ff67894a2f9ea7, reversing changes made to ac291b76ea770b5795c767f2f74a8d0b33744809.
* | Fix kwargs warning in `test_get_xml`eileencodes2015-03-201-1/+1
| | | | | | | | | | | | ActionDispatch::IntegrationTest HTTP request methods will accept only certain kwargs in the future. This test caused a deprecation warning when running ActionPack tests. Added `params` and `headers` to fix.
* | Remove `#build_original_fullpath` methodeileencodes2015-03-202-32/+0
| | | | | | | | | | | | | | | | | | | | | | Removing `#build_original_fullpath` because it is no longer used by the Rails' source code or called in the `#call` method becasue the previous commit now uses `fullpath` from Rack. The method was nodoc'ed so it's safe to remove. NOTE: I did this as a separate commit so if this does cause a problem with engines etc reverting is easy.
* | Use fullpath from Rack request rather than building iteileencodes2015-03-201-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rack, `#fullpath` checks if there is a query string and builds the query correctly: ``` def path script_name + path_info end def fullpath query_string.empty? ? path : "#{path}?#{query_string}" end ``` We can utilize this instead of manually building the fullpath because they are the same result. This also reduces allocations in `#call` because we don't need `build_original_fullpath` to create the paths and query strings. We don't need to build `fullpath` twice.
* | Test files should be named *_test.rb to be executed via rake taskAkira Matsuda2015-03-201-0/+0
| |
* | Merge pull request #19417 from akshay-vishnoi/test-correctRafael Mendonça França2015-03-191-4/+4
|\ \ | | | | | | [Fix Select tag Tests] Test correct use of multiple option for select tag
| * | [Fix Select tag Tests] Test correct use of multiple option for selectAkshay Vishnoi2015-03-201-4/+4
| | |
* | | Merge pull request #19416 from akshay-vishnoi/test-correctRafael Mendonça França2015-03-191-3/+3
|\| | | | | | | | Fix test messages use directly true, false and nil instead of their symbol
| * | Fix test messages use directly true, false and nil instead of their symbolAkshay Vishnoi2015-03-191-3/+3
|/ /
* | Don't cast nil to string in pg enumsSean Griffin2015-03-192-1/+11
| | | | | | | | Fixes #19389.
* | Merge pull request #19415 from amitsuroliya/mysql_version_updateRafael Mendonça França2015-03-195-7/+7
|\ \ | | | | | | Updated MySQL documentation link to MySQL latest version 5.6 everywhere ...
| * | Updated MySQL documentation link to MySQL latest version 5.6 everywhere [ci ↵amitkumarsuroliya2015-03-195-7/+7
|/ / | | | | | | skip]
* | Merge pull request #19412 from amitsuroliya/mysql_adapter_docSean Griffin2015-03-191-2/+2
|\ \ | | | | | | Updated MySQL documentation link to latest version MySQL 5.6 [ci skip]
| * | Updated MySQL documentation link to latest version MySQL 5.6 [ci skip]amitkumarsuroliya2015-03-191-2/+2
| | |
* | | Merge pull request #19410 from y-yagi/add_reference_exampleSean Griffin2015-03-191-1/+1
|\ \ \ | |_|/ |/| | add foreign_key option to result of references column type [ci skip]
| * | add foreign_key option to result of references column type [ci skip]yuuji.yaginuma2015-03-191-1/+1
| | |
* | | Merge pull request #19411 from dmathieu/rack_env_changelogArthur Nogueira Neves2015-03-191-0/+7
|\ \ \ | |_|/ |/| | Changelog entry for removal of RACK_ENV fallback
| * | add changelog entry for removing the fallback to rack_envDamien Mathieu2015-03-191-0/+7
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #19407 from amitsuroliya/mysql_adapter_docYves Senn2015-03-191-1/+1
|\ \ \ | |/ / |/| | Updated MySQL documentation link for STRICT_ALL_TABLES [ci skip]
| * | Updated MySQL documentation link for STRICT_ALL_TABLESamitkumarsuroliya2015-03-191-1/+1
| | |
* | | Merge pull request #19404 from dmathieu/remove_rack_envAaron Patterson2015-03-1916-120/+31
|\ \ \ | | | | | | | | Don't fallback to RACK_ENV when RAILS_ENV is not present
| * | | don't fallback to RACK_ENV when RAILS_ENV is not presentDamien Mathieu2015-03-1916-120/+31
| | | |
* | | | Merge branch 'bin_test_runner'. #19216Arthur Neves2015-03-198-20/+10
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | 3 commits were missing when we merged the PR, probably they were lost when that branch was rebased against latest master. This merge, contains those 3 commits.
| * | | Use absolute path on find_method location for the runnerArthur Neves2015-03-192-5/+6
| | | |
| * | | Fix test rake when passing multiple argumentsArthur Neves2015-03-191-2/+2
| | | | | | | | | | | | | | | | bundle exec db:migrate rake was not working, with the new runner, before this commit
| * | | method_source needs to be a hard dependency on railtiesArthur Neves2015-03-195-13/+2
|/ / /
* | | Merge pull request #19216 from senny/bin_test_runnerYves Senn2015-03-1914-65/+411
|\ \ \ | | | | | | | | `bin/rails test` runner (rerun snippets, run tests by line, option documentation)
| * | | run `test_test.rb` using the `bin/rails test`.Yves Senn2015-03-181-17/+1
| | | |
| * | | Use Rails::TestRunner on rake testArthur Neves2015-03-181-16/+17
| | | |
| * | | Fix reporter test and verbose modeArthur Neves2015-03-182-10/+8
| | | |
| * | | move `ENV["BACKTRACE"]` support into the TestRunner.Yves Senn2015-03-183-3/+12
| | | |
| * | | `-p`, `--pattern` to run tests using a pattern.Yves Senn2015-03-182-2/+5
| | | |
| * | | use `bin/rails t` runner in `test_runner_test.rb`.Yves Senn2015-03-183-30/+23
| | | |
| * | | Fix relative dir call on test runnerArthur Neves2015-03-182-15/+24
| | | |
| * | | Add tests for runner#test_files methodArthur Neves2015-03-182-7/+21
| | | |
| * | | Run multiple files on runnerArthur Neves2015-03-182-6/+21
| | | |