Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ci skip] Fix for Security Guide - Captcha Section | Anderson Dadario | 2015-03-22 | 1 | -4/+6 |
| | |||||
* | Merge pull request #19443 from radanskoric/fix-am-errors-deprecation | Carlos Antonio da Silva | 2015-03-21 | 1 | -0/+1 |
|\ | | | | | Fix ActiveModel::Errors deprecation messages failing when used on its own | ||||
| * | Fix ActiveModel::Errors deprecation messages failing when used on its own | Radan Skoric | 2015-03-21 | 1 | -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. | ||||
* | | Rework form helper example to use Person.new | Carlos Antonio da Silva | 2015-03-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | The previous change 92a3c8dcdf174dab5e8759031b6bbe6cd891fe3c improved this example, but calling .create + #valid? ends up running validations twice, and we don't want to showcase that. Lets use the normal use case of building a new object and calling #save on it, which is what a basic scaffold with Active Record does. [ci skip] | ||||
* | | Merge pull request #19441 from y-yagi/use_exist | Arthur Nogueira Neves | 2015-03-21 | 1 | -1/+1 |
|\ \ | | | | | | | use `Dir.exist?` instead of deprecated `Dir.exists?` | ||||
| * | | use `Dir.exist?` instead of deprecated `Dir.exists?` | yuuji.yaginuma | 2015-03-21 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #19445 from prathamesh-sonpatki/rm-ostruct | Arthur Nogueira Neves | 2015-03-21 | 1 | -1/+0 |
|\ \ | | | | | | | Removed requiring ostruct because its unused | ||||
| * | | Removed requiring ostruct because its unused | Prathamesh Sonpatki | 2015-03-21 | 1 | -1/+0 |
| |/ | |||||
* | | Merge pull request #19444 from prathamesh-sonpatki/fix-typos | Kasper Timm Hansen | 2015-03-21 | 1 | -2/+2 |
|\ \ | |/ |/| | [ci skip] Fix typos in test runner's help output | ||||
| * | Fix typos in test runner's help output | Prathamesh Sonpatki | 2015-03-21 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #19438 from yui-knk/fix/comment | Arthur Nogueira Neves | 2015-03-20 | 1 | -1/+2 |
|\ | | | | | [ci skip] Check a result of `valid?` instead of `create` | ||||
| * | [ci skip] Check a result of `valid?` instead of `create` | yui-knk | 2015-03-21 | 1 | -1/+2 |
|/ | |||||
* | Revert "Use `def setup` instead of `setup do`" | eileencodes | 2015-03-20 | 1 | -4/+2 |
| | | | | This reverts commit 044f9ab7a4d6646ddce4560bb83b58cdc0baa751. | ||||
* | `rake initializer` -> `rake initializers` | Godfrey Chan | 2015-03-20 | 3 | -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_header | Rafael Mendonça França | 2015-03-20 | 3 | -1/+12 |
|\ | | | | | Fix handling of empty X_FORWARDED_HOST header. | ||||
| * | Fix handling of empty X_FORWARDED_HOST header. | adam | 2015-03-20 | 3 | -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 namespace | Rafael Mendonça França | 2015-03-20 | 2 | -12/+10 |
| | | |||||
* | | Merge pull request #19413 from kirs/replace-alias_method_chain | Rafael Mendonça França | 2015-03-20 | 3 | -22/+24 |
|\ \ | | | | | | | Replace occurences of alias_method_chain with their Module#prepend counterpart | ||||
| * | | Use Module#prepend instead of alias_method_chain | Kir Shatrov | 2015-03-20 | 3 | -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_nil | Rafael Mendonça França | 2015-03-20 | 3 | -1/+14 |
| |/ |/| | | | | | Strip nils out of default translations. Fixes #19419 | ||||
* | | Merge pull request #19432 from cllns/more-inclusive-wording | Rafael Mendonça França | 2015-03-20 | 1 | -1/+1 |
|\ \ | | | | | | | Testing Guide: Change 'girlfriend' to 'partner' | ||||
| * | | Change 'girlfriend' to 'partner' | Sean Collins | 2015-03-20 | 1 | -1/+1 |
|/ / | |||||
* | | Revert "Merge pull request #19404 from dmathieu/remove_rack_env" | Jeremy Kemper | 2015-03-20 | 16 | -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 Kemper | 2015-03-20 | 1 | -7/+0 |
| | | | | | | | | | | | | | | Preserving RACK_ENV behavior. This reverts commit b19990c82c6a9beff0cd058dc2ff67894a2f9ea7, reversing changes made to ac291b76ea770b5795c767f2f74a8d0b33744809. | ||||
* | | Fix kwargs warning in `test_get_xml` | eileencodes | 2015-03-20 | 1 | -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` method | eileencodes | 2015-03-20 | 2 | -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 it | eileencodes | 2015-03-20 | 1 | -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 task | Akira Matsuda | 2015-03-20 | 1 | -0/+0 |
| | | |||||
* | | Merge pull request #19417 from akshay-vishnoi/test-correct | Rafael Mendonça França | 2015-03-19 | 1 | -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 select | Akshay Vishnoi | 2015-03-20 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #19416 from akshay-vishnoi/test-correct | Rafael Mendonça França | 2015-03-19 | 1 | -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 symbol | Akshay Vishnoi | 2015-03-19 | 1 | -3/+3 |
|/ / | |||||
* | | Don't cast nil to string in pg enums | Sean Griffin | 2015-03-19 | 2 | -1/+11 |
| | | | | | | | | Fixes #19389. | ||||
* | | Merge pull request #19415 from amitsuroliya/mysql_version_update | Rafael Mendonça França | 2015-03-19 | 5 | -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 ↵ | amitkumarsuroliya | 2015-03-19 | 5 | -7/+7 |
|/ / | | | | | | | skip] | ||||
* | | Merge pull request #19412 from amitsuroliya/mysql_adapter_doc | Sean Griffin | 2015-03-19 | 1 | -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] | amitkumarsuroliya | 2015-03-19 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #19410 from y-yagi/add_reference_example | Sean Griffin | 2015-03-19 | 1 | -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.yaginuma | 2015-03-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #19411 from dmathieu/rack_env_changelog | Arthur Nogueira Neves | 2015-03-19 | 1 | -0/+7 |
|\ \ \ | |_|/ |/| | | Changelog entry for removal of RACK_ENV fallback | ||||
| * | | add changelog entry for removing the fallback to rack_env | Damien Mathieu | 2015-03-19 | 1 | -0/+7 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #19407 from amitsuroliya/mysql_adapter_doc | Yves Senn | 2015-03-19 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Updated MySQL documentation link for STRICT_ALL_TABLES [ci skip] | ||||
| * | | Updated MySQL documentation link for STRICT_ALL_TABLES | amitkumarsuroliya | 2015-03-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #19404 from dmathieu/remove_rack_env | Aaron Patterson | 2015-03-19 | 16 | -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 present | Damien Mathieu | 2015-03-19 | 16 | -120/+31 |
| | | | | |||||
* | | | | Merge branch 'bin_test_runner'. #19216 | Arthur Neves | 2015-03-19 | 8 | -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 runner | Arthur Neves | 2015-03-19 | 2 | -5/+6 |
| | | | | |||||
| * | | | Fix test rake when passing multiple arguments | Arthur Neves | 2015-03-19 | 1 | -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 railties | Arthur Neves | 2015-03-19 | 5 | -13/+2 |
|/ / / | |||||
* | | | Merge pull request #19216 from senny/bin_test_runner | Yves Senn | 2015-03-19 | 14 | -65/+411 |
|\ \ \ | | | | | | | | | `bin/rails test` runner (rerun snippets, run tests by line, option documentation) |