aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/ruby_on_rails_guides_guidelines.textile
| * | | | Fixed-width font fix for instance variableJuanjo Bazán2012-03-201-1/+1
| | | | |
* | | | | Return an actual boolean from xml_http_request?Tim Pope2012-03-231-1/+1
| | | | |
* | | | | Merge pull request #5518 from rafaelfranca/minor-refactorJosé Valim2012-03-231-11/+11
|\ \ \ \ \ | | | | | | | | | | | | Remove code duplication
| * | | | | Remove code duplicationRafael Mendonça França2012-03-191-11/+11
| | | | | |
* | | | | | Use the new scope syntaxRafael Mendonça França2012-03-231-1/+1
| |_|_|/ / |/| | | |
* | | | | We dont need to merge in the parameters as thats all being reset by the rack ↵David Heinemeier Hansson2012-03-201-1/+0
|/ / / / | | | | | | | | | | | | headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)
* | | | 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-191-19/+116
|\ \ \ \ | |/ / / |/| | |
| * | | 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-1777-1264/+536
| |\ \ \
| * | | | Revised description for responds_withMark Thomson2012-03-171-19/+115
| | | | |
* | | | | time_tag support for blocksAntonio Tapiador del Dujo2012-03-182-2/+11
| | | | |
* | | | | Update the guides and CHANGELOGRafael Mendonça França2012-03-171-2/+4
| | | | |
* | | | | 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-173-0/+237
| |/ / / |/| | |
* | | | Add missing requireSantiago Pastorino2012-03-171-0/+1
| | | |
* | | | Remove unused requireSantiago Pastorino2012-03-171-1/+0
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-171-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/getting_started.textile
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Fix for #5440
* | | | | 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 initialized
| * | | | | fixed - warning: instance variable @controller not initializedSandeep2012-03-161-0/+5
| | | | | |
* | | | | | use consistent explicit module inclusionLuke Gruber2012-03-163-6/+6
|/ / / / / | | | | | | | | | | | | | | | aid ease of understanding and readability for tests
* | | | | fixed - warning: ambiguous first argument; put parentheses or even spacesSandeep2012-03-161-1/+1
| | | | |
* | | | | Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgsPiotr Sarnacki2012-03-161-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix exceptions messages in AC layouts
| * | | | | Fix exceptions messages in AC layoutsAlexey Vakhov2012-03-101-2/+2
| | | | | |
* | | | | | Merge pull request #5454 from luke-gru/luke-devPiotr Sarnacki2012-03-152-4/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | allow zero-arity proc for AbstrController::layout
| * | | | | | allow zero-arity proc for AbstrController::layoutLuke Gruber2012-03-152-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proc without parameters can now be given to AbstractController::layout
* | | | | | | fix typo in redirect testBrian Lopez2012-03-151-1/+1
| | | | | | |
* | | | | | | strip null bytes from Location header as wellBrian Lopez2012-03-153-2/+22
|/ / / / / / | | | | | | | | | | | | | | | | | | add tests for stripping \r\n chars since that's already happening
* | | | | | Merge pull request #5337 from mreinsch/static_invalid_byte_sequenceAaron Patterson2012-03-152-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix ArgumentError being raised in case of invalid byte sequences
| * | | | | | fix ArgumentError being raised in case of invalid byte sequencesMichael Reinsch2012-03-082-0/+5
| | | | | | |
* | | | | | | Simplify helpers handling. Ensure Metal can run AC hooks.José Valim2012-03-154-35/+34
| | | | | | |
* | | | | | | Remove ActionController::TestCase#rescue_action_in_public!Piotr Sarnacki2012-03-152-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method has no effect since exception handling was moved to middlewares and ActionController tests do not use any middlewares.
* | | | | | | Allow you to force the authenticity_token to be rendered even on remote ↵David Heinemeier Hansson2012-03-142-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | forms if you pass true
* | | | | | | Do not include the authenticity token in forms where remote: true as ajax ↵David Heinemeier Hansson2012-03-143-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | forms use the meta-tag value
* | | | | | | Remove --http.José Valim2012-03-1411-338/+0
| | | | | | |
* | | | | | | Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignoredPiotr Sarnacki2012-03-142-1/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't ignore call to undefined method in Sweeper
| * | | | | | | Don't ignore call to undefined method in SweeperLevente Bagi2012-03-062-1/+17
| | | | | | | |
* | | | | | | | Add API apps CHANGELOG entrySantiago Pastorino2012-03-141-0/+2
| | | | | | | |
* | | | | | | | Add ActionController::HTTPSantiago Pastorino2012-03-1415-8/+355
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More info http://edgeguides.rubyonrails.org/api_app.html [Carlos Antonio da Silva & Santiago Pastorino]
* | | | | | | | Merge pull request #5421 from parndt/masterVijay Dev2012-03-141-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Added missing 'end' to documentation example
| * | | | | | | Added missing end to examplePhilip Arndt2012-03-141-0/+1
| | | | | | | |