aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #14325 from robin850/issue-12133Santiago Pastorino2014-03-083-1/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make the rails:template rake task load initializers
| * | | | | | Make the rails:template rake task load initializersRobin Dupret2014-03-083-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Templates could rely on irregular inflections or external libraries for instance so we should load the application's initializers when running the rails:template task. The introducing commit of this feature is f7f11361 ; the initializers have never been loaded invoking this task. Fixes #12133.
* | | | | | | Merge pull request #14244 from arthurnn/orderd_hash_select_fixSantiago Pastorino2014-03-082-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix OrderedHash.select to return self instance.
| * | | | | | | Fix OrderedHash.select to return self instance.Arthur Neves2014-03-072-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On ruby 2.1.1 the behavior of .select and .reject has changed. They will return a Hash new instance, so we need to override them to keep the instance object class.
* | | | | | | | Merge pull request #14280 from joho/make_csrf_failure_logging_optionalSantiago Pastorino2014-03-083-1/+28
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Make CSRF failure logging optional/configurable.
| * | | | | | | Make CSRF failure logging optional/configurable.John Barton (joho)2014-03-053-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the log_warning_on_csrf_failure option to ActionController::RequestForgeryProtection which is on by default.
* | | | | | | | docs, shorten CsrfHelper description and refer to security guide. [ci skip]Yves Senn2014-03-081-8/+3
| | | | | | | |
* | | | | | | | added CSRF helper to rails guide documentation. Closes #11615. [ci skip]Yves Senn2014-03-081-3/+19
| | | | | | | |
* | | | | | | | Tests for indifferent access using full_messages_for. Closes #11916Pavel Penkov2014-03-081-0/+7
| | | | | | | |
* | | | | | | | Merge pull request #14318 from arthurnn/clean_preview_interceptorsAndrew White2014-03-071-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make sure we clean preview_interceptors
| * | | | | | | | Make sure we clean preview_interceptorsArthur Neves2014-03-071-0/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | We should make sure we clean preview_interceptors after each test so they dont leaky to the next test
* | | | | | | | Merge pull request #14316 from the4dpatrick/masterArthur Nogueira Neves2014-03-071-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Add preventDefault() on click event
| * | | | | | | Add preventDefault() on click eventPatrick Perey2014-03-071-1/+3
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-078-22/+37
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md
| * | | | | | | fix typo app -> alldmathieu2014-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thank you @bquorning
| * | | | | | | unscope doesn't remove only the default_scope, but all of them.dmathieu2014-03-071-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci-skip] Closes rails/rails#14294
| * | | | | | | Update doc for TagHelper.Hendy Tanata2014-03-051-2/+8
| | | | | | | |
| * | | | | | | Improve collision explanation for Hash#transform_keys.Hendy Tanata2014-02-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on comments at https://github.com/rails/docrails/commit/42417b0013819e573be9ffc5402e179003156e8e#commitcomment-5527251 [skip ci]
| * | | | | | | Fix code alignment in duplicable? guide.Hendy Tanata2014-02-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
| * | | | | | | Improve guide for Hash#transform_keys and related methods.Hendy Tanata2014-02-271-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
| * | | | | | | :scissors:Zachary Scott2014-02-233-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also addresses rails/docrails#169 and rails/rails#14159
| * | | | | | | Tweak Configuring Guide languageGaurish Sharma2014-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | the fact that Rails is multi-thread by default is not very relevant. see https://github.com/rails/rails/pull/13998 [ci skip]
| * | | | | | | typos fixesMikhail Dieterle2014-02-221-4/+4
| | | | | | | |
* | | | | | | | Merge pull request #14257 from killthekitten/patch-1Vijay Dev2014-03-061-0/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add "Low-Level Caching" part to "Caching With Rails" guide
| * | | | | | | | [ci skip] Add "Low-Level Caching" part to "Caching With Rails"Nikolay Shebanov2014-03-061-0/+20
| | | | | | | | |
* | | | | | | | | Merge pull request #14285 from ↵Aaron Patterson2014-03-068-51/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sikachu/master-revert-render-body-remove-content-type Do note remove `Content-Type` when `render :body`
| * | | | | | | | | Do note remove `Content-Type` when `render :body`Prem Sichanugrist2014-03-058-51/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `render :body` should just not set the `Content-Type` header. By removing the header, it breaks the compatibility with other parts. After this commit, `render :body` will returns `text/html` content type, sets by default from `ActionDispatch::Response`, and it will preserve the overridden content type if you override it. Fixes #14197, #14238 This partially reverts commit 3047376870d4a7adc7ff15c3cb4852e073c8f1da.
* | | | | | | | | | Merge pull request #14296 from ↵Yves Senn2014-03-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | joker1007/fix_rails_guides_about_active_record_default_timezone Fix guide about `config.active_record.default_timezone` [ci skip]
| * | | | | | | | | Fix guide about `config.active_record.default_timezone` [ci skip]joker10072014-03-061-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the initial value of ActiveRecord.default_timezone is always :utc
* | | | | | | | | Merge pull request #14101 from sikachu/master-fix-versioning-taskJeremy Kemper2014-03-0519-54/+167
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Introduce `Rails.gem_version`
| * | | | | | | | Introduce `Rails.gem_version`Prem Sichanugrist2014-03-0519-54/+167
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method return `Gem::Version.new(Rails.version)`, suggesting a more reliable way to perform version comparison. Example: Rails.version #=> "4.1.2" Rails.gem_version #=> #<Gem::Version "4.1.2"> Rails.version > "4.1.10" #=> false Rails.gem_version > Gem::Version.new("4.1.10") #=> true Gem::Requirement.new("~> 4.1.2") =~ Rails.gem_version #=> true This was originally introduced as `.version` by @charliesome in #8501 but got reverted in #10002 since it was not backward compatible. Also, updating template for `rake update_versions`.
* | | | | | | | Remove a reference to an issue [ci skip]Robin Dupret2014-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This actually not an issue fixing ; the changelog is referring to the introducing pull request itself.
* | | | | | | | get rid of intermediate arrays.Yves Senn2014-03-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin: https://github.com/rails/rails/commit/f6aeb8b1a3687c8523e4a56309fe3736011b2935#commitcomment-5569649
* | | | | | | | we only need to support `asc` and `ASC`. No need for mixed cases. #14263Yves Senn2014-03-052-34/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a result of the discussion at https://github.com/rails/rails/pull/14263/files#r10291489
* | | | | | | | docs, flash message keys are normalized to strings. [ci skip]Yves Senn2014-03-051-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to a668beffd64106a1e1fedb71cc25eaaa11baf0c1
* | | | | | | | quick pass over Active Record CHANGELOG. [ci skip].Yves Senn2014-03-051-13/+10
| | | | | | | |
* | | | | | | | Merge pull request #14263 from robin850/allow_passing_string_to_order_hashYves Senn2014-03-053-5/+52
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Follow up of #10732 - Allow string hash values on AR order method
| * | | | | | | | Allow string hash values on AR order methodMarcelo Casiraghi2014-03-043-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior has almost no performance impact: String not allowed 66.910000 0.030000 66.940000 ( 67.024976) String allowed 69.360000 0.030000 69.390000 ( 69.503096) Benchmarked with http://git.io/Y0YuRw.
* | | | | | | | | Merge pull request #14261 from MSch/bound-parameters-for-existsAaron Patterson2014-03-042-3/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Make exists? use bound values.
| * | | | | | | | | Make exists? use bound values.Martin Schürrer2014-03-042-3/+20
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we build a query with an inline value that is a numeric (e.g. because it's out of range for an int4) PostgreSQL doesn't use an index on the column, since it's now comparing numerics and not int4s. This leads to a _very_ slow query. When we use bound parameters instead of inline values PostgreSQL raises numeric_value_out_of_range since no automatic coercion happens.
* | | | | | | | | Revert "Merge pull request #14269 from arthurnn/expanded_key_array"Godfrey Chan2014-03-043-14/+4
| |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 475c96589ca65282e1a61350271c2f83f0d4044f, reversing changes made to 705915ab5cf24430892107764b0050c07e1df583. We decided that this is not worth busting everyone's cache as this seems like a very unlikely problem. The problem only occurs when the user is 1) not using a namespace, or 2) using the same namesapce for different *kinds* of cache items. The recommended "fix" is to put those cache items into their own namspace: id = 1 Rails.cache.fetch(id, namespace: "user"){ User.find(id) } ids = [1] Rails.cache.fetch(ids, namespace: "users"){ User.find(ids) } See the discussion on #14269 for details.
* | | | | | | | Merge pull request #14269 from arthurnn/expanded_key_arrayGuillermo Iguaran2014-03-043-4/+14
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Cache key should be different when is Array.
| * | | | | | | Cache key should be different when is Array.Arthur Neves2014-03-033-4/+14
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `cache.fetch(['foo'])` and `cache.fetch('foo')` should generate different cache keys as they are not equivalents. [related #8615] [related #8614]
* | | | | | | Merge pull request #14243 from pch/digestor-variantsDavid Heinemeier Hansson2014-03-046-24/+105
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Variants in ActionView::Digestor
| * | | | | | | Variants in ActionView::DigestorPiotr Chmolowski2014-03-046-24/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take variants into account when calculating template digests in ActionView::Digest. Digestor#digest now takes a hash as an argument to support variants and allow more flexibility in the future. Old-style arguments have been deprecated. Fixes #14242
* | | | | | | | Always return an array from formats so there is no need to wrap it when callingCarlos Antonio da Silva2014-03-043-3/+3
| | | | | | | |
* | | | | | | | Fix for external generators extend Erb::GeneratorsAllen Fair2014-03-041-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HAML and probably other generators extend this class and invoke filename_with_extensions with the old signature (without format). This makes the second argument optional and defaults it to the #format method which could be overridden as well. Closes #14132.
* | | | | | | Inline block to fix indent [ci skip]Carlos Antonio da Silva2014-03-041-3/+1
| | | | | | |
* | | | | | | Merge pull request #14273 from vipulnsward/fix-warning-13244Yves Senn2014-03-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix enum test unused variable warning.
| * | | | | | | Fix enum test unused variable warning.Vipul A M2014-03-041-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Related - https://github.com/rails/rails/commit/5c55aafd38f45ac019573f98438ffdbdc8c580f9
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-25 02:29:05 +0000