aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge pull request #19455 from jonatack/patch-1Carlos Antonio da Silva2015-03-221-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Consistent spacing inside hash brackets in Action View guide.
| * | | | | | | | | | | | | [ci skip] Consistent spacing inside hash bracketsJon Atack2015-03-221-14/+14
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Move #19447 changelog to the top and reword it a bit [ci skip]Carlos Antonio da Silva2015-03-221-6/+8
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #19434 from kirs/deprecate-alias-method-chainRafael Mendonça França2015-03-227-108/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate alias_method_chain in favour of Module#prepend
| * | | | | | | | | | | | | | Deprecate alias_method_chain in favour of Module#prependKir Shatrov2015-03-227-108/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | …as discussed #19413
* | | | | | | | | | | | | | | Merge pull request #19461 from mechanicles/change-a-to-anRafael Mendonça França2015-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 'a' to 'an' for 'HABTM' word [ci skip]
| * | | | | | | | | | | | | | | Change 'a' to 'an' for 'HABTM' word [ci skip]Santosh Wadghule2015-03-231-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #19460 from yui-knk/feature/add_linkArthur Nogueira Neves2015-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | [ci skip] Add link for "parameter_names section"
| * | | | | | | | | | | | | | [ci skip] Add link for "parameter_names section"yui-knk2015-03-231-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #19454 from yui-knk/fix/guide_migrationsAbdelkader Boudih2015-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | [ci skip] Change `the null` to `a not null constraint`
| * | | | | | | | | | | | | [ci skip] Change `the null` to `a not null constraint`yui-knk2015-03-221-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #19451 from prathamesh-sonpatki/fix-typo-railties-changelogArun Agrawal2015-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in belongs_to_required_by_default config's CHANGELOG entry [ci...
| * | | | | | | | | | | | | Fix typo in belongs_to_required_by_default config's CHANGELOG entry [ci skip]Prathamesh Sonpatki2015-03-221-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #19442 from joevandyk/patch-1Matthew Draper2015-03-221-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | Fix documentation for find_or_create_by
| * | | | | | | | | | | | Fix documentation for find_or_create_byJoe Van Dyk2015-03-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code in the comment fails on concurrent inserts if done inside a transaction. The fix is to force a savepoint to run so that if the database raises an unique violation exception. Otherwise, you'll get errors like: ``` (0.3ms) BEGIN Cart Load (0.5ms) SELECT "carts".* FROM "carts" WHERE "carts"."uuid" = '12345' LIMIT 1 # Another process inserts a cart with uuid of '12345' right now SQL (4371.7ms) INSERT INTO "carts" ("created_at", "updated_at", "uuid") VALUES ('2015-03-21 01:05:07.833231', '2015-03-21 01:05:07.833231', '12345') RETURNING "id" [["created_at", Sat, 21 Mar 2015 01:05:07 PDT -07:00], ["updated_at", Sat, 21 Mar 2015 01:05:07 PDT -07:00], ["uuid", "12345"]] PG::UniqueViolation: ERROR: duplicate key value violates unique constraint "carts_uuid_idx1" DETAIL: Key (uuid)=(12345) already exists. : INSERT INTO "carts" ("created_at", "updated_at", "uuid") VALUES ('2015-03-21 01:05:07.833231', '2015-03-21 01:05:07.833231', '12345') RETURNING "id" # Retrying the find Cart Load (0.8ms) SELECT "carts".* FROM "carts" WHERE "carts"."uuid" = '12345' LIMIT 1 PG::InFailedSqlTransaction: ERROR: current transaction is aborted, commands ignored until end of transaction block : SELECT "carts".* FROM "carts" WHERE "carts"."uuid" = '12345' LIMIT 1 (0.1ms) ROLLBACK ActiveRecord::StatementInvalid: PG::InFailedSqlTransaction: ERROR: current transaction is aborted, commands ignored until end of transaction block : SELECT "carts".* FROM "carts" WHERE "carts"."uuid" = '12345' LIMIT 1 ```
* | | | | | | | | | | | | Merge pull request #19447 from wallerjake/postgresql_big_int_array_schema_rbSean Griffin2015-03-214-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check subtype limit before using the default limit
| * | | | | | | | | | | | | Delegate limit to subtypewallerjake2015-03-214-1/+16
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As described here https://github.com/rails/rails/issues/19420. When using the Postgres BigInt[] field type the big int value was not being translated into schema.rb. This caused the field to become just a regular integer field when building off of schema.rb. This fix will address this by delegating the limit from the subtype to the Array type. https://github.com/rails/rails/issues/19420
* | | | | | | | | | | | | Actually rename to `rake initializers`Godfrey Chan2015-03-211-1/+1
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #19443 from radanskoric/fix-am-errors-deprecationCarlos Antonio da Silva2015-03-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ActiveModel::Errors deprecation messages failing when used on its own
| * | | | | | | | | | | | 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.
* | | | | | | | | | | | Rework form helper example to use Person.newCarlos Antonio da Silva2015-03-211-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_existArthur Nogueira Neves2015-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | use `Dir.exist?` instead of deprecated `Dir.exists?`
| * | | | | | | | | | | use `Dir.exist?` instead of deprecated `Dir.exists?`yuuji.yaginuma2015-03-211-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #19445 from prathamesh-sonpatki/rm-ostructArthur Nogueira Neves2015-03-211-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removed requiring ostruct because its unused
| * | | | | | | | | | | Removed requiring ostruct because its unusedPrathamesh Sonpatki2015-03-211-1/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #19444 from prathamesh-sonpatki/fix-typosKasper Timm Hansen2015-03-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | [ci skip] Fix typos in test runner's help output
| * | | | | | | | | | Fix typos in test runner's help outputPrathamesh Sonpatki2015-03-211-2/+2
|/ / / / / / / / / /
* | | | | | | | | | 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.