aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Fix failing tests for #19474Andrew White2015-03-231-2/+2
| | |
* | | Fix ActionDispatch::PublicExceptions returning string rack statusRyan Tomayko2015-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The status returned in the rack [status, headers, body] array was a string, which can cause problems with middleware that assumes the status will be a Fixnum. This likely never surfaced because other middleware to_i the status returned from downstream apps before passing it on.
* | | Merge pull request #19473 from nerdinand/duration-to_i-documentationYves Senn2015-03-231-0/+24
|\ \ \ | | | | | | | | Add documentation for Duration#to_i for clarification
| * | | Add documentation for Duration#to_i for clarificationnerdinand2015-03-231-0/+24
|/ / /
* | | Merge pull request #19471 from ↵Yves Senn2015-03-232-30/+0
|\ \ \ | | | | | | | | | | | | | | | | nerdinand/remove-activesupport-integer-example-doc Remove reference to Numeric#from_now, as it is no longer supported [ci skip]
| * | | Remove reference to Numeric#from_now, as it is no longer supportednerdinand2015-03-232-30/+0
|/ / /
* | | Merge pull request #19449 from Gaurav2728/gaurav-unavailable_linkRafael Mendonça França2015-03-234-7/+4
|\ \ \ | | | | | | | | remove old unavailable link with relevant fix patch 1
| * | | remove old unavailable link with relevant fixGaurav Sharma2015-03-234-7/+4
| | | |
* | | | Merge pull request #19469 from Gaurav2728/gaurav-mysql_missing_linksRafael Mendonça França2015-03-231-1/+1
|\ \ \ \ | |/ / / |/| | | update mysql link that has been replaced
| * | | update mysql link that has been replacedGaurav Sharma2015-03-231-1/+1
|/ / /
* | | Provide a more truthful #inspectMatthew Draper2015-03-231-0/+4
| | | | | | | | | | | | | | | | | | This is obviously all very internal, but sometimes you have to look at it... and when you do, it'll save a lot of confusion if it doesn't lie about its identity.
* | | Make sure to persist a newly-nil serialized valueMatthew Draper2015-03-233-1/+20
| | | | | | | | | | | | | | | | | | | | | The subtype will (quite reasonably) ignore the possibility that it has `changed_in_place?` by becoming nil. Fixes #19467
* | | Simplify setting button form optionsCarlos Antonio da Silva2015-03-221-2/+3
| | | | | | | | | | | | No need to merge hashes when simply setting options does the job.
* | | Fix arguments order on assertionCarlos Antonio da Silva2015-03-221-1/+1
| | | | | | | | | | | | The expected value comes first. Related to #19465.
* | | Merge pull request #19465 from radanskoric/fix-errors-deleteRafael Mendonça França2015-03-222-7/+13
|\ \ \ | | | | | | | | Fix ActiveModel::Errors#delete return value to stay backward compatible
| * | | Fix ActiveModel::Errors#delete return value to stay backward compatibleRadan Skoric2015-03-222-7/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 5.0 changes to ActiveModel::Errors include addition of `details` that also accidentally changed the return value of `delete`. Since there was no test for that behavior it went unnoticed. This commit adds a test and fixes the regression. Small improvements to comments have also been made. Since `get` is getting deprecated it is better to use `[]` in other methods' code examples. Also, in the module usage example, `def Person.method` was replaced with a more commonly used `def self.method` code style.
* | | 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
| | |