aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | PostgreSQL, warn once per connection per missing OID. Closes #14275.Yves Senn2014-04-113-2/+19
| * | | | | PostgreSQL, adapter automatically reloads it's type map. Closes #14678.Yves Senn2014-04-118-16/+57
| | |/ / / | |/| | |
* | | | | Merge pull request #14705 from akshay-vishnoi/doc_changesRafael Mendonça França2014-04-114-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add more test case for #demodulize, Improve documentationAkshay Vishnoi2014-04-114-0/+8
* | | | | Merge pull request #14684 from Futurelearn/jc-deep-nested-shallow-url-helper-bugAndrew White2014-04-113-3/+40
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Only make deeply nested routes shallow when parent is shallowAndrew White2014-04-112-3/+22
| * | | | Add a failing test for a URL helper that was broken by a6b9ea2.James Coglan2014-04-101-0/+18
| | |/ / | |/| |
* | | | docs, make association `autosave: true` examples runnable. Closes #14700Yves Senn2014-04-111-6/+9
* | | | Merge pull request #12829 from iantropov/issue_insert_via_hmt_scope_3548Rafael Mendonça França2014-04-106-4/+32
|\ \ \ \
| * | | | Fix insertion of records for hmt association with scope, fix #3548Ivan Antropov2013-11-176-4/+32
* | | | | Merge pull request #14694 from heironimus/callback_guideRafael Mendonça França2014-04-101-0/+3
|\ \ \ \ \
| * | | | | Add after_commit/after_rollback to callback listKyle Heironimus2014-04-101-0/+3
* | | | | | Merge pull request #14695 from akshay-vishnoi/doc_changesRafael Mendonça França2014-04-101-14/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | [ci skip] Remove false documentationAkshay Vishnoi2014-04-111-14/+1
|/ / / /
* | | | Remove warning of unused variableRafael Mendonça França2014-04-101-1/+1
* | | | Merge branch 'rm-uuid-fixtures'Rafael Mendonça França2014-04-1013-10/+149
|\ \ \ \
| * | | | No need to call sendRafael Mendonça França2014-04-101-1/+1
| * | | | Merge branch 'master' into rm-uuid-fixturesRafael Mendonça França2014-04-1079-287/+783
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Require action_controller before any other action_controller fileRafael Mendonça França2014-04-101-0/+1
* | | | | Merge pull request #11656 from emre-basala/xml_mini_testRafael Mendonça França2014-04-101-1/+58
|\ \ \ \ \
| * | | | | Add tests to ActiveSupport:XmlMini to_tag methodemre-basala2013-08-071-1/+58
* | | | | | Merge pull request #14677 from JuanitoFatas/update-initialization-code-snippetsRafael Mendonça França2014-04-101-53/+102
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | [ci skip] Update code snippets to latest master (initialization.md).Juanito Fatas2014-04-101-53/+102
* | | | | | Merge pull request #14679 from pbharadiya/masterYves Senn2014-04-101-1/+1
|\ \ \ \ \ \
| * | | | | | Correct factual error for page not foundParth Bharadiya2014-04-101-1/+1
|/ / / / / /
* / / / / / +EOLAkira Matsuda2014-04-101-1/+1
|/ / / / /
* | | | | Merge pull request #11411 from dscataglini/masterAaron Patterson2014-04-091-6/+12
|\ \ \ \ \
| * | | | | private method doesn't work for singleton methods defined this wayDiego Scataglini2013-07-121-6/+12
* | | | | | Only call uniq on the conditional that actually needs itCarlos Antonio da Silva2014-04-091-1/+1
* | | | | | Remove extra collect callCarlos Antonio da Silva2014-04-091-1/+1
* | | | | | Merge pull request #14675 from laurocaetano/make_reflection_caches_works_with...Aaron Patterson2014-04-092-7/+7
|\ \ \ \ \ \
| * | | | | | Make sure the reflection test is passing a String to the reflectionLauro Caetano2014-04-091-1/+1
| * | | | | | Make the aggregate_reflections cache work with strings as its keys.Lauro Caetano2014-04-091-2/+2
| * | | | | | No need to call `to_sym` on reflection name, since the cache now worksLauro Caetano2014-04-091-2/+2
| * | | | | | Make the reflections cache work with strings as its keys.Lauro Caetano2014-04-091-2/+2
|/ / / / / /
* | | | | | Merge pull request #14671 from arthurnn/travis_memcacheRafael Mendonça França2014-04-091-0/+1
|\ \ \ \ \ \
| * | | | | | add services: memcache to travisArthur Neves2014-04-091-0/+1
|/ / / / / /
* | | | | | Merge pull request #14668 from laurocaetano/source_option_with_string_valueAaron Patterson2014-04-092-3/+3
|\ \ \ \ \ \
| * | | | | | The `source` option for `has_many => through` should accept StringLauro Caetano2014-04-092-3/+3
|/ / / / / /
* | | | | | Merge pull request #14665 from andrielfn/avoid-uri-parsingRafael Mendonça França2014-04-092-5/+15
|\ \ \ \ \ \
| * | | | | | Avoid URI parsingAndriel Nuernberg2014-04-092-5/+15
* | | | | | | Merge pull request #14667 from lucasmazza/require-per-thread-registryRafael Mendonça França2014-04-091-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add missing require so requiring `active_support/cache` works again.Lucas Mazza2014-04-091-0/+1
| |/ / / / / /
* / / / / / / depend_on_asset is not required anymore on sprockets-rails 2.1.2Rafael Mendonça França2014-04-093-25/+11
|/ / / / / /
* | | | | | Merge pull request #14654 from Alamoz/secret_keyRafael Mendonça França2014-04-091-4/+7
|\ \ \ \ \ \
| * | | | | | Expand explanation of how to set secrets.yml. [ci skip]Adrien Lamothe2014-04-081-4/+7
* | | | | | | upgrading section for 4.1 is no longer WIP. [ci skip]Yves Senn2014-04-091-2/+0
* | | | | | | Merge pull request #14653 from vdmgolub/patch-1Arun Agrawal2014-04-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Guides: minor typo fixed [ci skip]Vadim Golub2014-04-091-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #14652 from Emily/duration_eqlsGuillermo Iguaran2014-04-083-0/+45
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |