aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Code cleanup for ActionDispatch::Flash#callJulian Vargas2013-05-121-9/+3
| | | | | | | The nested `if` was replaced by using `presence` which takes account for the given hash when it is `nil` or when it is empty. The `else` was removed because what it was doing was to assign to `env[KEY]` the value it already had.
* Replace multi_json with jsonErik Michaels-Ober2013-05-111-1/+1
|
* Merge pull request #10543 from vipulnsward/to_sortCarlos Antonio da Silva2013-05-101-1/+1
|\ | | | | Can you improve the commit message a little bit? It's good to describe why the change is happening.
| * sort => sort! on new arrayVipul A M2013-05-101-1/+1
| |
* | Merge pull request #10510 from think602/masterXavier Noria2013-05-091-0/+1
|\ \ | |/ |/| [ci skip] document protect_against_forgery? method
| * [ci skip] document protect_against_forgery? methodWeston Platter2013-05-101-0/+1
| |
* | Merge pull request #10536 from vipulnsward/fix_exp_warningCarlos Antonio da Silva2013-05-091-1/+0
|\ \ | | | | | | remove variable and fix warning
| * | remove variable and fix warningVipul A M2013-05-091-1/+0
| | |
* | | rails -> Rails [ci skip]Prathamesh Sonpatki2013-05-091-1/+1
|/ /
* / Fix that JSON and XML exception responses should give the HTTP error message ↵Jeremy Kemper2013-05-082-4/+4
|/ | | | for their status, by default, not the message from the underlying exception
* Test that #fresh_when accepts an arrayBrandon Keepers2013-05-071-2/+19
| | | | https://github.com/rails/etagger/pull/3
* Merge pull request #10377 from bricker/template_digest_ending_with_numberRafael Mendonça França2013-05-064-3/+12
|\ | | | | Allow numbers in partial name for digesting
| * Allow numbers in partial name for digestingBryan Ricker2013-05-064-3/+12
| | | | | | | | | | | | | | | | | | | | Add failing test for template with number at the end Use \w for RENDER_DEPENDENCY regex Spacing Add CHANGELOG entry
* | Merge pull request #10446 from dasch/instrument-template-compilationRafael Mendonça França2013-05-061-2/+9
|\ \ | |/ |/| Instrument template compilation
| * Instrument template compilationDaniel Schierbeck2013-05-061-2/+9
| |
* | Merge pull request #10478 from cainlevy/patch-1Rafael Mendonça França2013-05-061-1/+1
|\ \ | | | | | | use canonical #controller_path logic in controller test cases
| * | use canonical #controller_path logic in controller test casesLance Ivy2013-05-051-1/+1
| | |
* | | remove unused variableVipul A M2013-05-061-1/+0
| | |
* | | Fix typo in documentation commentJunya Ogura2013-05-061-1/+1
|/ /
* | Added missing `require` to ActionView::LookupContextVladimir Strakhov2013-05-051-0/+1
| |
* | Fix generating route from engine to other enginePiotr Sarnacki2013-05-031-1/+2
|/ | | | | | | | | | | | A regression was introduced in 5b3bb6, generating route from within an engine to an another engine resulted in prefixing a path with the SCRIPT_NAME value. The regression was caused by the fact that SCRIPT_NAME should be appended only if it's the SCRIPT_NAME for the application, not if it's SCRIPT_NAME from the current engine. closes #10409
* Merge pull request #10426 from tkrajcar/rescue-h1-fixCarlos Antonio da Silva2013-05-021-0/+6
|\ | | | | Add styling to h1 for default rescue layout
| * Add styling to h1Tim Krajcar2013-05-021-0/+6
| |
* | use constant for encodingNihad Abbasov2013-05-021-1/+1
|/
* Fix failing AP testCarlos Antonio da Silva2013-05-011-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-011-1/+1
|\
| * fixed typo in select_tag docsRncrtr2013-04-181-1/+1
| |
* | Merge pull request #9857 from yyyc514/bad_params_should_400Aaron Patterson2013-04-303-0/+8
|\ \ | | | | | | failure to parse params should trigger a 400 Bad Request
| * | failure to parse params should trigger a 400 Bad RequestJosh Goebel2013-03-213-0/+8
| | |
* | | add missing semicolon to journey parser.yBen Holley2013-04-301-0/+1
| | |
* | | Rack::Mount was replaced by Journey, Fixed commentGaurish Sharma2013-04-301-1/+1
| | |
* | | rails/master is now 4.1.0.betaRafael Mendonça França2013-04-292-1193/+3
| | |
* | | Bump version to rc1David Heinemeier Hansson2013-04-291-1/+1
| | |
* | | Don't reprocess the options hash on every requestAndrew White2013-04-271-1/+2
| | |
* | | Revert "Merge pull request #10337 from eimermusic/fix_template_digestor_lookup"Rafael Mendonça França2013-04-253-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b4239622afc4f3f73808fd0c97512f3a534e07dd, reversing changes made to f99ce3c188f5dde57e2ff63e6a22363c62f0a4cd. Reason: This broke the build https://travis-ci.org/rails/rails/jobs/6629894
* | | Merge pull request #10337 from eimermusic/fix_template_digestor_lookupRafael Mendonça França2013-04-253-2/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix ActionView::Digestor to correctly pass format to LookupContext Conflicts: actionpack/CHANGELOG.md
| * | | AV Digestor correctly passes format to LookupContextMartin Westin2013-04-253-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionView::Digestor now passes arguments correctly to LookupContext::find method. This makes cache digests respect the format option correctly. FixtureFinder in tests also changed to reflect this.
* | | | Add support for extra options to `force_ssl`Andrew White2013-04-253-31/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds support for passing additional url options along with a :status option and any of the flash-related options to `redirect_to` (i.e. :flash, :alert & :notice). Closes #7570.
* | | | Use `request.fullpath` to build redirect url in `force_ssl`Andrew White2013-04-253-4/+79
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `force_ssl` command now builds the redirect url from `request.fullpath`. This ensures that the format is maintained and it doesn't redirect to a route that has the same parameters but is defined earlier in `routes.rb`. Also any optional segments are maintained. Fixes #7528. Fixes #9061. Fixes #10305.
* | | fixed missing comma in exampleIlya Vorontsov2013-04-241-1/+1
| | |
* | | Add test for `format: false` with resources - closes #10323Andrew White2013-04-241-0/+29
| | |
* | | applies documentation guidelinesXavier Noria2013-04-221-11/+12
| | |
* | | Merge pull request #10301 from vipulnsward/extract_in_mapperAndrew White2013-04-221-2/+4
|\ \ \ | | | | | | | | extract arrays to constants in Mapper
| * | | extract arrays to constants in MapperVipul A M2013-04-221-2/+4
| | | |
* | | | Merge pull request #10299 from econsultancy/use-method-not-allowed-exceptionAndrew White2013-04-224-0/+18
|\ \ \ \ | |/ / / |/| | | Use MethodNotAllowed exception rather than UnknownHttpMethod
| * | | Return a 405 response for unknown HTTP methodsLewis Marshall2013-04-224-0/+18
| | | |
* | | | extract no content response codes to a constantVipul A M2013-04-221-1/+2
|/ / /
* | | Removing tests for deprecated options in active support. Thewangjohn2013-04-211-8/+0
| | | | | | | | | | | | | | | +use_full_path+ option was removed in 3b3790a4 and passing the template handler to render was deprecated in 43d27e91.
* | | Increase readability of ternary statement in build methodbuddhamagnet2013-04-201-2/+1
| | |
* | | Merge pull request #10267 from vipulnsward/use_destructive_methodRafael Mendonça França2013-04-191-1/+1
|\ \ \ | | | | | | | | symbolize_keys => symbolize_keys! on new hash; change sentence
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 04:04:24 +0000