aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15059 from marcioj/patch-1Robin Dupret2014-05-111-2/+2
|\
| * Replace :base with :in [ci skip]Marcio Junior2014-05-111-2/+2
|/
* Tidy up implementation of #15010Andrew White2014-05-112-11/+7
* Make TimeZone#parse behave more like Time#parse.Ulysse Carion2014-05-113-1/+25
* docs, make `ActionNotFound` public API. [ci skip]Yves Senn2014-05-111-1/+2
* Merge pull request #15058 from Gaurav2728/gaurav-doc_messageRichard Schneeman2014-05-111-3/+4
|\
| * adding complete message in documentation [ci skip]Gaurav Sharma2014-05-111-3/+4
|/
* Merge branch 'master' of github.com:rails/railsAndrew White2014-05-111-0/+59
|\
| * pg guide, PostgreSQL legacy table view example. [ci skip]Yves Senn2014-05-111-0/+59
* | Always use the provided port for protocol relative urlsAndrew White2014-05-113-0/+20
* | ActionDispatch::Http::URL.normalize_port should not strip port for protocol r...Guilherme Cavalcanti2014-05-112-2/+12
|/
* docs, fix typo in docs added by ed56e596a04673. [ci skip]Yves Senn2014-05-101-2/+2
* Merge pull request #15056 from josemarluedke/single-quotes-on-plugin-gemfileRafael Mendonça França2014-05-102-7/+7
|\
| * Change Gemfile’s double quotes in plugin generatorJosemar Luedke2014-05-102-7/+7
|/
* Merge pull request #15054 from mechanicles/documentation-consistencyRafael Mendonça França2014-05-101-3/+3
|\
| * Keep method's description/documentation consistent [ci skip]Santosh Wadghule2014-05-111-3/+3
|/
* feature detect for FNM_EXTGLOB for older Ruby. Fixes #15053Aaron Patterson2014-05-101-5/+21
* minor change in AR readme [ci skip]Vijay Dev2014-05-101-1/+1
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-05-106-11/+49
|\
| * copy edits [ci skip]Vijay Dev2014-05-102-14/+13
| * [ci skip] add example to AR#assign_attributesschneems2014-05-091-0/+10
| * [ci skip] doc ActiveSupport::TimeWithZone#to_sschneems2014-05-091-2/+5
| * [ci skip] doc Http::Headers methodsschneems2014-05-091-1/+17
| * fix formatting errors [ci skip]Vijay Dev2014-05-091-6/+6
| * copy edits [ci skip]Vijay Dev2014-05-082-3/+2
| * [ci skip] document ActionDispatch::HTTP::Headersschneems2014-05-071-0/+6
| * [ci skip] document type_cast_for_writeschneems2014-05-072-0/+5
| * Fix Formatting in AR ReadmeGaurish Sharma2014-05-041-2/+2
* | deprecate, join, preload, eager load of instance dependent associations.Yves Senn2014-05-106-4/+56
* | Merge pull request #15049 from arthurnn/fix_ciRafael Mendonça França2014-05-091-1/+1
|\ \
| * | Fix broken proc syntax for 1.9.3Arthur Neves2014-05-091-1/+1
|/ /
* | skip dealing with params if none are providedAaron Patterson2014-05-091-4/+11
* | don't mutate the options hash, so we don't have to dupAaron Patterson2014-05-091-4/+3
* | use fnmatch to test for case insensitive file systemsAaron Patterson2014-05-091-4/+2
* | use unless and || since these options are booleanAaron Patterson2014-05-091-1/+1
* | Merge pull request #15045 from xanhast/patch-1Godfrey Chan2014-05-091-2/+4
|\ \
| * | Documentation, add examples of using an Enum scopeZac2014-05-091-2/+4
|/ /
* | test, regression test for has_many with instance dependent scope.Yves Senn2014-05-092-0/+12
* | Merge pull request #15044 from zzak/travis_ruby_too_wonRafael Mendonça França2014-05-091-1/+1
|\ \
| * | Only need MINOR version level to test Ruby 2.1.x on TravisZachary Scott2014-05-091-1/+1
|/ /
* | Merge pull request #15042 from arthurnn/revert_dirty_transactionsRafael Mendonça França2014-05-093-52/+0
|\ \
| * | Reverts "Fix bugs with changed attributes tracking when transaction gets roll...Arthur Neves2014-05-093-52/+0
* | | just call the method and assert the return valueAaron Patterson2014-05-091-8/+1
|/ /
* | Merge pull request #15041 from arthurnn/update_rubyGuillermo Iguaran2014-05-091-1/+1
|\ \
| * | Use ruby 2.1.2 on travisArthur Neves2014-05-091-1/+1
|/ /
* | add tests for path based url_for callsAaron Patterson2014-05-081-2/+19
* | don't manipulate the testclass, just add helpers to the instanceAaron Patterson2014-05-081-10/+11
* | add a test for classes with optionsAaron Patterson2014-05-081-0/+7
* | add tests for the polymorphic_path methodAaron Patterson2014-05-081-0/+3
* | Merge pull request #15030 from mechanicles/a-to-anRafael Mendonça França2014-05-081-1/+1
|\ \