aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into sprocketsJoshua Peek2011-04-1238-121/+317
|\
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-124-20/+43
| |\
| | * Update guides reflecting that scaffold_controller generator generates now ↵Sebastian Martinez2011-04-111-18/+19
| | | | | | | | | | | | code for JSON response instead of XML
| | * Updated AS guide with new Object#in? and Object#either? methodsSebastian Martinez2011-04-111-0/+22
| | |
| | * Revert "Edited railties/guides/source/active_support_core_extensions.textile ↵Xavier Noria2011-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | via GitHub" Reason: The original sentence is correct. Please note the guide covers the stable version of Active Support. This reverts commit 5265650d51713a883e6cacde8f6faf52708abc1b.
| | * Edited railties/guides/source/active_support_core_extensions.textile via GitHubOge Nnadi2011-04-111-1/+1
| | |
| | * fix example queryVijay Dev2011-04-061-1/+1
| | |
| | * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-04-0415-29/+124
| | |\
| | * \ Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-03-315-47/+21
| | |\ \
| | * \ \ Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-03-2911-18/+64
| | |\ \ \
| | * \ \ \ Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-03-271-2/+2
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-03-277-8/+65
| | |\ \ \ \ \
| | * | | | | | remove to from to to :)Vijay Dev2011-03-161-1/+1
| | | | | | | |
| * | | | | | | Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵David Heinemeier Hansson2011-04-128-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggestion!
| * | | | | | | Keep the same API semantics for update/delete as we had for XML (just return ↵David Heinemeier Hansson2011-04-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 200 OK, no body)
| * | | | | | | Cant use inclusion in commands/application.rb as the frameworks havent all ↵David Heinemeier Hansson2011-04-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | been required yet
| * | | | | | | Using Object#in? and Object#either? in various placesPrem Sichanugrist2011-04-119-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?.
| * | | | | | | Add --old-style-hash option to force creating old style hash on Ruby 1.9Prem Sichanugrist2011-04-105-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That means if you don't like the new syntax, you can pass --old-style-hash to force Rails to generate code with hash rockets.
| * | | | | | | Rails will now generate Ruby 1.9 style hash when running app generator on ↵Prem Sichanugrist2011-04-105-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 1.9.x The new hash syntax of Ruby 1.9 looks more superior, so we decide to switch to it in the places that appropriate.
| * | | | | | | Rails will now generate Ruby 1.9 style hash when running scaffold_controller ↵Prem Sichanugrist2011-04-106-19/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generator on Ruby 1.9.x The new hash syntax of Ruby 1.9 looks more superior, so we decide to switch to it in the places that appropriate. This patch has been requested by DHH.
| * | | | | | | Make scaffold_controller generator generate code for JSON response instead ↵Prem Sichanugrist2011-04-102-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of XML It seems like a lot of people are using JSON in their API more than XML nowadays, so Rails should follow that convention by providing the JSON format block in scaffold_controller by default. This patch has been requested by DHH
| * | | | | | | make turn a soft dependency. generate a Gemfile that contains turn and ↵Aaron Patterson2011-04-083-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | require turn if it is available
| * | | | | | | added find_zone and find_zone! to AS timezones and changed the AS Railtie to ↵Josh Kalderimis2011-04-051-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use find_zone! as well as adding Railtie tests Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | | | | | | remove AM delegating register_observer and register_interceptor to Mail and ↵Josh Kalderimis2011-04-041-0/+65
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead implement smarter versions allowing for string class names, also added proper Railtie support with tests. Signed-off-by: José Valim <jose.valim@gmail.com>
| * | | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-0311-59/+32
| |\ \ \ \ \ \
| | * | | | | | added .'s to headings in the initialization textile pageorta2011-04-031-3/+2
| | | | | | | |
| | * | | | | | s/ERb/ERB/g (part II)Akira Matsuda2011-04-034-5/+5
| | | | | | | |
| | * | | | | | s/ERb/ERB/gAkira Matsuda2011-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The author of ERB sais, his eRuby implementation was originally named "ERb/ERbLight" and then renamed to "ERB" when started bundled as a Ruby standard lib. http://www2a.biglobe.ne.jp/~seki/ruby/erb.html
| | * | | | | | fix typoburningTyger2011-04-011-1/+1
| | | |_|_|_|/ | | |/| | | |
| | * | | | | Grammar tweaks to the guides guidelinesJosiah Ivey2011-03-311-9/+10
| | | | | | |
| | * | | | | Minor rephrasing to improve grammar and readability.mhutchin2011-03-291-1/+1
| | | | | | |
| | * | | | | Fixed typo and improved readability.mhutchin2011-03-291-1/+2
| | | | | | |
| | * | | | | Fix Basic Authentication examplesSebastian Martinez2011-03-282-3/+3
| | | | | | |
| | * | | | | Updated Basic Authentication guides to reflect new ↵Sebastian Martinez2011-03-282-36/+8
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Base.http_basic_authenticate_with method
| | * | | | Minor typo correction.mhutchin2011-03-271-1/+1
| | | | | |
| * | | | | Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0Santiago Pastorino2011-04-021-1/+0
| | | | | |
| * | | | | Moved Turn activation/dependency to railtiesDavid Heinemeier Hansson2011-03-314-1/+12
| | | | | |
| * | | | | Direct logging of Active Record to STDOUT so it's shown inline with the ↵David Heinemeier Hansson2011-03-312-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | results in the console [DHH]
* | | | | | Fix assets prefix joiningJoshua Peek2011-03-301-1/+1
| | | | | |
* | | | | | Fix assets prefix joiningJoshua Peek2011-03-301-1/+1
| | | | | |
* | | | | | Fix config.assets.precompile optionJoshua Peek2011-03-301-1/+1
| | | | | |
* | | | | | Unify sprockets config optionsJoshua Peek2011-03-303-17/+24
| | | | | |
* | | | | | Merge branch 'master' into sprocketsJoshua Peek2011-03-3017-38/+198
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb
| * | | | | Delegate first!, last!, any? and many? to scopedAndrew White2011-03-291-0/+20
| | | | | |
| * | | | | Update the wildcard route to be non-greedy by default, therefore be able to ↵Prem Sichanugrist2011-03-291-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match the (.:format) segment [#6605 state:resolved] After some discussion with Andrew White, it seems like this is a better approach for handling a wildcard route. However, user can still bring back the old behavior by supplying `:format => false` to the route. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| * | | | | Engines that use isolate_namespace with nested modules should set correct ↵Rolf Timmermans2011-03-282-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | module prefix for their routes.
| * | | | | let these heredocs flow with the codeXavier Noria2011-03-281-14/+15
| | | | | |
| * | | | | Make edge and dev options use edge mysql2Santiago Pastorino2011-03-271-6/+14
| |/ / / /
| * | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-272-2/+4
| |\ \ \ \
| | * | | | AR validations and callbacks guide: put update_attribute backXavier Noria2011-03-271-0/+2
| | | |_|/ | | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 14:16:54 +0000