Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | 1 | -19/+116 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | 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 | 77 | -1264/+536 | |
| |\ \ | ||||||
| * | | | Revised description for responds_with | Mark Thomson | 2012-03-17 | 1 | -19/+115 | |
| | | | | ||||||
* | | | | time_tag support for blocks | Antonio Tapiador del Dujo | 2012-03-18 | 2 | -2/+11 | |
| | | | | ||||||
* | | | | Update the guides and CHANGELOG | Rafael Mendonça França | 2012-03-17 | 1 | -2/+4 | |
| | | | | ||||||
* | | | | 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 | 3 | -0/+237 | |
| |/ / |/| | | ||||||
* | | | Add missing require | Santiago Pastorino | 2012-03-17 | 1 | -0/+1 | |
| | | | ||||||
* | | | Remove unused require | Santiago Pastorino | 2012-03-17 | 1 | -1/+0 | |
| | | | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-17 | 1 | -4/+4 | |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/getting_started.textile | |||||
| * | | | Minor clarification in documentation language and spelling | Matthew Daubert | 2012-03-13 | 1 | -4/+4 | |
| | | | | ||||||
* | | | | Merge pull request #5480 from drogus/rendering-issues | José Valim | 2012-03-17 | 8 | -0/+46 | |
| | | | | | | | | | | | | | | | | Fix for #5440 | |||||
* | | | | Should use an argument in http_digest_authentication_test.rb | kennyj | 2012-03-17 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #5470 from sandeepravi/warning_fixes | José Valim | 2012-03-17 | 1 | -0/+5 | |
|\ \ \ \ | | | | | | | | | | | fixed - warning: instance variable @controller not initialized | |||||
| * | | | | fixed - warning: instance variable @controller not initialized | Sandeep | 2012-03-16 | 1 | -0/+5 | |
| | | | | | ||||||
* | | | | | use consistent explicit module inclusion | Luke Gruber | 2012-03-16 | 3 | -6/+6 | |
|/ / / / | | | | | | | | | | | | | aid ease of understanding and readability for tests | |||||
* | | | | fixed - warning: ambiguous first argument; put parentheses or even spaces | Sandeep | 2012-03-16 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgs | Piotr Sarnacki | 2012-03-16 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | Fix exceptions messages in AC layouts | |||||
| * | | | | Fix exceptions messages in AC layouts | Alexey Vakhov | 2012-03-10 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #5454 from luke-gru/luke-dev | Piotr Sarnacki | 2012-03-15 | 2 | -4/+44 | |
|\ \ \ \ \ | | | | | | | | | | | | | allow zero-arity proc for AbstrController::layout | |||||
| * | | | | | allow zero-arity proc for AbstrController::layout | Luke Gruber | 2012-03-15 | 2 | -4/+44 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proc without parameters can now be given to AbstractController::layout | |||||
* | | | | | | fix typo in redirect test | Brian Lopez | 2012-03-15 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | strip null bytes from Location header as well | Brian Lopez | 2012-03-15 | 3 | -2/+22 | |
|/ / / / / | | | | | | | | | | | | | | | | add tests for stripping \r\n chars since that's already happening | |||||
* | | | | | Merge pull request #5337 from mreinsch/static_invalid_byte_sequence | Aaron Patterson | 2012-03-15 | 2 | -0/+5 | |
|\ \ \ \ \ | | | | | | | | | | | | | fix ArgumentError being raised in case of invalid byte sequences | |||||
| * | | | | | fix ArgumentError being raised in case of invalid byte sequences | Michael Reinsch | 2012-03-08 | 2 | -0/+5 | |
| | | | | | | ||||||
* | | | | | | Simplify helpers handling. Ensure Metal can run AC hooks. | José Valim | 2012-03-15 | 4 | -35/+34 | |
| | | | | | | ||||||
* | | | | | | Remove ActionController::TestCase#rescue_action_in_public! | Piotr Sarnacki | 2012-03-15 | 2 | -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 Hansson | 2012-03-14 | 2 | -5/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | forms if you pass true | |||||
* | | | | | | Do not include the authenticity token in forms where remote: true as ajax ↵ | David Heinemeier Hansson | 2012-03-14 | 3 | -2/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | forms use the meta-tag value | |||||
* | | | | | | Remove --http. | José Valim | 2012-03-14 | 11 | -338/+0 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignored | Piotr Sarnacki | 2012-03-14 | 2 | -1/+17 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Don't ignore call to undefined method in Sweeper | |||||
| * | | | | | | Don't ignore call to undefined method in Sweeper | Levente Bagi | 2012-03-06 | 2 | -1/+17 | |
| | | | | | | | ||||||
* | | | | | | | Add API apps CHANGELOG entry | Santiago Pastorino | 2012-03-14 | 1 | -0/+2 | |
| | | | | | | | ||||||
* | | | | | | | Add ActionController::HTTP | Santiago Pastorino | 2012-03-14 | 15 | -8/+355 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More info http://edgeguides.rubyonrails.org/api_app.html [Carlos Antonio da Silva & Santiago Pastorino] | |||||
* | | | | | | | Merge pull request #5421 from parndt/master | Vijay Dev | 2012-03-14 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Added missing 'end' to documentation example | |||||
| * | | | | | | Added missing end to example | Philip Arndt | 2012-03-14 | 1 | -0/+1 | |
| | | | | | | | ||||||
* | | | | | | | Remove remaining sprockets tests | Guillermo Iguaran | 2012-03-13 | 1 | -28/+0 | |
| | | | | | | | ||||||
* | | | | | | | Remove sprockets dependency on actionpack | Guillermo Iguaran | 2012-03-13 | 1 | -1/+0 | |
| | | | | | | | ||||||
* | | | | | | | Remove tests and fixtures for Sprockets on ActionPack | Guillermo Iguaran | 2012-03-13 | 14 | -409/+0 | |
| | | | | | | | ||||||
* | | | | | | | Remove sprockets integration on ActionPack | Guillermo Iguaran | 2012-03-13 | 8 | -537/+0 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #572 from sikachu/remove_activeresource | José Valim | 2012-03-13 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove Active Resource source files from the repository. | |||||
| * | | | | | | | Remove Active Resource source files from the repository | Prem Sichanugrist | 2012-03-13 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dear Active Resource, It's not that I hate you or anything, but you didn't get much attention lately. There're so many alternatives out there, and I think people have made their choice to use them than you. I think it's time for you to have a big rest, peacefully in this Git repository. I will miss you, @sikachu. | |||||
* | | | | | | | | add include_hidden option to checkbox tag | Sergey Nartimov | 2012-03-13 | 2 | -2/+13 | |
|/ / / / / / / | ||||||
* | | | | / / | fix typo in AP CHANGELOG [ci skip] | Vasiliy Ermolovich | 2012-03-13 | 1 | -1/+1 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-13 | 3 | -71/+165 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | |