Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
This comparison is big! We’re only showing the most recent 250 commits
Commits on Jul 06, 2011
@fxn fxn Merge pull request #1983 from vijaydev/cherrypicks-validator-gem
Cherrypick for 3-1-stable - adding w3c_validators gem
@spastorino spastorino Merge pull request #1895 from arunagw/fix_test_for_jruby_db-3-1-stable
Fix test for jruby db 3 1 stable
@spastorino spastorino Merge pull request #1982 from spohlenz/backport-1778
Backport of #1778 (fix nested fields_for when Hash-based model is passed)
@oriolgual oriolgual Fix reverse order with new Arel Nodes (#1571) 7c6a840
@spastorino spastorino Merge pull request #1904 from oriolgual/1571_fix_for_3_1_stable
Fix #1571 for 3-1-stable
@spastorino spastorino Merge pull request #1789 from grantneufeld/schema_column_exists_optio…

Fix default options argument on ActiveRecord::ConnectionAdaptors::Table#column_exists?
@josevalim josevalim Deprecate stream at the class level.
This is because only template rendering works with streaming.
Setting it at the class level was also changing the behavior
of JSON and XML responses, closes #1337.
@simonbaird simonbaird Fix charset/collate in mysql recreate_database
See new method mysql_creation_options. It is used by both
create_database and recreate_database so they are consistent.

(Manual cherry pick of 3ba3125)
Commits on Jul 07, 2011
@jonleighton jonleighton Don't construct association scope in initializer. This yields a big p…
…erformance gain for cases where the association is never used to load the target, for example with preloading. Related: #1873.
@josevalim josevalim Make compressors lazily load. d8e2a1f
@josevalim josevalim Give higher priority to assets.cache_store. 8d0f039
@spastorino spastorino Merge pull request #1990 from simonbaird/3-1-stable
rake db:test:purge creates mysql database with wrong charset & collation (3-1-stable)
@dmitriy-kiriyenko dmitriy-kiriyenko Add require ActiveSupport delegation to ActiveRecord::Relation class. fd8dbfa
@tobsch tobsch Now accepting css/js files in deeper directory structures by default.
This is useful for engines with own application.{js|css}-files.
See: #1520
@kknapik kknapik Make `ActiveRecord::Batches#find_each` to not return `self`.
This caused that `find_each` was producing extra db call taking all the records from db, and was less efficient than `ActiveRecord::Base#all`.
@spastorino spastorino Merge pull request #2001 from tobsch/3-1-stable
Now accepting css/js files in deeper directory structures by default.
@spastorino spastorino Merge pull request #2002 from knapo/3-1-stable
Backport of #1997
@josevalim josevalim Move config.default_asset_host_protocol to the railtie. 9370855
Commits on Jul 08, 2011
@jonleighton jonleighton Ensure that the foreign key gets set when doing record.create_associa…
…tion or record.create_association. Fixes #1960.
Tomas D'Stefano Destroy association habtm record before destroying the record itself.…
… Fixes issue #402.
@fxn fxn backports f6a6b51 and ad912c0 7cef8ad
Commits on Jul 09, 2011
@spastorino spastorino config should always be an AS::InheritableOptions object. Closes #1992 2aefff8
@bensie bensie Remove attachment_fu, add CarrierWave to suggested uploader libraries bd13a68
@judearasu judearasu rails text been added before version 4f36daf
@shawndrost shawndrost document HashWithIndifferentAccess#extractable_options? a9f4d7b
@amatsuda amatsuda find(:first) => first 3cb67e4
Oge Nnadi Changed the value that log_level takes to match the examples in the p…
…aragraph above
@vijaydev vijaydev update Rails version. (rails console didn't exist in 2.1) 6dad5b2
@christopherscott christopherscott Updated active_record_querying.textile: intro paragraph of 'Condition…
…s' to change 'find method' to 'where method'
@radar radar Clarify that per-controller asset files are not 'magically' loaded by…
… the controller, but rather need to be required
@radar radar Add section about debugging assets 7a8b0ec
@jonleighton jonleighton Foo.joins(:bar).includes(:bar) should result in a single query with :…
…bar as a join. Related: #1873.
@amatsuda amatsuda fix AR having() not to raise NoMethodError when the given argument do…
…es not respond to empty?

having raises NoMethodError: undefined method `empty?' when a Fixnum or Date/Time were passed via varargs
@amatsuda amatsuda formats 8a4fdbb
@spastorino spastorino Merge pull request #2022 from amatsuda/having_vargs_nomethoderror_fix…

having() raises NoMethodError (3-1-stable)
@spastorino spastorino to_key on a destroyed model should return nil a7319a9
Commits on Jul 10, 2011
@spohlenz spohlenz Include TagHelper within AssetTagHelper e249dd9
@josevalim josevalim Make Rails.groups accept arrays. 4c76991
Commits on Jul 11, 2011
@josevalim josevalim Require assets in all environments by default and provide a way to op…
…t-out from uglifier.
@dziulius dziulius #many? uses count instead of select - a bit faster a239973
@josh josh Float sprockets again a9980d1
@marcandre marcandre Generate valid default fixtures for models with a type column
Signed-off-by: Santiago Pastorino <>
@josh josh Ensure Dir.glob is sorted 15438c4
@jonleighton jonleighton Fix exception if old and new targets are both nil. Fixes #1471.

Commits on Jul 12, 2011
@jhtwong jhtwong Fixed session ID fixation for ActiveRecord::SessionStore
I have found that Rails will take an invalid session ID specified by the
client and materialize a session based on that session ID. This means
that it is possible, among other things, for a client to use an
arbitrarily weak session ID or for a client to resurrect a previous used
session ID. In other words, we cannot guarantee that all session IDs are
generated by the server and that they are (statistically) unique through

The fix is to always generate a new session ID in #get_session if an
existing session cannot be found under the incoming session ID.

Also added new tests that make sure that an invalid session ID is never
materialized into a new session, regardless of whether it comes in via a
cookie or a URL parameter (when :cookie_only => false).
@jhtwong jhtwong Fix for SqlBypass session store
Two issues fixed:
1) connection_pool is not defined - needed by SessionStore#drop_table!
and create_table! since c94651f

2) initialization of connection to the default of AR::Base.connection
only occurred at the singleton level - the instance level method defined
by cattr_accessor did not have this logic
@spastorino spastorino Merge pull request #2039 from SAP-Oxygen/3-1-stable-session-id-patch-…

Fix for session ID fixation issue in ActiveRecord::SessionStore (squashed commits)
@spastorino spastorino Merge pull request #2040 from SAP-Oxygen/3-1-stable-sqlbypass-patch
Fix for SqlBypass session store
Commits on Jul 13, 2011
@josevalim josevalim assets.cache_store now defaults to filesystem. You will want to share…
… tmp/assets_cache between deploys.
@josevalim josevalim Use cache/assets instead. 675c20e
Commits on Jul 14, 2011
@spastorino spastorino Bump rack up 0820283
@bfolkens bfolkens write_cookies! in ActionDispatch::TestRequest won't write nil value w…
…hen == 'u' on 1.8.7
@spastorino spastorino Merge pull request #2071 from bfolkens/3-1-stable
write_cookies! nil exception in ActionDispatch::TestRequest
@spastorino spastorino Fix indentation 9441c94
Commits on Jul 15, 2011
Jonathan Lozinski Fixed engine gemspec so that app, config, and db are packaged up 4662b99
@spastorino spastorino Merge pull request #2092 from loz/3-1-stable
Fixed engine gemspec so that app, config, and db are packaged up
Commits on Jul 16, 2011
@elight elight Closes #2065
Cache key was incorrectly using timezone-dependent record#updated_at when it should be using a timezone-independent value to generate the cache key
@htanata htanata Fix wildcard route code example in changelog. 357e7bb
@tenderlove tenderlove Merge pull request #2099 from htanata/backport_2090_to_3-1-stable
Backport #2090 to 3-1-stable
@spastorino spastorino Fix the output a bit 3fb7017
@spastorino spastorino Merge pull request #2065 from elight/3-1-stable
Backport of cache_key fix from master
@jonleighton jonleighton Deprecated the AssociationCollection constant fb95dee
Jonathan Lozinski Added gem helper tasks to Rakefile for engine plugins. It makes sense…
… for this to be there given they're being generated to be gemified.

Altered addition to Rakefile so that it won't add GemHelper if the user specified --skip-gemspec
@spastorino spastorino Merge pull request #2103 from loz/3-1-stable
Added gem helper tasks to Rakefile for engine plugins.
@fxn fxn synchronizes assets.rake with master b6675d8
Commits on Jul 17, 2011
@arunagw arunagw Adding tests for gemspec file creation e35d520
@arunagw arunagw More changes for plugin_new_generator. 777fcc5
@arunagw arunagw Not creating script/rails in full mode. from master. 09f5780
@sikachu sikachu Fix a wrong assertion on url_helper_test, and refactor `html_safe` te…
…st to be in its method
@spastorino spastorino Merge pull request #2048 from sikachu/3-1-stable-test_fix
Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a
@jonleighton jonleighton Don't do remove_possible_method when delegate is used. Two reasons: 1…
…) warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937.
@sikachu sikachu Show a deprecation warning if user passing less number of argument in…
… the dynamic finder

The previous behavior was unintentional, and some people was relying on it. In the next version of Rails, the dynamic finder will always expecting the number of arguments to be equal or greater (so you can still pass the options to it.) It will raise the ArgumentError otherwise.
Commits on Jul 18, 2011
@sikachu sikachu Refactor test case to use anonymous class - Thank you @tenderlove fa7dd34
@tenderlove tenderlove make tzinfo a development dependency 1b97f6c
@jonleighton jonleighton Merge pull request #2129 from sikachu/3-1-stable-dynamic_finder
Show a deprecation warning if user passing less number of argument in the
@jonleighton jonleighton Add autoload declaration for deprecated AssociationCollection 312ee12
@josevalim josevalim Merge pull request #2121 from arunagw/3-1-plugin_new_gen_test
3 1 plugin new gen test
@jstorimer jstorimer Ensure that status codes are logged properly
Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue
so that status codes rendered from rescue_from blocks are logged
@spastorino spastorino Merge pull request #2135 from jstorimer/ensure-status-codes-are-logge…

Ensure status codes are logged properly (3-1-stable)
@mcmire mcmire ActiveRecord: Fix eager loading so that giving a blank order clause g…
…enerates valid SQL
@joshk joshk This fixes an issue when bundling to a local path (eg. /vendor/bundle).
If you bundle to a local path bundler is not included in it, so
calling "gem 'bundler'" will fail.


@joshk joshk Added a .travis.yml config and travis specific ci script.
Don't install ruby-debug if running the test suite on Travis,
linecache19 is the main offender, very very slow.

And do not install pg if Travis is bundling the gems, pg will be setup
on Travis soon.
Commits on Jul 19, 2011
@spastorino spastorino Merge pull request #2140 from mcmire/issue_2078_3-1-stable
Fix for #2078 (against 3-1-stable)
@norman norman Explicitly require Active Support dependencies
This fixes errors when using Active Record outside of Rails. In Rails,
these files are required by other classes that are always loaded, so
this error does not happen.

Without core_ext/module/delegation, a NoMethodError is raised because
`delegate` remains undefined.

Without core_ext/class/attribute_acessors, an ArgumentError is raised because
`delegate` does not receive a value for its :to option.
@spastorino spastorino Merge pull request #2147 from norman/3-1-stable
Explicitly require Active Support dependencies (3-1-stable)
@vijaydev vijaydev add entry for submit helper change removing object_name_id 4792b88
@vijaydev vijaydev avoid Symbol#to_proc f78a4e8
@fxn fxn Merge pull request #2157 from vijaydev/3-1-stable
Avoid Symbol#to_proc (3-1-stable)
@spastorino spastorino Merge pull request #2156 from vijaydev/changelogs31
Adding changelog entry for submit helper change (3-1-stable)
Commits on Jul 20, 2011
@judearasu judearasu notextile tag has been placed with ascii quotes db20780
@joshk joshk this fixes a brittle test in fixtures_test.rb which fails when you ar…
…e in a timezone which is ahead of UTC but UTC is in the previous day still.
@tenderlove tenderlove bigdecimal should be typecast to a float on sqlite3. fixes #2162 56fb7fc
@franckverrot franckverrot assign_nested_attributes_for_collection_association should work with …
…Ruby 1.9 [Closes #2106]

Children attributes can be either String's or Symbol's, so let's check if the object responds to to_i.
@tenderlove tenderlove no need to sort the values 9a6b96a
Commits on Jul 21, 2011
@arunagw arunagw This conditions is required to work with database create task. 1.9.2 …
…is having a bug with "Calling return within begin still executes else".
@tenderlove tenderlove removing inline source option from rdoc task. fixes #2169 b146477
@tenderlove tenderlove use rake tasks to set the default environment variables. fixes #2126 787f1f3
Commits on Jul 22, 2011
Jonathan Lozinski Added missing runner to engine rake to ensure that engine can run the…
… app rake tasks (as per master)
@spastorino spastorino Merge pull request #2186 from loz/3-1-stable
Fixed engine rake tasks
@tenderlove tenderlove forgot to add this test case 6f917ad
Commits on Jul 23, 2011
@hmcfletch hmcfletch fix after_initialize edge case (close #2074 and close #2175)
fix behavior when after_initialize is defined and a block is passed to Base.create
@cldwalker cldwalker simplify and be more explicit about create and after_initialize tests 06c6252
@exviva exviva Documentation fixes for rendering partials 6a4d54b
@vijaydev vijaydev use simpler words in docs ed611fc
@rhulse rhulse [asset pipeline] more updates to docs 43e6910
@shime shime fixed paths, more consistent helpers and paths examples ef0b1e7
@mjankowski mjankowski grammar/tense correction to rails application doc 3b5679f
@mjankowski mjankowski misc grammar and clarity changes for rails/engine docs 79df11b
@mjankowski mjankowski grammar correction for rails/paths #add method arguments 170bc98
@aslamnd aslamnd Replaced appropriate word. 2fdb88e
@rhulse rhulse [asset pipeline] add capistrano task
Task still needs to symlink default rails default
filestore location, but code may still be settling
@amatsuda amatsuda documentation fix: wrong result 48a013d
@dyba dyba Modified Migrations file cf122fc
@joeellis joeellis Minor grammar mistake 8e0f49e
@rhulse rhulse [asset pipeline] Added information about data uri helper
See Sprockets issue 111
and Sprockets commit cd38a1670a
@htanata htanata Fix wildcard route code examples.
Should be "match" instead of "map".
@vijaydev vijaydev Revert "Fix wildcard route code examples."
This reverts commit 0894d73.

Reason: CHANGELOGs should not be changed in docrails.
@vatrai vatrai Should be "match" instead of "map" de2cc31
@jwarwick jwarwick Fixing typo in plugins.textile 06636c5
@rhulse rhulse [asset pipeline] Add section on sendfile option
This option has caught a few people out, so it
is a good idea to include an explanation and
a Gotcha.

See Rails bug 1822
See 1822 comment 1585926 for resolution
@rhulse rhulse [asset pipeline] A few corrections and some new material
Add notes about capistrano task being added to that project
and correction to information about precompilation.
@sumbach sumbach Fix typo dc58a7b
@sumbach sumbach Switch Tilt link to Textile format c2c7f65
@raybaxter raybaxter use 'hour' instead of 'minutes' and 'second' for select_hour 044aa0a
@raybaxter raybaxter show correct helper in description 2f5a15e
@raybaxter raybaxter use minute instead of second in description of select_minute 5c7cb8a
@raybaxter raybaxter clarify that DateTime objects are allowed arguments
to distance_of_time_in_words
@raybaxter raybaxter clarify that classes that include DateHelper can
also manipulate times
@raybaxter raybaxter disambiguate uses of post/POST by using "article"
for the related variable passed to  date_select,
time_select and datetime_select
@raybaxter raybaxter remove stray character 8ff3ebf
@raybaxter raybaxter there is no method, use 28237d6
@raybaxter raybaxter document that second tags are also returned by default e6caf3c
@raybaxter raybaxter make documentation agree with test expectations and

See: test_select_date_with_incomplete_order in
@raybaxter raybaxter fix typo e4ab021
@raybaxter raybaxter wording between select_second, select_minute and
select_hour should be consistent and correct
@raybaxter raybaxter we're talking about days here, not hours a957300
@rhulse rhulse [configuring] add doc for missing assets attribute
.compress turns on the compression using the types
specified in other config options
@rhulse rhulse [asset pipeline] Correct CSS section and include Gem details
Also added note about compress option, which was
not mentioned anywhere and is required
@raybaxter raybaxter use correct in description 38efb95
@raybaxter raybaxter document options to search_field c7be43a
@raybaxter raybaxter examples for telephone_field, url_field and email_field b9ac90d
@raybaxter raybaxter Add seach, tel, url and email inputs as 'Other Helpers of Interest' 9f888b0
@rhulse rhulse [asset pipeline] update capistrano task code
This code actually works.
@radar radar Complete another review of asset pipeline guide 28ff4e5
@vijaydev vijaydev Revert "notextile tag has been placed with ascii quotes"
This reverts commit 3e6052a.

Reason: Code changes are not allowed in docrails (even if they are related to guides generation)
@emachnic emachnic Capitalization compliance for asset_pipeline doc 26476d9
@vijaydev vijaydev some corrections in assets pipeline guide 5bafead
@vijaydev vijaydev minor corrections in form helpers guide and api docs cc505e1
@vijaydev vijaydev reword select_date's behaviour clearly when an incomplete options arr…
…ay is passed
@vijaydev vijaydev Fixing the incorrect change made in bae54c5 8392b78
@vijaydev vijaydev spacing fix 63efe07
@emachnic emachnic image_url documentation in asset_pipelin doc 5632541
@emachnic emachnic Fixed asset_url in asset_pipeline doc 6e09ea9
@threedaymonk threedaymonk Update form helper documentation to match code.
Change d3cfee1 removed the automatically generated object_name_submit id attributes on form submit elements. This makes the documentation match.
@sepastian sepastian Documentation fix: adding missing equal sign in code sample for Activ…
@raybaxter raybaxter use the doc conventions for arguments in all cases 94a8e35
@bratish bratish Download and installation, License and Support sections added for act…
@biow0lf biow0lf Fix typo 3290b6a
@vatrai vatrai fixed type daeff45
@judearasu judearasu typo change cdb44c3
@judearasu judearasu grammatical changes 9747758
@vatrai vatrai alias added for rails runner guide 20f1f6c
@vatrai vatrai alias added for rails generate guide a6daf4c
@judearasu judearasu grammatical changes 4a84461
@vijaydev vijaydev minor corrections in caching guide ba4fe8f
@vijaydev vijaydev corrected sentences to make them consistent in command line guide a7027db
@vijaydev vijaydev document the change in edge rails which makes a more strict check on …
…the arity of the dynamic finders
@vijaydev vijaydev minor refactor in the template guide ed90144
@fxn fxn adds a couple of missing magic comments [fixes #1374] 50203b3
@fxn fxn checked all .rb files in the project tree for missing magic comments,…
… one was missing

Came with this one-liner for this:

    find . -name '*.rb' | \
    xargs chardet | \
    grep -v ascii | \
    cut -d: -f1 -s | \
    xargs -n1 ruby -0777 -ne 'puts $FILENAME if $_ !~ /#.*coding:\s*utf/i'

Welcome $_.
@arunagw arunagw Backporting from master fixes #713 e414d4f
@vatrai vatrai remove ruby-prof for rubinius in Gemfile cherry-pick 52ec151
@spastorino spastorino Merge pull request #2203 from arunagw/3-1-stable
3 1 stable fixes #713
@spastorino spastorino Merge pull request #2204 from castlerock/3-1-stable
Backport from 3-0-stable for 3-1-stable
@spastorino spastorino Merge pull request #2172 from arunagw/database-rake-1.9.2_3-1-stable
Database rake 1.9.2 3 1 stable
Sam Umbach, Zachary Porter and Michael Pell Add failing test: ActiveSupport::Cache::FileStore#file_path_key does …
…not work if initialized with Pathname
@grzuy grzuy Fix ActiveSupport::Cache::FileStore#file_path_key does not work if in…
…itialized with Pathname
@spastorino spastorino Merge pull request #2213 from grzuy/3-1-stable
ActiveSupport::Cache::FileStore#file_path_key does not work if initialized with Pathname
@tenderlove tenderlove remove unused gems from Gemfile b2285ba
@kommen kommen Fix fragment cache helper regression on cache miss introduced with 03…

Contains following patches cherry-picked from @lhahne's 3-0-stable branch:

* Added tests for the output_buffer returned by CacheHelper (c476a6b)
The output_buffer returned by CacheHelper should be html_safe if the original buffer is html_safe.

* made sure that the possible new output_buffer created by CacheHelper is of the same type as the original (39a4f67)
@spastorino spastorino Merge pull request #2219 from kommen/fix_fragment_caching_squashed
Fix fragment caching (squashed commits)
@spastorino spastorino Remove jquery-rails from Gemfile ae65c0b
@spastorino spastorino Merge pull request #2194 from cldwalker/after_initialize
Fix after_initialize and Base.create edge case
@gramos gramos - added test case for issue:
  Namespaced model partial_path is wrong in namespaced controllers
@spastorino spastorino Revert "Merge pull request #2194 from cldwalker/after_initialize"
This reverts commit 1983007, reversing
changes made to ae65c0b.
Commits on Jul 24, 2011
@dmathieu dmathieu rake assets:precompile should always perform caching - Closes #2199 038e493
@tenderlove tenderlove simplify singleton_class? method be48abb
@gramos gramos - added ActionView::PartialRenderer#merge_path_into_partial(path, par…

  fix issues/1951
@Empact Empact Simple fix to the NoMethodError noted in #2177.
Unfortunately #respond_to?(:controller) won't work as suggested, nor will respond_to?(:params), as #controller is present and #params is delegated to #controller. #delegate makes respond_to? return true regardless whether the target responds to it.
@tenderlove tenderlove Merge pull request #2229 from gramos/fix-issue-1951
Fix issue 1951 Namespaced model partial_path is wrong in namespaced controllers
@tenderlove tenderlove just use normal ruby for stubbing 5b88219
@rdoddaka rdoddaka Improve rails:template undefined LOCATION variable error message fixed fb6a76c
@spastorino spastorino Merge pull request #2235 from arunagw/location_var_fix_cherry-pick
Location var fix cherry pick from master to 3-1-stable
@gnagno gnagno now the documentation reflects the actual returned value for a missin…
…g translation
@joefiorini joefiorini Tests now require MySQL2 adapter in order to run 9a16cc0
@evanfarrar evanfarrar Replaced ‘ with ' in the guides. 505a43b
@evanfarrar evanfarrar Changed several instances of British English to be American English e593f8c
@carols10cents carols10cents Changing Textile emphasis underscores to em tags; the link with under…
…scores that follows is causing the emphasis underscores to be parsed incorrectly.

This appears to be a bug with RedCloth; parsing with official Textile creates the HTML that I expect. I have filed ticket # 226 on RedCloth's lighthouse project and I will attempt to fix the problem with RedCloth.

This commit is a workaround for the RedCloth bug that will give this guide the right formatting.
@oem oem Changed a few instances of of words in the API docs written in Britis…
…h English to

American English(according to Weber)


@oem oem Missed a few instances of British English spelling in the last commit
oh and obviously I meant according to Webster, not Weber
@fxn fxn Revert "Tests now require MySQL2 adapter in order to run"
Reason: Setting up MySQL and Postgres needs installing servers
and libraries that perhaps you don't need in your machine. We
think fixing a bug in Active Support without running the suite
of Active Record for all possible drivers is OK. That's why
we explain first --without db, and after that we cover AR
specifically. mysql2 is no different than mysql or pg in that

This reverts commit 50d5e0f.
@mikehoward mikehoward Changed wording of paragraph 2.1.1 Models to clarify table/model

changed wording 'one table ... corresponds to one model' to 'each table
@mikehoward mikehoward Clarified notes in 3.2 Creating the Blog Application
Changed descriptino of Gemfile to add reference to Bundler
Changed description of README to add 'You should edit ...'
Changed description of Rakefile to reflect dynamic nature of Rakefile
and point to app/lib/tasks/ as the place to add app-specific rake tasks.
@jasonnoble jasonnoble Added some context for rack apps, linked to the Rails on Rack guide. fa0751a
Ken Ip Update "Getting Started" for Rails 3.1
Add additional files generated by rails 3.1 generator.
@jasonnoble jasonnoble Added explanation to Components of Rails to help users not get hung u…
…p on details
@jasonnoble jasonnoble Added link to the RubyGems User's Guide 2d689d5
@jasonnoble jasonnoble Update guide to be based on Rails 3.1. 75f0298
@jasonnoble jasonnoble Modified the content based on vijaydev's comment 27f4d73
@jasonnoble jasonnoble Add link to the Layouts and Rendering guide to explain more on view t…
@jasonnoble jasonnoble Moved ActionController, ActionView and ActionDispatch sections under …
@fxn fxn little details seen while reviewing eea9ca8
@pixeltrix pixeltrix Use top level Rails constant 4b1b9ac
Commits on Jul 25, 2011
@dchelimsky dchelimsky Paramify param values in controller tests. 7fd726d
@josevalim josevalim Merge pull request #2253 from dchelimsky/stringify-parameter-values-i…

Stringify parameter values in tests branched off 3-1-stable
@thedarkone thedarkone Make polymorphic_url calls go through application helpers again.
This brings back the ability to overwrite/extend url generating methods in application heleprs.
@josevalim josevalim Merge pull request #2256 from thedarkone/polymorphic-url-helper-3-1
Backport #2252 into 3-1-stable
@thedarkone thedarkone Bring back the ability to provide :order for update_all. 787194e
@spastorino spastorino Merge pull request #2257 from thedarkone/udpate-all-order-3-1
Backport #2251 into 3-1-stable
@davidtrogers davidtrogers Ensure the constraints block is only applied to the correct route
addresses issue #1907 - any routes that follow a route with a constraints
  block are inheriting the previous route's constraints.
@spastorino spastorino Merge pull request #2260 from davidtrogers/3-1-stable
3 1 stable
@sferik sferik Allow a route to have :format => true
When format is true, it is mandatory (as opposed to :format => false).
This is currently not possible with resource routes, which automatically
make format optional by default.
@sferik sferik Add documentation for :format => true 78d151d
@josevalim josevalim Merge pull request #2263 from sferik/format_true
Allow a route to have :format => true
@bmarini bmarini Fix example code for #validates_with instance method d4832f1
@vrish88 vrish88 Provide consistant indentation for the example code 3cbf9a6
@jasonnoble jasonnoble Wrapped text content to 120 chars 5d7343f
@vrish88 vrish88 Rewrite apart of the REST section to be in the present tense

@jasonnoble jasonnoble Reformatted to 80 chars. be584c4
@jasonnoble jasonnoble Add a note about the fact that the Windows prompt will look different…
… than the linux/osx prompt
@jasonnoble jasonnoble Fix TIP formatting issue 290849c
John Fixed Typo 12faf80
@jasonnoble jasonnoble Remove "bundle install" section, as rails new ______ runs bundle inst…
…all for you
@jasonnoble jasonnoble Update wording of TIP about --database option for rails new b2fc1e8
@jasonnoble jasonnoble Updated rails_welcome.png to latest Rails welcome page. e737b76
@jasonnoble jasonnoble Make the rails not found tip more explanatory. 9e34a41
@mikehoward mikehoward Updated migrations.textile to clarify Using Models in Your Migrations
Rewrote entire section including example code, error message, and work
@vrish88 vrish88 Update the TIP formatter to handle multiline tips
- includes 3 tests
@jasonnoble jasonnoble Extend description of rails generate scaffold and what it's options a…
@jasonnoble jasonnoble Fix two spaces after end of sentence. 4eb030e
@jasonnoble jasonnoble Add in a tip about opening two command prompt windows d4e8479
@mcmire mcmire Improve ch. 1 of the Form Helpers guide b3c06a2
@vijaydev vijaydev Revert "Update the TIP formatter to handle multiline tips"
This reverts commit e3dbe66.

Reason: Code changes are not allowed in docrails.
@vijaydev vijaydev Revert "Add in a tip about opening two command prompt windows"
This reverts commit 1e5fa59.

Reason: It's somewhat a grey area. We don't really want to tell the
users how they want to use the terminal.
@fxn fxn let TIP and friends handle a multiline paragraph
Normally I would have done this in master, but there was already
a guide with wrapped content, so worked here. I am going to
cross-merge now.
@spastorino spastorino Don't use Rack::Sendfile middleware if x_sendfile_header is not present e10dd20
@spastorino spastorino Remove unused use_sprockets config 0018402
@tenderlove tenderlove updating sprockets to beta 12 64cb34d
@tenderlove tenderlove bumping up arel version 6dcdcdc
@tenderlove tenderlove bumping to rc5 a518833