aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add missing requires for deep_dup and hash ext testCarlos Antonio da Silva2012-05-242-0/+3
|
* Merge pull request #5925 from Juanmcuello/pg_structure_dumpCarlos Antonio da Silva2012-05-241-2/+2
| | | | Quote arguments in db:structure:dump for PostgreSQL.
* Use deep_dup in the deep_transform_keys tests.Rafael Mendonça França2012-05-241-20/+98
| | | | | | | | Using only dup make some tests to not catch up an implementation error because the methods were changing the nested hashes. Related to: https://github.com/rails/rails/commit/541429fbe49b0671adb3842ab1818230d670ef9f#L1R96
* Merge pull request #6461 from schneems/schneems/sextant-routesAndrew White2012-05-2410-14/+104
|\ | | | | View your Routes without waiting on Rake
| * Rails::InfoController tests passingschneems2012-05-243-6/+32
| | | | | | | | This includes new tests for /rails/info/routes
| * /rails/info/routes path shows routing informationschneems2012-05-247-8/+72
|/ | | | Will show similar contents to the output of `$ rake routes` in the browser in development. This speeds the time required to generate routes, since the application is already initialized.
* Merge pull request #6471 from parndt/rails_root_should_be_join_ableJosé Valim2012-05-241-1/+1
|\ | | | | Fixes possible backward incompatibility
| * Fixed backward incompatibility for engines.Philip Arndt2012-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - Many engines rely on being able to join directories to the Rails root: Rails.root.join('somedir') - This was now impossible because Rails.root returned a String: NoMethodError: undefined method `join' for "/code/myrailsapp":String - This was broken in 4001835db00ce44cb75bca33ec02cd76b8ccc790
* | Merge pull request #6447 from ↵Piotr Sarnacki2012-05-231-0/+29
|\ \ | |/ |/| | | | | chancancode/add_backporting_instructions_to_contrib_guides Added instructions for backporting changes to guides.
| * Added instructions for backporting changes to guides.Godfrey Chan2012-05-231-0/+29
| | | | | | | | | | | | I was looking for instructions on backporting changes the other day and wasn't able to find it anywhere. I updated the contrib guides based on the disccusion in #6420, #6215 and #6447.
* | use File.join rather than depend on PathnameAaron Patterson2012-05-231-1/+1
| |
* | Revert "require the constants we use. ensure that root always returns a ↵Aaron Patterson2012-05-231-2/+1
| | | | | | | | | | | | Pathname" This reverts commit d77b576c0330d8b1c6189cb94814382ce32baab6.
* | require the constants we use. ensure that root always returns a PathnameAaron Patterson2012-05-231-1/+2
| |
* | removing more pathnameismsAaron Patterson2012-05-232-6/+4
| |
* | use File.join to decrease dependencies on PathnameAaron Patterson2012-05-231-1/+1
| |
* | Merge pull request #6466 from markmcspadden/hash_deep_transform_keysRafael Mendonça França2012-05-234-19/+50
|\ \ | | | | | | Add Hash#deep_transform_keys and Hash#deep_transform_keys! Also convert ...
| * | Add Hash#deep_transform_keys and Hash#deep_transform_keys! Also convert ↵Mark McSpadden2012-05-234-19/+50
| | | | | | | | | | | | deep_*_keys to use deep_transform_keys.
* | | Whitespaces :scissors:Rafael Mendonça França2012-05-232-7/+7
| | |
* | | PGconn doesn't accepts :checkout_timeout option.Rafael Mendonça França2012-05-231-1/+1
| |/ |/| | | | | | | | | | | This option was added on cb6f839359bd894feb0a1105b79af72b336aa41e renaming the :wait_timeout option. Fix build http://travis-ci.org/#!/rails/rails/jobs/1413405
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-2310-78/+554
|\ \
| * | copy edits in collection proxy docs [ci skip]Vijay Dev2012-05-231-25/+18
| | |
| * | Revert "Remove Obsolute root specifiying short syntax"Vijay Dev2012-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit feaa7b35a0214240eb34780ab51b843571e74904. Reason: Incorrect change. That's a Rails 4 feature and will not obviously work in 3.2.3. [ci skip]
| * | Revert "Remove blank trailing comments"Vijay Dev2012-05-23105-0/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a. Reason: Not a fan of such massive changes. We usually close such changes if made to Rails master as a pull request. Following the same principle here and reverting. [ci skip]
| * | copy edit[ci skip]Vijay Dev2012-05-231-1/+1
| | |
| * | [Guides] Fix sample codeOscar Del Ben2012-05-231-1/+1
| | |
| * | [Guides] Rewrite server start sectionOscar Del Ben2012-05-231-8/+23
| | |
| * | [Guides] Rewrite server start sectionOscar Del Ben2012-05-231-2/+20
| | |
| * | Fix incorrect example for fields_for - without the '=' it will not output ↵David Morton2012-05-221-1/+1
| | | | | | | | | | | | anything.
| * | clarified how file naming affects load order of initializersRory O’Kane2012-05-221-1/+1
| | |
| * | add CollectionProxy#length documentationFrancesco Rodriguez2012-05-221-5/+37
| | |
| * | add CollectionProxy#size documentationFrancesco Rodriguez2012-05-221-2/+25
| | |
| * | add :call-seq: to +first+ and +last+ CollectionProxy methodsFrancesco Rodriguez2012-05-221-0/+6
| | |
| * | add CollectionProxy#create! documentationFrancesco Rodriguez2012-05-221-0/+22
| | |
| * | add CollectionProxy#create documentationFrancesco Rodriguez2012-05-221-0/+33
| | |
| * | add more examples to CollectionProxy#findFrancesco Rodriguez2012-05-221-0/+9
| | |
| * | adding :call-seq: to CollectionProxy methodsFrancesco Rodriguez2012-05-221-0/+39
| | |
| * | add CollectionProxy#build documentationFrancesco Rodriguez2012-05-221-0/+31
| | |
| * | [Guides] Update rails commands sectionOscar Del Ben2012-05-221-0/+5
| | |
| * | [Guides] Change bundler sectionOscar Del Ben2012-05-221-12/+12
| | |
| * | [Guides] Review bin/rails sectionOscar Del Ben2012-05-221-2/+5
| | |
| * | [Guides] change rails bin sectionOscar Del Ben2012-05-221-6/+5
| | |
| * | The initialization guide will cover Rails 4Oscar Del Ben2012-05-221-2/+4
| | |
| * | remove repeated documentation in CollectionProxy#clearFrancesco Rodriguez2012-05-221-24/+2
| | |
| * | Remove Obsolute root specifiying short syntaxGaurish Sharma2012-05-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This syntax does not seem to work. Throws the error "can't convert String into Hash (TypeError)" Tested on: * Ruby 1.9.3 * Rails 3.2.3
| * | Remove obsolete comment from generator gem methodAlexey Vakhov2012-05-221-2/+1
| | | | | | | | | | | | | | | This comment about :env option for gem method was actual for rails 2.3 without bundler. Now bundler uses grups for this goal.
| * | Fix broken linkGaurish Sharma2012-05-221-1/+1
| | |
| * | update CollectionProxy#clear documentationFrancesco Rodriguez2012-05-211-3/+2
| | |
| * | update CollectionProxy#delete_all documentationFrancesco Rodriguez2012-05-211-2/+29
| | |
| * | add CollectionProxy#delete_all documentationFrancesco Rodriguez2012-05-211-0/+65
| | |
| * | Fix AR preloader exampleAlexey Vakhov2012-05-221-1/+1
| | |