aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Address CVE-2014-4671 (JSONP Flash exploit)Greg Campbell2014-07-094-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a comment before JSONP callbacks. See http://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/ for more details on the exploit in question.
* | | | | Merge pull request #16123 from karlentwistle/issues/9299Andrew White2014-07-103-5/+21
|\ \ \ \ \ | | | | | | | | | | | | Force encoding of US-ASCII to UTF-8 in unescape_uri.
| * | | | | Force encoding of US-ASCII to UTF-8 in unescape_uri.Karl Entwistle2014-07-103-5/+21
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because URI paths may contain non US-ASCII characters we need to force the encoding of any unescaped URIs to UTF-8 if they are US-ASCII. This essentially replicates the functionality of the monkey patch to URI.parser.unescape in active_support/core_ext/uri.rb. Fixes #16104.
* | | | | Merge pull request #16118 from JayK31/strong_params_linkZachary Scott2014-07-091-2/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Fixed link to strong params in Getting Started section 5.6.
| * | | | | [ci skip] Fixed link to strong params in Getting Started section 5.6.JayK312014-07-091-2/+1
|/ / / / /
* | | | | Merge pull request #16113 from ↵Zachary Scott2014-07-091-2/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | egilburg/rails_4_1_upgrade_guide_json_time_with_zone_precision [ci skip] Document millisecond precision change in ActiveSupport::TimeWithZone#as_json
| * | | | | [ci skip] Document millisecond precision change in ↵Eugene Gilburg2014-07-091-2/+12
| |/ / / / | | | | | | | | | | | | | | | ActiveSupport::TimeWithZone#as_json
* | | | | Merge pull request #16091 from tgxworld/reduce_creation_of_subscribersSantiago Pastorino2014-07-091-17/+13
|\ \ \ \ \ | | | | | | | | | | | | Reduce number of subscriptions created.
| * | | | | Reduce number of subscriptions created.Guo Xiang Tan2014-07-081-17/+13
| | | | | |
* | | | | | Include missing module in tag_helperCarlos Antonio da Silva2014-07-091-0/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 6857415187810f1289068a448268264d0cf0844f we are using #safe_join to join the content when an Array is given, so we must include the dependent module here to make sure it's available when this module is used alone. This was making Simple Form tests to fail with current master due to the missing dependency.
* | | | | Merge pull request #16103 from JuanitoFatas/doc/patch-001Matthew Draper2014-07-091-34/+41
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Fix 4.2 release notes list items. [Matthew Draper & Juanito Fatas]
| * | | | | [ci skip] Fix 4.2 release notes list items. [Matthew Draper & Juanito Fatas]Juanito Fatas2014-07-091-34/+41
|/ / / / /
* | | | | Merge pull request #16102 from JuanitoFatas/format-fixesZachary Scott2014-07-091-31/+29
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Fix 4.2 release notes rendered display.
| * | | | | [ci skip] Fix 4.2 release notes rendered display.Juanito Fatas2014-07-091-31/+29
| | | | | |
* | | | | | Merge pull request #16100 from tgxworld/fix_commentZachary Scott2014-07-091-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Use proper possessive punctuation [ci skip]
| * | | | | Fix weird comment. [CI SKIP]Guo Xiang Tan2014-07-091-2/+2
|/ / / / /
* | | | | Merge pull request #16097 from nishantmodak/correct_mdZachary Scott2014-07-0812-33/+29
|\ \ \ \ \ | | | | | | | | | | | | correct markdown usage [ci skip]
| * | | | | correct markdown usage [ci skip]Nishant Modak2014-07-0912-33/+29
| | | | | |
* | | | | | Merge pull request #13999 from jamox/update_rackAaron Patterson2014-07-087-22/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | This updates rails to use edge rack
| * | | | | | Since upgrading rack we can remove unnecessary string encodingsJarmo Isotalo2014-05-191-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rack/rack/commit/5a5aee36
| * | | | | | Upgraded rackJarmo Isotalo2014-05-196-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As Rack has some non backwards compatible changes added required modifications to keep behaviour in rails close to same as before. Also modified generators to include rack/rack for not yet released version of rack
* | | | | | | Merge pull request #16095 from eileencodes/update-changelog-for-pr-14899Rafael Mendonça França2014-07-081-0/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add changelog for PR #14899
| * | | | | | | [ci skip] Add changelog for PR #14899eileencodes2014-07-081-0/+15
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | The changelog entry for #14899 was missing.
* | | | | | | Merge pull request #16094 from ↵Rafael Mendonça França2014-07-081-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zuhao/refactor_activerecord_belongs_to_associations_test Include fixtures to prevent foreign key violation.
| * | | | | | | Include fixtures to prevent foreign key violation.Zuhao Wan2014-07-091-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #16093 from ↵Rafael Mendonça França2014-07-081-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zuhao/refactor_activerecord_nested_through_associations_test Warm up cache to prevent assertion failure.
| * | | | | | | Warm up cache to prevent assertion failure.Zuhao Wan2014-07-081-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #16071 from sgrif/sg-pg-type-castRafael Mendonça França2014-07-081-15/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove PG's definition of `type_cast`
| * | | | | | | | Remove PG's definition of `type_cast`Sean Griffin2014-07-061-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All cases except for `nil` in an array have been removed. `nil` in an array is handled by the Array type object.
* | | | | | | | | Merge pull request #16072 from sgrif/sg-xml-quotingRafael Mendonça França2014-07-085-5/+56
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Don't rely on the sql type to quote XML columns in PG
| * | | | | | | | Don't rely on the sql type to quote XML columns in PGSean Griffin2014-07-065-5/+56
| |/ / / / / / /
* | | | | | | | test i18n against a routed appAaron Patterson2014-07-071-1/+16
| | | | | | | |
* | | | | | | | remove the mounted_helpers respond_to checkAaron Patterson2014-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It always responds to mounted_helpers now
* | | | | | | | always test against a routed rack app so there are always url_helpersAaron Patterson2014-07-075-36/+66
| | | | | | | |
* | | | | | | | Merge pull request #16078 from tgxworld/retreive_connection_onceRafael Mendonça França2014-07-071-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Avoid retrieving connection in ActiveRecord::QueryCache multiple times.
| * | | | | | | | Avoid retrieving connection in ActiveRecord::QueryCache multiple times.Guo Xiang Tan2014-07-071-2/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #16074 from sgrif/sg-remove-text-predicateRafael Mendonça França2014-07-0718-32/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove the `text?` predicate from the type objects
| * | | | | | | | Remove the `text?` predicate from the type objectsSean Griffin2014-07-0618-32/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was only used for uniqueness validations. The first usage was in conjunction with `limit`. Types which cast to string, but are not considered text cannot have a limit. The second case was only with an explicit `:case_sensitive => true` option given by the user.
* | | | | | | | Merge pull request #16086 from nickpellant/masterEileen M. Uchitelle2014-07-071-0/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add callbacks documentation for upgrading to 4.1.
| * | | | | | | | [ci skip] Improve callback code example for 4.1 upgrade docs.Nick Pellant2014-07-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code example for the new explicit block requirement when setting callbacks was a little confusing. This commit makes the example more obvious.
| * | | | | | | | Add callbacks documentation for upgrading to 4.1.Nick Pellant2014-07-071-0/+14
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now expected in 4.1 to use an explicit block rather than implicit when setting callbacks through ActiveSupport::Callbacks. This commit highlights this new expectation as part of the upgrading documentation.
* / | | | | | | Update Rails versions [ci skip]Robin Dupret2014-07-075-19/+19
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in #15304, we need to automate this process but for now, having out-of-date versions is not ideal. Since master targets 4.2.0, let's also update references to the last 4.1 version to 4.2.0. Finally, let's remove mentions to versions when this is not needed. The guides cover the features of the current version anyway. [Juanito Fatas + Robin Dupret]
* | | | | | | Merge pull request #16075 from nickpellant/masterSean Griffin2014-07-061-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix ActiveSupport::Callbacks #set_callback docs.
| * | | | | | Fix ActiveSupport::Callbacks #set_callback docs.Nick Pellant2014-07-071-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A minor version breakage due to a rewrite of the callbacks code now requires an explicit block to be passed to #set_callback. This amends the documentation.
* | | | | | Change back occurrences of SQLite(3) to sqlite3 when referring to theZachary Scott2014-07-065-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | adapter, fixed from #16057 [ci skip]
* | | | | | Merge pull request #16057 from akshay-vishnoi/doc_changeZachary Scott2014-07-066-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] /sqlite/i --> SQLite
| * | | | | | [ci skip] /sqlite/i --> SQLiteAkshay Vishnoi2014-07-066-9/+9
| | | | | | |
* | | | | | | Merge pull request #15958 from aditya-kapoor/active-model-naming-guideRobin Dupret2014-07-061-0/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] add guide for ActiveModel::Naming
| * | | | | | | [ci skip] add guide for ActiveModel::NamingAditya Kapoor2014-07-051-0/+23
| | | | | | | |
* | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 03:27:36 +0000