aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Clear transaction state if callback raise rollbackArthur Neves2014-05-152-1/+14
| * | | | Small refactoring on clear_transaction_record_stateArthur Neves2014-05-151-3/+5
* | | | | Merge pull request #15131 from arunagw/aa-cleanup-rakefileRafael Mendonça França2014-05-162-31/+1
|\ \ \ \ \
| * | | | | Remove code related to adapter which are no longer in repoArun Agrawal2014-05-162-31/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #15021 from hubertlepicki/allow_custom_host_in_asset_urlRafael Mendonça França2014-05-164-3/+38
|\ \ \ \ \
| * | | | | Improve documentation for asset_urlHubert Łępicki2014-05-083-1/+20
| * | | | | Allow custom asset host to be passed in asset_urlHubert Łępicki2014-05-082-1/+17
* | | | | | Our test suite isn't ready to run in random order yet :cry:Guillermo Iguaran2014-05-161-0/+3
* | | | | | 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]Leandro Facchinetti2014-05-161-0/+5
* | | | | | | Merge pull request #15133 from ShunsukeAida/masterRafael Mendonça França2014-05-161-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | 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 khelben/head_with_status_action_stack_level_to...Rafael Mendonça França2014-05-156-2/+47
|\ \ \ \ \
| * | | | | fixes stack level too deep exception on action named 'status' returning 'head...Christiaan Van den Poel2014-05-156-2/+47
|/ / / / /
* | | | | Merge pull request #15121 from skarpesh/rfc4791-methodsRafael Mendonça França2014-05-153-3/+10
|\ \ \ \ \
| * | | | | 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 doubl...Aaron Nelson2014-05-163-0/+47
|/ / / / / /
* / / / / / Revert "Remove ruby-head from allow_failures matrix"Santiago Pastorino2014-05-151-0/+1
|/ / / / /
* | | | | 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.Guo Xiang Tan2014-05-151-4/+0
* | | | | | flexible ruby-oci8 version specification. [Gaurav Sharma]Yves Senn2014-05-151-1/+1
* | | | | | update ruby-oci8 version specification. Closes #15109. [ci skip]Yves Senn2014-05-151-1/+1
|/ / / / /
* | | | | Only path requirements are relevant to optimized urlsAndrew White2014-05-151-1/+1
* | | | | 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
* | | | | Merge pull request #15088 from kares/shareable-modulesRafael Mendonça França2014-05-1411-68/+67
|\ \ \ \ \
| * | | | | PostgreSQLAdapter::Utils seems to be only used from a single spot - quite red...kares2014-05-144-40/+34
| * | | | | 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
* | | | | | Don't use Active Support where it is not needed.Rafael Mendonça França2014-05-141-1/+3
* | | | | | 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.Kassio Borges2014-05-137-1/+42
* | | | | | | 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 stringsNat Budin2014-05-145-1/+32
* | | | | | | | 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 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 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`Kuldeep Aggarwal2014-05-151-1/+1
* | | | | | | | | | Merge pull request #15074 from kuldeepaggarwal/docs-changesRafael Mendonça França2014-05-141-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | [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 testsArthur Neves2014-05-131-0/+1