aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove duplicate sentence from AS changelog. [ci skip].Yves Senn2013-11-281-2/+1
|
* Do not create synonym named subjectsYasuo Honda2013-11-271-3/+0
| | | | | | | because it is only used in `activerecord/test/cases/adapters/oracle/synonym_test.rb` See rails/rails#13054
* Merge pull request #13054 from senny/remove_oracle_testsYves Senn2013-11-271-17/+0
|\ | | | | Remove leftover Oracle tests.
| * the oracle adapter lives in a gem. Tests should live there as well.Yves Senn2013-11-261-17/+0
| |
* | Merge pull request #13083 from kuldeepaggarwal/typosRafael Mendonça França2013-11-271-1/+4
|\ \ | | | | | | fixed typo `destory` => `destroy` [ci skip]
| * | fixed-case when invalid action name has passedKuldeep Aggarwal2013-11-281-0/+3
| | |
| * | fixed typo `destory` => `destroy` [ci skip]Kuldeep Aggarwal2013-11-281-1/+1
| | |
* | | Merge pull request #13082 from blowmage/deprecate_describeAaron Patterson2013-11-271-5/+12
|\ \ \ | | | | | | | | Deprecate ActiveSupport::TestCase.describe
| * | | Deprecate ActiveSupport::TestCase.describeMike Moore2013-11-271-5/+12
|/ / / | | | | | | | | | | | | Provide message to define ActiveSupport::TestCase.name instead. Allow calling describe with a block, which Minitest::Spec does.
* | | Merge pull request #13079 from gregmolnar/inflector_docsXavier Noria2013-11-271-4/+0
|\ \ \ | |/ / |/| | [ci skip] removed singulars section from classify doc
| * | [ci skip] removed singulars section from classify docGreg Molnar2013-11-271-4/+0
|/ /
* | Merge branch 'deprecate_numeric_since_ago' of ↵Jeremy Kemper2013-11-274-31/+58
|\ \ | | | | | | | | | | | | | | | | | | https://github.com/chancancode/rails Conflicts: activesupport/CHANGELOG.md
| * | Deprecated Numeric#{ago,until,since,from_now}Godfrey Chan2013-11-264-31/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user is expected to explicitly convert the value into an AS::Duration, i.e. `5.ago` => `5.seconds.ago` This will help to catch subtle bugs like: def recent?(days = 3) self.created_at >= days.ago end The above code would check if the model is created within the last 3 **seconds**. In the future, `Numeric#{ago,until,since,from_now}` should be removed completely, or throw some sort of errors to indicate there are no implicit conversion from `Numeric` to `AS::Duration`. Also fixed & refactor the test cases for Numeric#{ago,since} and AS::Duration#{ago,since}. The original test case had the assertion flipped and the purpose of the test wasn't very clear.
* | | Merge pull request #13072 from kuldeepaggarwal/unwanted-codeXavier Noria2013-11-271-2/+5
|\ \ \ | | | | | | | | unnecessary checking of `size` with `second regex` if matched with former regex
| * | | unnecessary checking of `size` with `second regex` if matched with first oneKuldeep Aggarwal2013-11-271-2/+5
| | | |
* | | | Merge pull request #13067 from sagarjunnarkar/getting_startedCarlos Antonio da Silva2013-11-271-0/+1
|\ \ \ \ | | | | | | | | | | Link for "New Post" is added in Getting Started guide [ci skip]
| * | | | Link for "New Post" is added in Getting Started guide [ci skip]Sagar Junnarkar2013-11-271-0/+1
| | |/ / | |/| | | | | | | | | | | | | | - Earlier(line number 862) it is said to add <%= link_to 'New post', new_post_path %> on posts index page before table tag. But when posts index page html is shown, "New Post" link is missing. So aaded "New Post" link in this commit
* | | | Merge pull request #13068 from chancancode/drop_yajl_from_gemfileCarlos Antonio da Silva2013-11-271-1/+0
|\ \ \ \ | | | | | | | | | | Dropped yajl from Gemfile
| * | | | Dropped yajl from GemfileGodfrey Chan2013-11-261-1/+0
| |/ / /
* | | | Merge pull request #13069 from chancancode/json_gem_versionCarlos Antonio da Silva2013-11-272-2/+6
|\ \ \ \ | |_|/ / |/| | | Requires JSON gem version 1.7.7 or above as it contains an important security fix.
| * | | Requires JSON gem version 1.7.7 or above as it contains an importantGodfrey Chan2013-11-262-2/+6
| |/ / | | | | | | | | | security fix.
* | | Merge pull request #13071 from kuldeepaggarwal/documentation-updationYves Senn2013-11-271-3/+0
|\ \ \ | | | | | | | | [ci skip]removed obsolete information about `options` parameter in create method
| * | | [ci skip]removed obsolete information about `options` parameter in create methodKuldeep Aggarwal2013-11-271-3/+0
|/ / /
* | | Merge pull request #13070 from kuldeepaggarwal/documentation-updationYves Senn2013-11-271-1/+1
|\ \ \ | |/ / |/| | [ci skip] used new syntax for scopes
| * | [ci skip] used new syntax for scopesKuldeep Aggarwal2013-11-271-1/+1
|/ /
* | Merge pull request #13061 from ↵Rafael Mendonça França2013-11-263-1/+23
| | | | | | | | | | | | | | | | laurocaetano/fix-uniqueness-validation-for-aliased-attribute Fix bug when validating the uniqueness of an aliased attribute. Conflicts: activerecord/CHANGELOG.md
* | Merge pull request #12183 from chancancode/json_encoder_refactorJeremy Kemper2013-11-263-113/+107
|\ \ | | | | | | JSON encoder refactor
| * | Be explicit and use the actual unicode sequenceGodfrey Chan2013-11-261-1/+1
| | |
| * | Process::Status should get a :nodoc: [ci skip]Godfrey Chan2013-11-261-1/+1
| | |
| * | Make the JSON encoder pluggableGodfrey Chan2013-11-261-2/+8
| | |
| * | Removed the Ruby encoder and switched to using the JSON gemGodfrey Chan2013-11-263-82/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | Got all the tests passing again. Support for `encode_json` has been removed (and consequently the ability to encode `BigDecimal`s as numbers, as mentioned in the previous commit). Install the `activesupport-json_encoder` gem to get it back.
| * | Removed support for encoding BigDecimal as a JSON numberGodfrey Chan2013-11-263-25/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because the new encoder will no longer support encode_json. Therefore our only choice is to return `to_i` or `to_s` in `BigDecimal#as_json`. Since casting a BigDecimal to an integer is most likely a lossy operation, we chose to encode it as a string. Support for encoding BigDecimal as a string will return via the `activesupport-json_encoder` gem.
| * | Expanded coverage on JSON encodingGodfrey Chan2013-11-261-2/+12
| | |
| * | Added some failing tests where the JSON encoder is not resolving as_json ↵Godfrey Chan2013-11-261-2/+12
| | | | | | | | | | | | correctly
* | | More typo fixesAkira Matsuda2013-11-272-2/+2
|/ /
* | Minor typo fixesAkira Matsuda2013-11-274-6/+6
| |
* | Add branch to arel in Gemfile so that we can use local repos [ci skip]Carlos Antonio da Silva2013-11-261-1/+1
| |
* | Merge pull request #13018 from heruku/scoping_fixYves Senn2013-11-264-1/+19
|\ \ | | | | | | changed update counter to act on unscoped model
| * | changed update counter to act on unscoped modelheruku2013-11-264-1/+19
|/ /
* | Merge pull request #13049 from senny/remove_firebird_testsRafael Mendonça França2013-11-263-148/+0
|\ \ | |/ |/| remove leftover firebird adapter tests.
| * remove leftover firebird adapter tests.Yves Senn2013-11-263-148/+0
| |
* | sync example and documentation for strong_parameters hash whitelisting.Yves Senn2013-11-261-5/+7
| | | | | | | | | | | | | | | | | | [ci skip] This is a follow up to #12609 and integrates #12158. Thanks @aspiers. Closes #12158.
* | tyopAkira Matsuda2013-11-261-1/+1
|/
* `rename_index`: add the new index before removing the old one.Yves Senn2013-11-263-8/+29
| | | | | | | | | | | This prevents the following error when a MySQL index on a foreign key column is renamed: ``` ActiveRecord::StatementInvalid: Mysql2::Error: Cannot drop index 'index_engines_on_car_id': needed in a foreign key constraint: DROP INDEX `index_engines_on_car_id` ON `engines` ``` refs: #13038.
* Merge pull request #13042 from brianstorti/fix-dependent-destroy-12812Rafael Mendonça França2013-11-255-1/+25
|\ | | | | Raise `RecordNotDestroyed` when children can't be replaced
| * move changelog entry to the topBrian Thomas Storti2013-11-251-6/+6
| |
| * Raise `RecordNotDestroyed` when children can't be replacedBrian Thomas Storti2013-11-255-1/+25
|/ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12812 Raise `ActiveRecord::RecordNotDestroyed` when a child marked with `dependent: destroy` can't be destroyed. The following code: ```ruby class Post < ActiveRecord::Base has_many :comments, dependent: :destroy end class Comment < ActiveRecord::Base before_destroy do return false end end post = Post.create!(comments: [Comment.create!]) post.comments = [Comment.create!] ```` would result in a `post` with two `comments`. With this commit, the same code would raise a `RecordNotDestroyed` exception, keeping the `post` with the same `comment`.
* require the files we testAaron Patterson2013-11-251-0/+1
|
* Merge pull request #13034 from vipulnsward/some_typosRafael Mendonça França2013-11-252-2/+2
|\ | | | | Fix some minor typos
| * Fix some minor typos [ci skip]Vipul A M2013-11-262-2/+2
| |