aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ugh, forgot to add this test to cdd90f39d796986dabf1678b3277b230dbe18961Aaron Patterson2014-12-011-0/+5
|
* Merge pull request #17869 from 2called-chaos/patch-1Xavier Noria2014-12-011-1/+1
|\ | | | | Fix documentation for ActionMailer::Base#default [ci skip]
| * Fix documentation for #defaultSven Pachnit2014-12-011-1/+1
|/ | | Just a little syntax error I spotted by accident. Cannot pass hash with curly braces without normal parentheses.
* tests, favor public API over inspecting columns where possible.Yves Senn2014-12-013-23/+20
| | | | | This is a follow up to https://github.com/rails/rails/commit/07786c5e75a7b0afdf318063510af6b475e3e04c and https://github.com/rails/rails/commit/cd2596f55e88fe659592612a793c4f4aa723c9be
* Merge pull request #17827 from rkh/rkh-fix-or-patternAaron Patterson2014-12-012-0/+7
|\ | | | | Fix OR in Journey patterns
| * make OR in journey patterns compile to a valid regular expressionKonstantin Haase2014-11-292-0/+7
| |
* | tests, run numeric default tests for every adapter.Yves Senn2014-12-011-15/+33
| |
* | tests, use public API to verify default parsing. #17863, #17856Yves Senn2014-12-011-1/+2
| |
* | Merge pull request #17863 from ↵Rafael Mendonça França2014-12-012-1/+5
|\ \ | | | | | | | | | | | | tgxworld/fix_extracated_default_value_for_negative_integers Fix value extracted from negative integers for PostgreSQL.
| * | Fix value extracted from negative integers for PostgreSQL.Guo Xiang Tan2014-12-012-1/+5
|/ / | | | | | | Fixes: https://github.com/rails/rails/issues/17856.
* | Merge pull request #17861 from kirs/pp-request-paramsRafael Mendonça França2014-12-012-1/+9
|\ \ | | | | | | Pretty-print request params on exception page
| * | Pretty-print request params on exception pageKir Shatrov2014-12-012-1/+9
| | |
* | | Ensure numericality validations work with mutationSean Griffin2014-12-013-6/+30
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The detection of in-place changes caused a weird unexpected issue with numericality validations. That validator (out of necessity) works on the `_before_type_cast` version of the attribute, since on an `:integer` type column, a non-numeric string would type cast to 0. However, strings are mutable, and we changed strings to ensure that the post type cast version of the attribute was a different instance than the before type cast version (so the mutation detection can work properly). Even though strings are the only mutable type for which a numericality validation makes sense, special casing strings would feel like a strange change to make here. Instead, we can make the assumption that for all mutable types, we should work on the post-type-cast version of the attribute, since all cases which would return 0 for non-numeric strings are immutable. Fixes #17852
* | Merge pull request #17860 from SamSaffron/fix_engine_backtraceRafael Mendonça França2014-11-301-1/+1
|\ \ | | | | | | FIX: absolute_path may be nil for code added via instance_eval
| * | FIX: absolute_path may be nil for code added via instance_evalSam2014-12-011-1/+1
|/ /
* | Fix grammar on ActiveRecord::AttributeMethods doc.Hendy Tanata2014-11-301-1/+1
| | | | | | | | [ci skip]
* | [Testing guide] Using "Fixtures API" consistentlyPrathamesh Sonpatki2014-11-301-1/+1
| | | | | | | | | | | | | | | | | | - In guides, "API" is used consistently instead of "api". - Reason behind replacing "fixtures API" to "Fixtures API" is because here we are referring to the concept of "fixtures". In other places in the guide "fixture" OR "fixtures" is referred to the single or multiple instances of test data. - This is also followup of https://github.com/rails/docrails/commit/aa9d1332b20305dd860b21a7ada06c5252bebad5#commitcomment-8497376.
* | [Testing guide] Use "Fixtures API" instead of "fixture api".Prathamesh Sonpatki2014-11-301-1/+1
| |
* | Merge pull request #17850 from y-yagi/patch-2Richard Schneeman2014-11-302-18/+1
|\ \ | | | | | | [ci skip] fix description of url_for
| * | [ci skip] fix description of url_foryuuji.yaginuma2014-11-302-18/+1
| | |
* | | Update Arel usage for rails/arel#98fc259Sean Griffin2014-11-294-8/+8
|/ / | | | | | | | | `where_sql` now requires that we pass it an engine. None of the manager classes take an engine in their constructor.
* | Use arel masterSean Griffin2014-11-291-0/+1
| |
* | Stop using `Arel::Table.engine`Sean Griffin2014-11-294-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | We never actually make use of it on the table, since we're constructing the select manager manually. It looks like if we ever actually were grabbing it from the table, we're grossly misusing it since it's meant to vary by AR class. Its existence on `Arel::Table` appears to be purely for convenience methods that are never used outside of tests. However, in production code it just complicates construction of the tables on the rails side, and the plan is to remove it from `Arel::Table` entirely. I'm not convinced it needs to live on `SelectManager`, etc either.
* | Merge pull request #17823 from byroot/fix-mount-rack-apps-with-asSean Griffin2014-11-293-8/+22
|\ \ | | | | | | Pure rack apps can be mounted with a name
| * | Pure rack apps can be mounted with a nameJean Boussier2014-11-293-8/+22
| | | | | | | | | | | | See https://github.com/rails/rails/commit/9b15828b5c347395b42066a588c88e5eb4e72279#commitcomment-8764492
* | | Merge pull request #17848 from biow0lf/fix-link-in-action_view-baseSean Griffin2014-11-291-2/+2
|\ \ \ | | | | | | | | Fix link in documentation. [ci skip]
| * | | Fix link in documentation. [ci skip]Igor Zubkov2014-11-301-2/+2
|/ / /
* | | Merge pull request #17846 from biow0lf/bump-ruby-versionMatthew Draper2014-11-301-1/+1
|\ \ \ | | | | | | | | Bump ruby version to 2.1.0 in rails.gemspec too.
| * | | Bump ruby version to 2.1.0 in rails.gemspec too.Igor Zubkov2014-11-291-1/+1
|/ / /
* | | Merge pull request #16833 from sferik/symbol_to_procRafael Mendonça França2014-11-29120-276/+244
|\ \ \ | | | | | | | | Pass symbol as an argument instead of a block
| * | | Pass symbol as an argument instead of a blockErik Michaels-Ober2014-11-29120-276/+244
|/ / /
* | | adds missing period in test.rb [ci skip]Xavier Noria2014-11-291-1/+1
| | |
* | | Merge pull request #17816 from byroot/prevent-numeric-to-s-to-allocate-an-arrayRafael Mendonça França2014-11-292-16/+25
|\ \ \ | | | | | | | | Prevent Numeric#to_s from allocating an array
| * | | Prevent Numeric#to_s from allocating an arrayJean Boussier2014-11-282-16/+25
| |/ /
* | | Merge pull request #17830 from claudiob/bump-required-ruby-versionRafael Mendonça França2014-11-299-11/+11
|\ \ \ | | | | | | | | Bump required Ruby version to 2.1.0
| * | | Bump required Ruby version to 2.1.0claudiob2014-11-289-11/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | [This article](http://weblog.rubyonrails.org/2014/8/20/Rails-4-2-beta1/#maintenance-consequences-and-rails-5-0) states that: > Rails 5.0 is in most likelihood going to target Ruby 2.2. Before the exact minimum version is fully decided, @arthurnn [suggests](https://github.com/rails/rails/pull/17830#issuecomment-64940383) that **at least** version 2.1.0 **must** be required by the `gemspec` files.
* | | Merge pull request #17838 from claudiob/remove-ruby19-reference-in-guidesArthur Nogueira Neves2014-11-281-1/+1
|\ \ \ | | | | | | | | Remove a reference to Ruby 1.9 in Guides
| * | | Remove a reference to Ruby 1.9 in Guidesclaudiob2014-11-281-1/+1
|/ / / | | | | | | | | | | | | | | | | | | [ci skip] Now that Rails requires Ruby >= 2.0 there is no need to document Ruby 1.9.
* | | Merge pull request #17828 from yui-knk/fix/i18n_guideZachary Scott2014-11-281-1/+1
|\ \ \ | |_|/ |/| | [ci skip] fix class name
| * | [ci skip] fix class nameyui-knk2014-11-291-1/+1
|/ /
* | Allow failures with Active Job integration testsRafael Mendonça França2014-11-281-0/+1
| |
* | Allow failures with Active JobRafael Mendonça França2014-11-281-1/+3
| |
* | Merge pull request #17818 from bigtone1284/edits_refactor_copRafael Mendonça França2014-11-281-1/+1
|\ \ | | | | | | fixed indent of end in jdom.rb
| * | fixed indent of end in jdom.rbbigtone12842014-11-281-1/+1
| | |
* | | Merge pull request #17799 from kamipo/refactor_add_column_optionsRafael Mendonça França2014-11-282-6/+14
|\ \ \ | | | | | | | | Refactor `add_column_options!`, to move the quoting of default value for :uuid in `quote_value`.
| * | | Rename to `quote_default_expression` from `quote_value`Ryuta Kamizono2014-11-282-3/+3
| | | |
| * | | Refactor `add_column_options!`, to move the quoting of default value for ↵Ryuta Kamizono2014-11-281-4/+12
| | | | | | | | | | | | | | | | :uuid in `quote_value`.
* | | | Use jquery-rails master to resolve dependenciesRafael Mendonça França2014-11-281-2/+2
| |/ / |/| | | | | | | | delayed_job_active_record doesn't allow Rails 5 yet
* | | We don't need to use sass-rails 5.0.0.betaRafael Mendonça França2014-11-281-2/+1
| | |
* | | Start Rails 5 development :tada:Rafael Mendonça França2014-11-2820-2746/+37
| |/ |/| | | | | | | | | | | We will support only Ruby >= 2.1. But right now we don't accept pull requests with syntax changes to drop support to Ruby 1.9.