Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | fix `alias_attribute` will raise a syntax error if make an alias on a | ayaya | 2012-05-14 | 2 | -4/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | column that named as a ruby keyword | |||||
* | | | | | | | Remove implicit dependency on pathname | José Valim | 2012-05-25 | 2 | -4/+4 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #6482 from waseem/fix_build_4008 | José Valim | 2012-05-24 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixes build 4008.1 | |||||
| * | | | | | | | Fixes build 4008.1 | Waseem Ahmad | 2012-05-25 | 1 | -2/+2 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixex build 4008.1[1] because of the changes made in 4001835db00ce44cb75bca33ec02cd76b8ccc790 [1] http://travis-ci.org/#!/rails/rails/jobs/1429671 | |||||
* | | | | | | | Merge pull request #6481 from schneems/schneems/sextant-routes | Rafael Mendonça França | 2012-05-24 | 1 | -9/+0 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove Unnecessary Test from route_inspect_test | |||||
| * | | | | | | | remove unnecessary test from route_inspect_test | schneems | 2012-05-24 | 1 | -9/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | do not set the ENGINE_PATH to nil | Aaron Patterson | 2012-05-24 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | `name` should be public. | Aaron Patterson | 2012-05-24 | 1 | -12/+12 | |
| | | | | | | | | ||||||
* | | | | | | | | Add missing requires for deep_dup and hash ext test | Carlos Antonio da Silva | 2012-05-24 | 2 | -0/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #5925 from Juanmcuello/pg_structure_dump | Carlos Antonio da Silva | 2012-05-24 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quote arguments in db:structure:dump for PostgreSQL. | |||||
* | | | | | | | | Use deep_dup in the deep_transform_keys tests. | Rafael Mendonça França | 2012-05-24 | 1 | -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-routes | Andrew White | 2012-05-24 | 10 | -14/+104 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | View your Routes without waiting on Rake | |||||
| * | | | | | | | Rails::InfoController tests passing | schneems | 2012-05-24 | 3 | -6/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes new tests for /rails/info/routes | |||||
| * | | | | | | | /rails/info/routes path shows routing information | schneems | 2012-05-24 | 7 | -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_able | José Valim | 2012-05-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixes possible backward incompatibility | |||||
| * | | | | | | | Fixed backward incompatibility for engines. | Philip Arndt | 2012-05-24 | 1 | -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 Sarnacki | 2012-05-23 | 1 | -0/+29 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | chancancode/add_backporting_instructions_to_contrib_guides Added instructions for backporting changes to guides. | |||||
| * | | | | | | | Added instructions for backporting changes to guides. | Godfrey Chan | 2012-05-23 | 1 | -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 Pathname | Aaron Patterson | 2012-05-23 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Revert "require the constants we use. ensure that root always returns a ↵ | Aaron Patterson | 2012-05-23 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pathname" This reverts commit d77b576c0330d8b1c6189cb94814382ce32baab6. | |||||
* | | | | | | | require the constants we use. ensure that root always returns a Pathname | Aaron Patterson | 2012-05-23 | 1 | -1/+2 | |
| | | | | | | | ||||||
* | | | | | | | removing more pathnameisms | Aaron Patterson | 2012-05-23 | 2 | -6/+4 | |
| | | | | | | | ||||||
* | | | | | | | use File.join to decrease dependencies on Pathname | Aaron Patterson | 2012-05-23 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #6466 from markmcspadden/hash_deep_transform_keys | Rafael Mendonça França | 2012-05-23 | 4 | -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 McSpadden | 2012-05-23 | 4 | -19/+50 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deep_*_keys to use deep_transform_keys. | |||||
* | | | | | | | | Whitespaces :scissors: | Rafael Mendonça França | 2012-05-23 | 2 | -7/+7 | |
| | | | | | | | | ||||||
* | | | | | | | | PGconn doesn't accepts :checkout_timeout option. | Rafael Mendonça França | 2012-05-23 | 1 | -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/docrails | Vijay Dev | 2012-05-23 | 10 | -78/+554 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | copy edits in collection proxy docs [ci skip] | Vijay Dev | 2012-05-23 | 1 | -25/+18 | |
| | | | | | | | | ||||||
| * | | | | | | | Revert "Remove Obsolute root specifiying short syntax" | Vijay Dev | 2012-05-23 | 1 | -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 Dev | 2012-05-23 | 105 | -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 Dev | 2012-05-23 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] Fix sample code | Oscar Del Ben | 2012-05-23 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] Rewrite server start section | Oscar Del Ben | 2012-05-23 | 1 | -8/+23 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] Rewrite server start section | Oscar Del Ben | 2012-05-23 | 1 | -2/+20 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix incorrect example for fields_for - without the '=' it will not output ↵ | David Morton | 2012-05-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anything. | |||||
| * | | | | | | | clarified how file naming affects load order of initializers | Rory O’Kane | 2012-05-22 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#length documentation | Francesco Rodriguez | 2012-05-22 | 1 | -5/+37 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#size documentation | Francesco Rodriguez | 2012-05-22 | 1 | -2/+25 | |
| | | | | | | | | ||||||
| * | | | | | | | add :call-seq: to +first+ and +last+ CollectionProxy methods | Francesco Rodriguez | 2012-05-22 | 1 | -0/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#create! documentation | Francesco Rodriguez | 2012-05-22 | 1 | -0/+22 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#create documentation | Francesco Rodriguez | 2012-05-22 | 1 | -0/+33 | |
| | | | | | | | | ||||||
| * | | | | | | | add more examples to CollectionProxy#find | Francesco Rodriguez | 2012-05-22 | 1 | -0/+9 | |
| | | | | | | | | ||||||
| * | | | | | | | adding :call-seq: to CollectionProxy methods | Francesco Rodriguez | 2012-05-22 | 1 | -0/+39 | |
| | | | | | | | | ||||||
| * | | | | | | | add CollectionProxy#build documentation | Francesco Rodriguez | 2012-05-22 | 1 | -0/+31 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] Update rails commands section | Oscar Del Ben | 2012-05-22 | 1 | -0/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] Change bundler section | Oscar Del Ben | 2012-05-22 | 1 | -12/+12 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] Review bin/rails section | Oscar Del Ben | 2012-05-22 | 1 | -2/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | [Guides] change rails bin section | Oscar Del Ben | 2012-05-22 | 1 | -6/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | The initialization guide will cover Rails 4 | Oscar Del Ben | 2012-05-22 | 1 | -2/+4 | |
| | | | | | | | |