aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed problem where `1.day.eql?(1.day)` is falseEmily Dobervich2014-04-083-0/+45
|/ / /
* | | new CHANGELOGs entries are in the top [ci skip]Rafael Mendonça França2014-04-081-4/+4
* | | Merge pull request #14647 from matiaskorhonen/updates-maintenance-policyRafael Mendonça França2014-04-082-3/+7
|\ \ \
| * | | Updates the maintenance policy with new Rails versionsMatias Korhonen2014-04-082-3/+7
|/ / /
* | | Dont abbreviate that which needs no abbreviationDavid Heinemeier Hansson2014-04-081-2/+2
* | | Dont encourage aliases now that we have variantsDavid Heinemeier Hansson2014-04-081-1/+0
* | | Use short-form for the scaffold render calls and drop the needless testDavid Heinemeier Hansson2014-04-082-9/+2
* | | Merge pull request #14633 from matthewd/narrow_database_urlRafael Mendonça França2014-04-0814-101/+251
|\ \ \
| * | | Drop in @jeremy's new database.yml template textMatthew Draper2014-04-0913-44/+206
| * | | Don't deprecate after allMatthew Draper2014-04-092-27/+11
| * | | Less ambition, more deprecationMatthew Draper2014-04-092-75/+27
| * | | Ensure we correctly and immediately load all ENV entriesMatthew Draper2014-04-081-0/+21
| * | | Give a deprecation message even when the lookup failsMatthew Draper2014-04-082-4/+6
| * | | Rearrange the config merger some moreMatthew Draper2014-04-081-19/+16
| * | | entry is always a HashRafael Mendonça França2014-04-081-1/+1
| * | | Check env_url only onceRafael Mendonça França2014-04-081-2/+7
| * | | Only call DEFAULT_ENV proc one timeRafael Mendonça França2014-04-081-2/+5
| * | | Test DATABASE_URL has precendance over DATABASE_URL_#{environment}Rafael Mendonça França2014-04-081-0/+9