aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-171-1/+1
|\
| * Updates 'modyfing' typo to 'modifying'Jonathan R. Wallace2012-03-171-1/+1
* | Add missing requireSantiago Pastorino2012-03-171-0/+1
* | Remove unused requireSantiago Pastorino2012-03-171-1/+0
* | moves the guides up to the root directoryXavier Noria2012-03-17275-21/+21
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-176-453/+706
|\
| * using pluckEgor Homakov2012-03-171-1/+1
| * Moved squawk method into LocalInstanceMethods module, so it wouldMike Mulvaney2012-03-161-3/+6
| * Changed unit tests so they refer to yaffle_test_field as symbol.Mike Mulvaney2012-03-161-2/+2
| * Revert "Fix typo in AR Callbacks."Mark Larimer2012-03-161-1/+1
| * Add missing quotes on AS::Notifications examplesCarlos Antonio da Silva2012-03-151-12/+12
| * Fix typo in AR Callbacks.Waseem Ahmad2012-03-151-1/+1
| * [ci skip] Add examples of subscribing & creating ActiveSupport::Notificationsadman652012-03-151-1/+73
| * [ci skip] Add examples to instrumentation guideadman652012-03-151-42/+322
| * [getting started] [ci skip] Fix incongruant use of 'we' and 'you'. Expand upo...Ryan Bigg2012-03-141-4/+82
| * [getting started] Round out 'Laying down the ground work' sectionRyan Bigg2012-03-141-1/+62
| * [getting started] rename initial 'meat' section of guide to 'Laying down the ...Ryan Bigg2012-03-141-1/+1
| * [getting started] correct typo in welcome/index.html.erb template pathRyan Bigg2012-03-141-1/+1
| * [getting started] Improve explanation around initial controller generator usageRyan Bigg2012-03-141-1/+1
| * [getting started] remove indentation for get 'posts/new'Ryan Bigg2012-03-141-1/+1
| * [getting started] Reworking beginnings of the 'meat' of the guideRyan Bigg2012-03-141-44/+31
| * [getting started] Default root route in config/routes.rb is for a welcome con...Ryan Bigg2012-03-141-5/+5
| * [getting started] add warning that guide is being worked on (just for edge)Ryan Bigg2012-03-141-0/+2
| * [getting started] Link to Bundler website when explaining Gemfile[.lock]Ryan Bigg2012-03-141-1/+1
| * [getting started] Improve prose for initial routing sectionRyan Bigg2012-03-141-6/+5
| * [getting started] mention generators early on, when rails new is mentioned.Ryan Bigg2012-03-141-3/+4
| * [getting started] briefly explain what a controller and view areRyan Bigg2012-03-141-1/+8
| * [getting started] more line lengtheningRyan Bigg2012-03-141-63/+18
| * [getting started] fix lines that are too short.Ryan Bigg2012-03-141-5/+1
| * [getting started] update Rails version to 3.2.2Ryan Bigg2012-03-141-1/+1
| * [getting started] *THE* way to install Rails is by running +gem install+. You...Ryan Bigg2012-03-141-2/+1
| * [getting started] Remove super-early mention of REST from Getting Started guide.Ryan Bigg2012-03-141-148/+1
| * Move database configuration section from Getting Started Guide into Configura...Ryan Bigg2012-03-142-140/+93
| * Minor clarification in documentation language and spellingMatthew Daubert2012-03-131-4/+4
* | Merge pull request #5480 from drogus/rendering-issuesJosé Valim2012-03-178-0/+46
* | Merge pull request #5321 from pfeiffer/uniqueness_validator_conditionsJosé Valim2012-03-172-2/+30
|\ \
| * | Correct grammar in documentationMattias Pfeiffer2012-03-071-1/+1
| * | Change syntax to accept an AR::Relation instead of old conditions hash/array.Mattias Pfeiffer2012-03-072-4/+10
| * | Add :conditions option to uniqueness validatorMattias Pfeiffer2012-03-072-2/+24
* | | Merge pull request #5487 from kennyj/should_use_argumentJosé Valim2012-03-171-1/+1
|\ \ \
| * | | Should use an argument in http_digest_authentication_test.rbkennyj2012-03-171-1/+1
|/ / /
* | | Merge pull request #5470 from sandeepravi/warning_fixesJosé Valim2012-03-171-0/+5
|\ \ \
| * | | fixed - warning: instance variable @controller not initializedSandeep2012-03-161-0/+5
* | | | Merge pull request #5483 from luke-gru/gemfile_changeJosé Valim2012-03-171-1/+1
|\ \ \ \
| * | | | switch rack-test in Gemfile to using git protocolLuke Gruber2012-03-161-1/+1
* | | | | Merge pull request #5484 from luke-gru/consistent_module_namingXavier Noria2012-03-163-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | use consistent explicit module inclusionLuke Gruber2012-03-163-6/+6
|/ / / /
* | | | Merge pull request #5475 from rafaelfranca/fix-buildPiotr Sarnacki2012-03-161-12/+15
|\ \ \ \
| * | | | Fix ActiveRecord::Relation#blank? testsRafael Mendonça França2012-03-161-12/+15
|/ / / /
* | | | use empty? on the hash to avoid another method callAaron Patterson2012-03-161-1/+1