aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Generate shallow paths for all children of shallow resources.Seb Jacobs2014-07-063-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit shallow resources would only generate paths for non-direct children (with a nested depth greater than 1). Take the following routes file. resources :blogs do resources :posts, shallow: true do resources :comments do resources :tags end end end This would generate shallow paths for `tags` nested under `posts`, e.g `/posts/:id/tags/`, however it would not generate shallow paths for `comments` nested under `posts`, e.g `/posts/:id/comments/new`. This commit changes the behaviour of the route mapper so that it generate paths for direct children of shallow resources, for example if you take the previous routes file, this will now generate shallow paths for `comments` nested under `posts`, .e.g `posts/:id/comments/new`. This was the behaviour in Rails `4.0.4` however this was broken in @jcoglan's fix for another routes related issue[1]. This also fixes an issue[2] reported by @smdern. [1] https://github.com/rails/rails/commit/d0e5963 [2] https://github.com/rails/rails/issues/15783
* Merge pull request #16069 from dylanahsmith/mysql-quote-boolMatthew Draper2014-07-065-5/+49
|\ | | | | active_record: Type cast booleans and durations for string columns.
| * active_record: Type cast booleans and durations for string columns.Dylan Thacker-Smith2014-07-065-5/+49
|/
* Merge pull request #16044 from jjb/patch-1Zachary Scott2014-07-051-1/+1
|\ | | | | [ci skip] link directly to ActionMailer Previews documentation
| * link directory to ActionMailer Previews documentationJohn Bachir2014-07-031-1/+1
| |
* | Merge pull request #16068 from JuanitoFatas/4-2-changelogsZachary Scott2014-07-051-18/+14
|\ \ | | | | | | [ci skip] Concludes changelog links in the bottom.
| * | [ci skip] Concludes changelog links in the bottom.Juanito Fatas2014-07-061-18/+14
|/ / | | | | | | This way when we do next release notes, this would be easier to copy and change.
* | Revert "Merge pull request #16059 from jenncoop/json-serialized-attr"Godfrey Chan2014-07-055-76/+2
| | | | | | | | | | | | This reverts commit a03097759bd7103bb9db253e7ba095f011453f75. This needs more work before it would work correctly on master.
* | Merge pull request #16059 from jenncoop/json-serialized-attrGodfrey Chan2014-07-055-2/+76
| | | | | | | | | | | | | | | | Fixed issue with ActiveRecord serialize object as JSON Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/attribute_methods/serialization.rb
* | Merge pull request #16065 from matthewd/mysql-explicit-non-strictMatthew Draper2014-07-061-2/+2
|\ \ | | | | | | If our connection is explicitly non-strict, tell MySQL
| * | If our connection is explicitly non-strict, tell MySQLMatthew Draper2014-07-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We default to making the connection strict, but have historically relied on the MySQL default when we want it to be non-strict. On some (recent?) versions of MySQL, new connections default to being strict, so if we've been told 'strict:false', we're obliged to pass that on. This fixes a test failure that we've seen turn up on relatively-new development machines, so we do already have a test covering it.
* | | Fix mysql/mysql2 failing with FK constraint errorsGodfrey Chan2014-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | One of the author fixture we have ("david") references an author address by ID. Since we disable FK checks when inserting fixtures, this is all fine until we try to update it, at which point MySQL would complain about the missing row referenced by the `author_address_id`. [Godfrey Chan, Matthew Draper]
* | | Re-enable foriegn key tests on MySQLGodfrey Chan2014-07-052-5/+1
| | | | | | | | | | | | This reverts commit e84799d, e31104c and e6ca8e2
* | | Merge pull request #16035 from sgrif/sg-range-typesRafael Mendonça França2014-07-056-54/+40
|\ \ \ | | | | | | | | Use the type object for quoting PG Ranges
| * | | Use the type object for quoting PG RangesSean Griffin2014-07-056-54/+40
| | | |
* | | | Only reference time specific methods in the time section [ci skip]Sean Griffin2014-07-051-2/+2
| | | |
* | | | Remove *all* references to `Time.yesterday` [ci skip]Sean Griffin2014-07-051-1/+1
| | | |
* | | | `Time.today` -> `Date.today` in guides. [ci skip]Sean Griffin2014-07-051-1/+1
|/ / / | | | | | | | | | | | | Removed mentions of non-existent methods, also added a mention for `Date.current`, which is analagous to `Time.current`. Closes #16061.
* | | Add release notes entry for #15819 [ci skip]Sean Griffin2014-07-041-0/+5
| | |
* | | CHANGELOG and release notes entry for #16056Sean Griffin2014-07-042-0/+9
| | |
* | | Merge pull request #16056 from sgrif/sg-required-associationsDavid Heinemeier Hansson2014-07-044-1/+105
|\ \ \ | | | | | | | | Add a `required` option to singular associations
| * | | Add a `required` option to singular associationsSean Griffin2014-07-044-1/+105
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to defining the association, a `required` association will also have its presence validated. Before: ```ruby belongs_to :account validates_presence_of :account ``` After: ```ruby belongs_to :account, required: true ``` This helps to draw a distinction between types of validations, since validations on associations are generally for data integrity purposes, and aren't usually set through form inputs.
* | | Merge pull request #16054 from rails/revert-16003-sg-refactor-sqlite3-stringsMatthew Draper2014-07-051-37/+13
|\ \ \ | |/ / |/| | Revert "Use a type object for type casting behavior on SQLite3"
| * | Revert "Use a type object for type casting behavior on SQLite3"Matthew Draper2014-07-051-37/+13
|/ /
* | Don't fail if unicode.org isn't talking to usMatthew Draper2014-07-051-1/+3
| |
* | Fix typoRafael Mendonça França2014-07-041-1/+1
| |
* | Merge pull request #16013 from tgxworld/remove_symbolized_path_parametersRafael Mendonça França2014-07-045-10/+10
|\ \ | | | | | | Remove symbolized_path_parameters.
| * | Remove symbolized_path_parameters.Guo Xiang Tan2014-07-025-10/+10
| | | | | | | | | | | | This pull request is a continuation of https://github.com/rails/rails/commit/925bd975 and https://github.com/rails/rails/commit/8d8ebe3d.
* | | Merge pull request #16003 from sgrif/sg-refactor-sqlite3-stringsMatthew Draper2014-07-051-13/+37
|\ \ \ | | | | | | | | Use a type object for type casting behavior on SQLite3
| * | | Use a type object for type casting behavior on SQLite3Sean Griffin2014-07-011-13/+37
| | | | | | | | | | | | | | | | | | | | Note: I'm not sure we actually need to be logging when this happens. This code would be a fair bit cleaner if we didn't need to log it.
* | | | Merge pull request #16028 from ↵Rafael Mendonça França2014-07-043-1/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cade/fix_counter_cache_count_with_association_selects Add `:all` argument to `count` in `reset_counters` Conflicts: activerecord/CHANGELOG.md
| * | | | Add `:all` argument to `count` in `reset_counters`Cade Truitt2014-07-023-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this fix, if an association had a scope with a `select`, calls to `reset_counters` would generate invalid SQL and throw: ActiveRecord::StatementInvalid: [$DB_ADAPTER]: wrong number of arguments to function COUNT() References #10710, #13648
* | | | | Merge pull request #16011 from xjlu/token_and_optionsRafael Mendonça França2014-07-042-3/+23
|\ \ \ \ \ | | | | | | | | | | | | Improve token_and_options regex and test
| * | | | | Improve token_and_options regex and testXinjiang Lu2014-07-012-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | add a test case to test the regex for the helper method raw_params
* | | | | | Merge pull request #16040 from seuros/patch-1Matthew Draper2014-07-051-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add arel to the controller template [ci skip]
| * | | | | | Add arel to the controller templateAbdelkader Boudih2014-07-031-0/+1
| | | | | | |
* | | | | | | Merge pull request #14005 from dmitry/test_coverage_for_actionmailerRafael Mendonça França2014-07-046-38/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add test coverage for the action mailer
| * | | | | | | add test coverage for the action mailerDmitry Polushkin2014-07-046-38/+16
| | | | | | | |
* | | | | | | | Merge pull request #16042 from akshay-vishnoi/doc_changeMatthew Draper2014-07-053-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] /javascript/ -> JavaScript - cover whole app
| * | | | | | | | [ci skip] /javascript/ -> JavaScript - cover whole appAkshay Vishnoi2014-07-043-5/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #16049 from matthewd/find-via-reloadMatthew Draper2014-07-053-0/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | After find-via-reload, the record is not new
| * | | | | | | | After find-via-reload, the record is not newMatthew Draper2014-07-053-0/+19
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #16046 from grosser/grosser/cleangenRafael Mendonça França2014-07-041-2/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Do not load rails without loading bundler
| * | | | | | | | remove bundler magicgrosser2014-07-031-2/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #16037 from sgrif/sg-money-quotingRafael Mendonça França2014-07-043-11/+28
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Remove unneccessary special case for money in quoting
| * | | | | | | | Remove unneccessary special case for money in quotingSean Griffin2014-07-033-11/+28
| | | | | | | | |
* | | | | | | | | Merge pull request #16048 from arunagw/aa-added-notice-index-pageRafael Mendonça França2014-07-043-1/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Display notice in index.html pages in scaffolded generated views
| * | | | | | | | Display notice in index.html pages in scaffolded generated viewsArun Agrawal2014-07-043-1/+11
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we are setting notice in destroy action we should display that For more information see https://github.com/rails/rails/pull/14044 And https://github.com/rails/jbuilder/pull/191 closes #14044
* | | / / / / / :fire: these are lambdas now [ci skip]Godfrey Chan2014-07-031-9/+2
| |_|/ / / / / |/| | | | | | | | | | | | | This has changed since around 2b1500d6
* | | | | | | Merge pull request #16038 from tbpgr/fix_guide_active_record_validationsRafael Mendonça França2014-07-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix guide. sample code syntax error.[ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 15:19:58 +0000