aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5515 from rafaelfranca/remove-excludeJosé Valim2012-03-192-14/+29
|\ | | | | Remove exclude option from ActionDispatch::SSL and fix secure cookies
| * Fix secure cookies when there are more than one space before the secureRafael Mendonça França2012-03-192-1/+29
| | | | | | | | keyword
| * Remove exclude option from ActionDispatch::SSLRafael Mendonça França2012-03-192-13/+0
|/
* Merge pull request #5503 from jeyb/leap_day_time_date_time_selectorAndrew White2012-03-193-13/+27
|\ | | | | Fixes issue #5222: DateTimeSelector builds invalid dates on leap days
| * Fixes issue #5222: DateTimeSelector builds invalid dates on leap day when ↵Jey Balachandran2012-03-183-13/+27
| | | | | | | | discarding both day and month.
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-199-23/+122
|\ \
| * | -h also shows help options.Sandeep2012-03-191-1/+1
| | |
| * | respond_with description: changed 'response' to 'format'Mark Thomson2012-03-181-1/+1
| | |
| * | Revised comments for respond_withMark Thomson2012-03-181-17/+18
| | |
| * | Merge remote-tracking branch 'origin/master'Mark Thomson2012-03-177-3/+5
| |\ \
| | * | [getting started] Explain what the create action is accomplishing after ↵Ryan Bigg2012-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | params are output [ci skip]
| | * | [getting started] [ci skip] Explain in better terms what we are doing with ↵Ryan Bigg2012-03-171-1/+3
| | | | | | | | | | | | | | | | render and params[:post] inspection upon first use
| | * | [getting started] [ci skip] Just want to get post paramsRyan Bigg2012-03-171-1/+1
| | | |
| | * | [getting started] Add imagesRyan Bigg2012-03-176-0/+0
| | | |
| * | | Merge remote-tracking branch 'origin/master'Mark Thomson2012-03-17533-11025/+2734
| |\| |
| * | | Revised description for responds_withMark Thomson2012-03-171-19/+115
| | | |
* | | | Merge pull request #5507 from sandeepravi/warning_fixesXavier Noria2012-03-191-1/+1
|\ \ \ \ | | | | | | | | | | changed all.map to pluck
| * | | | changed all.map to pluckSandeep2012-03-191-1/+1
| | | | |
* | | | | Merge pull request #5508 from FND/tagged_logger_shortcutJosé Valim2012-03-192-2/+7
|\ \ \ \ \ | |/ / / / |/| | | | Provide access to logger instance within TaggedLogging blocks
| * | | | Provide access to logger instance within TaggedLogging blocksFND2012-03-192-2/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this improves encapsulation, simplifying occurrences like the following: Rails.logger.tagged("DEBUG") { Rails.logger.debug(msg) } ... by removing the need to rely on (i.e. repeat) outer variables: Rails.logger.tagged("DEBUG") { |logger| logger.debug(msg) }
* | | / Increase minimum version of mail.Mikel Lindsaar2012-03-191-1/+1
| |_|/ |/| | | | | | | | | | | Second security vulnerability found in mail file delivery method patched in version 2.4.4.
* | | Merge pull request #5492 from arunagw/build_fix_app_generator_testPiotr Sarnacki2012-03-181-1/+1
|\ \ \ | | | | | | | | Build fix for app_generator_test.rb
| * | | Build fix for app_generator_test.rbArun Agrawal2012-03-181-1/+1
| | | |
* | | | Merge pull request #3329 from armstrjare/autosave_collection_new_record_bugJosé Valim2012-03-182-1/+16
|\ \ \ \ | | | | | | | | | | Autosave association doesn't save all records on a new record for a collection association if there are records marked for destruction
| * | | | Fix bug with autosave collection association on new record with a marked for ↵Jared Armstrong2012-03-182-1/+16
| | | | | | | | | | | | | | | | | | | | destroy record in autosave collection.
* | | | | Merge pull request #5496 from atd/masterJosé Valim2012-03-182-2/+11
|\ \ \ \ \ | | | | | | | | | | | | time_tag support for blocks
| * | | | | time_tag support for blocksAntonio Tapiador del Dujo2012-03-182-2/+11
|/ / / / /
* | | | | Merge pull request #5486 from kennyj/fix_5435Aaron Patterson2012-03-172-0/+13
|\ \ \ \ \ | |_|/ / / |/| | | | Fix GH #5435. db:structure:dump should be re-enable.
| * | | | Fix GH #5435. db:structure:dump should be reenable.kennyj2012-03-172-0/+13
| | | | |
* | | | | Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform onlyPiotr Sarnacki2012-03-171-1/+1
| | | | |
* | | | | Merge pull request #5489 from rdavila/fix_typo_activerecord_testJosé Valim2012-03-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in ActiveRecord::Relation#blank? test
| * | | | | Fix typo in ActiveRecord::Relation#blank? testRuben Davila2012-03-171-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #5488 from rafaelfranca/ad-sslJosé Valim2012-03-1710-11/+226
|\ \ \ \ \ | |/ / / / |/| | | | Remove Rack::SSL in favour of ActionDispatch::SSL
| * | | | Update the guides and CHANGELOGRafael Mendonça França2012-03-173-4/+8
| | | | |
| * | | | Whitespaces :scissors:Rafael Mendonça França2012-03-171-1/+1
| | | | |
| * | | | Some refactoring and update ActionDispatch::SSL code to use the Rack 1.4.xRafael Mendonça França2012-03-172-37/+13
| | | | |
| * | | | Rack::SSL -> ActionDispatch::SSLRafael Mendonça França2012-03-176-6/+241
|/ / / /
* | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/getting_started.textile
| * | | | using pluckEgor Homakov2012-03-171-1/+1
| | | | |
| * | | | Moved squawk method into LocalInstanceMethods module, so it wouldMike Mulvaney2012-03-161-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not be added to every ActiveRecord::Base object. Changed acts_as_yaffle so it will include the LocalInstanceMethods module. Now only models that call acts_as_yaffle will get the squawk method, instead of pushing them into every ActiveRecord::Base.
| * | | | Changed unit tests so they refer to yaffle_test_field as symbol.Mike Mulvaney2012-03-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | acts_as_yaffle expects a symbol, so the string was causing the tests to always fail.
| * | | | Revert "Fix typo in AR Callbacks."Mark Larimer2012-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 55df1df937f096bbdae29f8af965f204f08943b8.
| * | | | 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
| | | | |