aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15113 from leafac/document-schema-conflictsRafael Mendonça França2014-05-161-0/+5
|\ | | | | Document conflicts in `db/schema.rb` [ci skip]
| * Document conflicts in `db/schema.rb` [ci skip]Leandro Facchinetti2014-05-161-0/+5
| |
* | Merge pull request #15133 from ShunsukeAida/masterRafael Mendonça França2014-05-161-1/+1
|\ \ | | | | | | fixed a typo
| * | fixed a typo [ci skip]Aida2014-05-171-1/+1
|/ /
* | formatting pass through CHANGELOGS. [ci skip]Yves Senn2014-05-164-8/+10
| |
* | Merge pull request #15118 from ↵Rafael Mendonça França2014-05-156-2/+47
|\ \ | | | | | | | | | | | | | | | khelben/head_with_status_action_stack_level_too_deep fixes stack level too deep exception on action named 'status' rendering 'head :ok'
| * | fixes stack level too deep exception on action named 'status' returning ↵Christiaan Van den Poel2014-05-156-2/+47
|/ / | | | | | | 'head :ok'
* | Merge pull request #15121 from skarpesh/rfc4791-methodsRafael Mendonça França2014-05-153-3/+10
|\ \ | | | | | | | | | Add RFC 4791 MKCALENDAR method
| * | Add RFC4791 MKCALENDAR methodkasper2014-05-153-3/+10
| | |
* | | Merge pull request #14791 from asn62/mysql_double_bugMatthew Draper2014-05-163-0/+47
|\ \ \ | | | | | | | | | | | | | | | | Changed extract_limit in class Column to return correct mysql float and double limits
| * | | Changed extract_limit in class Column to return correct mysql float and ↵Aaron Nelson2014-05-163-0/+47
|/ / / | | | | | | | | | double limits
* / / Revert "Remove ruby-head from allow_failures matrix"Santiago Pastorino2014-05-151-0/+1
|/ / | | | | | | This reverts commit 5d2d301024cc0b17f26f6b454ac22a72f1db8a23.
* | Remove ruby-head from allow_failures matrixSantiago Pastorino2014-05-151-1/+0
| |
* | Merge pull request #15116 from tgxworld/remove_unused_method_in_testSantiago Pastorino2014-05-151-4/+0
|\ \ | | | | | | Remove unused method in RouteSet test.
| * | Remove unused method in RouteSet test.Guo Xiang Tan2014-05-151-4/+0
| | |
* | | flexible ruby-oci8 version specification. [Gaurav Sharma]Yves Senn2014-05-151-1/+1
| | | | | | | | | | | | | | | | | | Follow up to #15109. /cc @Gaurav2728
* | | update ruby-oci8 version specification. Closes #15109. [ci skip]Yves Senn2014-05-151-1/+1
|/ / | | | | | | /cc @yahonda
* | Only path requirements are relevant to optimized urlsAndrew White2014-05-151-1/+1
| | | | | | | | | | The bit of URL generation that is optimized is the generation of the path so things like :host, :port, etc. are irrelevant.
* | Add missing requires for require 'action_dispatch/routing'Andrew White2014-05-152-0/+3
| |
* | :scissors:Rafael Mendonça França2014-05-143-4/+0
| |
* | Methods of these modules are internalRafael Mendonça França2014-05-142-14/+14
| | | | | | | | | | They should not be used on people application so they should not be present on the API documentation.
* | Merge pull request #15088 from kares/shareable-modulesRafael Mendonça França2014-05-1411-68/+67
|\ \ | | | | | | | | | [postgres] remove (outer) sub-class declarations with nested modules/classes
| * | PostgreSQLAdapter::Utils seems to be only used from a single spot - quite ↵kares2014-05-144-40/+34
| | | | | | | | | | | | redundant
| * | move PostgreSQL's DatabaseStatements out of the PostgreSQLAdapter name-spacekares2014-05-142-7/+7
| | |
| * | PostgreSQL's SchemaStatements seems a could candidate for re-use (with AR-JDBC)kares2014-05-142-8/+7
| | |
| * | introduce AR::ConnectionAdapters::PostgreSQL for sharing modules (with AR-JDBC)kares2014-05-147-15/+21
| | | | | | | | | ... 'shared' OID, ArrayParser and Cast helpers, also re-arranged Column's dependencies
* | | Don't use Active Support where it is not needed.Rafael Mendonça França2014-05-141-1/+3
| | | | | | | | | | | | | | | parent_name is a string of nil, never a blank string so we don't need to use presence.
* | | Merge pull request #14871 from kassio/kb-fixes-namespaced-habtmRafael Mendonça França2014-05-147-1/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix how to compute class name on habtm namespaced. Conflicts: activerecord/CHANGELOG.md
| * | | Fix how to compute class name on habtm namespaced.Kassio Borges2014-05-137-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | Thank's for @laurocaetano for the help with tests. :smiley: Fixes #14709
* | | | Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_masterRafael Mendonça França2014-05-145-1/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make filter_binds filter out symbols that are equal to strings Conflicts: activerecord/CHANGELOG.md
| * | | | Make filter_binds filter out symbols that are equal to stringsNat Budin2014-05-145-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::Relation::Merger's filter_binds method does not filter out bind variables when one of the attribute nodes has a string name, but the other has a symbol name, even when those names are actually equal. This can result in there being more bind variables than placeholders in the generated SQL. This is particularly an issue for PostgreSQL, where this is treated as an error. This patch changes the filter_binds method to make it convert both attribute names to strings before comparing.
* | | | | Merge pull request #14137 from dasch/better-fragment-cache-instrumentationRafael Mendonça França2014-05-143-1/+31
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Add controller and action name to the fragment caching instrumentation payload Conflicts: actionpack/CHANGELOG.md
| * | | | Add controller and action name to the instrumentation payloadDaniel Schierbeck2014-05-103-1/+31
| | | | |
* | | | | Merge pull request #15070 from ayamomiji/sse-patchAaron Patterson2014-05-142-1/+18
|\ \ \ \ \ | | | | | | | | | | | | Add multiple lines message support for SSE module
| * | | | | Add multiple lines message support for SSE moduleayaya2014-05-122-1/+18
| | | | | |
* | | | | | rake, remove frontbase related tasks from Active Record Rakefile.Yves Senn2014-05-141-46/+0
| | | | | |
* | | | | | Merge pull request #15110 from kuldeepaggarwal/fix-warningRafael Mendonça França2014-05-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove warning `ambiguous first argument; put parentheses or even spaces`
| * | | | | | remove warning `ambiguous first argument; put parentheses or even spaces`Kuldeep Aggarwal2014-05-151-1/+1
| | | | | | |
* | | | | | | Merge pull request #15074 from kuldeepaggarwal/docs-changesRafael Mendonça França2014-05-141-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add missing information, ref[#522c0fd]
| * | | | | | [ci skip]add updated information, ref[#522c0fd]Kuldeep Aggarwal2014-05-141-0/+2
| | | | | | |
* | | | | | | Merge pull request #15108 from arthurnn/i18n_masterRafael Mendonça França2014-05-141-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use i18n master to run tests
| * | | | | | | Use i18n master to run testsArthur Neves2014-05-131-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #15096 from robin850/patch-20Rafael Mendonça França2014-05-143-4/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Update Redcarpet to 3.1.2
| * | | | | | | Update Redcarpet to 3.1.2Robin Dupret2014-05-143-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version fixes an API breakage between 3.0 and 3.1 ; the header method's arity should not have changed. [ci skip]
* | | | | | | | We need an explicit returnRafael Mendonça França2014-05-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't return early Ruby will memoize the value of the prefix of the parent class what will make the subsequent searchs to not work as expected. If the early return we are avoiding the memoization. But when using the deprecated path we need to memoize the value, so we are not using early return for the deprecated path.
* | | | | | | | Following documentation guidelineRafael Mendonça França2014-05-141-4/+3
| | | | | | | |
* | | | | | | | Refactoring the code to make consitional return explicitRafael Mendonça França2014-05-141-4/+9
| | | | | | | |
* | | | | | | | Follow the documentation guidelineRafael Mendonça França2014-05-141-1/+1
| | | | | | | |
* | | | | | | | Mark _prefix as nodocRafael Mendonça França2014-05-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods are private API.
* | | | | | | | ._prefix is private API so we should not recommend to override itRafael Mendonça França2014-05-141-2/+2
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 23:39:08 +0000