Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | match rails console environment support, to server | schneems | 2012-03-22 | 2 | -0/+32 |
| | | | | rails server takes `-e` as an argument to specify RAILS_ENV, rails console currently does not have the same interface. This commit fixes this disparity so developers can manually specify `RAILS_ENV` or can pass in an environment with a `-e`. | ||||
* | fix rails server support of RAILS_ENV variable | schneems | 2012-03-20 | 2 | -0/+31 |
| | | | | | | | When launching rails server from the command line with a rails environment specified such as `rails server RAILS_ENV=production` an error would occur since rails will try to use `RAILS_ENV=production` as it's server. When launching rails with a specified server such as thin `rails server thin RAILS_ENV=production` no error will be thrown, but rails will not start up in the specified environment. This fixes both of those cases | ||||
* | We dont need to merge in the parameters as thats all being reset by the rack ↵ | David Heinemeier Hansson | 2012-03-20 | 1 | -1/+0 |
| | | | | headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing) | ||||
* | probably should require the objects we monkey patch. | Aaron Patterson | 2012-03-20 | 1 | -0/+1 |
| | |||||
* | search private and protected methods for convert_key | Aaron Patterson | 2012-03-20 | 2 | -3/+3 |
| | |||||
* | bigdecimal can be duped on Ruby 2.0 | Aaron Patterson | 2012-03-20 | 2 | -2/+22 |
| | |||||
* | guides location has changed [ci skip] | Vijay Dev | 2012-03-20 | 1 | -1/+1 |
| | |||||
* | Merge pull request #5524 from kennyj/add_missing_require | Xavier Noria | 2012-03-20 | 1 | -0/+1 |
|\ | | | | | Add missing require | ||||
| * | Add missing require | kennyj | 2012-03-20 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #5515 from rafaelfranca/remove-exclude | José Valim | 2012-03-19 | 2 | -14/+29 |
|\ | | | | | Remove exclude option from ActionDispatch::SSL and fix secure cookies | ||||
| * | Fix secure cookies when there are more than one space before the secure | Rafael Mendonça França | 2012-03-19 | 2 | -1/+29 |
| | | | | | | | | keyword | ||||
| * | Remove exclude option from ActionDispatch::SSL | Rafael Mendonça França | 2012-03-19 | 2 | -13/+0 |
|/ | |||||
* | Merge pull request #5503 from jeyb/leap_day_time_date_time_selector | Andrew White | 2012-03-19 | 3 | -13/+27 |
|\ | | | | | Fixes issue #5222: DateTimeSelector builds invalid dates on leap days | ||||
| * | Fixes issue #5222: DateTimeSelector builds invalid dates on leap day when ↵ | Jey Balachandran | 2012-03-18 | 3 | -13/+27 |
| | | | | | | | | discarding both day and month. | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-19 | 9 | -23/+122 |
|\ \ | |||||
| * | | -h also shows help options. | Sandeep | 2012-03-19 | 1 | -1/+1 |
| | | | |||||
| * | | respond_with description: changed 'response' to 'format' | Mark Thomson | 2012-03-18 | 1 | -1/+1 |
| | | | |||||
| * | | Revised comments for respond_with | Mark Thomson | 2012-03-18 | 1 | -17/+18 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' | Mark Thomson | 2012-03-17 | 7 | -3/+5 |
| |\ \ | |||||
| | * | | [getting started] Explain what the create action is accomplishing after ↵ | Ryan Bigg | 2012-03-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | params are output [ci skip] | ||||
| | * | | [getting started] [ci skip] Explain in better terms what we are doing with ↵ | Ryan Bigg | 2012-03-17 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | render and params[:post] inspection upon first use | ||||
| | * | | [getting started] [ci skip] Just want to get post params | Ryan Bigg | 2012-03-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | [getting started] Add images | Ryan Bigg | 2012-03-17 | 6 | -0/+0 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' | Mark Thomson | 2012-03-17 | 533 | -11025/+2734 |
| |\| | | |||||
| * | | | Revised description for responds_with | Mark Thomson | 2012-03-17 | 1 | -19/+115 |
| | | | | |||||
* | | | | Merge pull request #5507 from sandeepravi/warning_fixes | Xavier Noria | 2012-03-19 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | changed all.map to pluck | ||||
| * | | | | changed all.map to pluck | Sandeep | 2012-03-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #5508 from FND/tagged_logger_shortcut | José Valim | 2012-03-19 | 2 | -2/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | Provide access to logger instance within TaggedLogging blocks | ||||
| * | | | | Provide access to logger instance within TaggedLogging blocks | FND | 2012-03-19 | 2 | -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 Lindsaar | 2012-03-19 | 1 | -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_test | Piotr Sarnacki | 2012-03-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Build fix for app_generator_test.rb | ||||
| * | | | Build fix for app_generator_test.rb | Arun Agrawal | 2012-03-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3329 from armstrjare/autosave_collection_new_record_bug | José Valim | 2012-03-18 | 2 | -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 Armstrong | 2012-03-18 | 2 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | destroy record in autosave collection. | ||||
* | | | | | Merge pull request #5496 from atd/master | José Valim | 2012-03-18 | 2 | -2/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | time_tag support for blocks | ||||
| * | | | | | time_tag support for blocks | Antonio Tapiador del Dujo | 2012-03-18 | 2 | -2/+11 |
|/ / / / / | |||||
* | | | | | Merge pull request #5486 from kennyj/fix_5435 | Aaron Patterson | 2012-03-17 | 2 | -0/+13 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix GH #5435. db:structure:dump should be re-enable. | ||||
| * | | | | Fix GH #5435. db:structure:dump should be reenable. | kennyj | 2012-03-17 | 2 | -0/+13 |
| | | | | | |||||
* | | | | | Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform only | Piotr Sarnacki | 2012-03-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #5489 from rdavila/fix_typo_activerecord_test | José Valim | 2012-03-17 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix typo in ActiveRecord::Relation#blank? test | ||||
| * | | | | | Fix typo in ActiveRecord::Relation#blank? test | Ruben Davila | 2012-03-17 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #5488 from rafaelfranca/ad-ssl | José Valim | 2012-03-17 | 10 | -11/+226 |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove Rack::SSL in favour of ActionDispatch::SSL | ||||
| * | | | | Update the guides and CHANGELOG | Rafael Mendonça França | 2012-03-17 | 3 | -4/+8 |
| | | | | | |||||
| * | | | | Whitespaces :scissors: | Rafael Mendonça França | 2012-03-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Some refactoring and update ActionDispatch::SSL code to use the Rack 1.4.x | Rafael Mendonça França | 2012-03-17 | 2 | -37/+13 |
| | | | | | |||||
| * | | | | Rack::SSL -> ActionDispatch::SSL | Rafael Mendonça França | 2012-03-17 | 6 | -6/+241 |
|/ / / / | |||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-17 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Updates 'modyfing' typo to 'modifying' | Jonathan R. Wallace | 2012-03-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add missing require | Santiago Pastorino | 2012-03-17 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Remove unused require | Santiago Pastorino | 2012-03-17 | 1 | -1/+0 |
| | | | | |