aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Get ready to release 4.1.0.beta1David Heinemeier Hansson2013-12-171-1/+1
|
* Clearly limit new CSRF protection to GET requestsJeremy Kemper2013-12-172-2/+17
|
* Merge pull request #13345 from jeremy/get-csrfJeremy Kemper2013-12-175-25/+138
|\ | | | | CSRF protection from cross-origin <script> tags
| * CSRF protection from cross-origin <script> tagsJeremy Kemper2013-12-175-25/+138
| | | | | | | | Thanks to @homakov for sounding the alarm about JSONP-style data leaking
* | Merge pull request #13346 from chancancode/release_notes_etcYves Senn2013-12-171-1/+1
|\ \ | | | | | | Release notes fixes [ci skip]
| * | Some assorted fixes for the 4.1 release notes:Godfrey Chan2013-12-171-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | * Added release notes for secrets.yml and mentioned it in the highlights * Added release notes for Mailer previews and mentioned it in the highlights * Added release notes for Module#concerning * Removed mention for AV extraction from the highlights * Rearranged the major features to put highlighted features first * Various improvements and typo fixes [ci skip]
* / Disable available locales checks to avoid warnings running the testsCarlos Antonio da Silva2013-12-171-0/+3
|/
* Add mailer previews feature based on mail_view gemAndrew White2013-12-171-1/+1
|
* Merge pull request #13307 from akshay-vishnoi/typoRafael Mendonça França2013-12-151-1/+1
|\ | | | | Spelling and Grammar check [ci skip]
| * Spelling and Grammar check [ci skip]Akshay Vishnoi2013-12-161-1/+1
| |
* | Update secret_key_base Docsrobertomiranda2013-12-152-10/+11
| |
* | Fix syntax error in redirect_to examplePhilipe Fatio2013-12-141-1/+1
| | | | | | | | | | Without parenthesis, ruby assumes that curly braces denote the beginning of a block.
* | Merge pull request #13293 from akshay-vishnoi/typoCarlos Antonio da Silva2013-12-124-5/+5
|\| | | | | Spelling and Grammar checks [ci skip]
| * Spelling and Grammar checksAkshay Vishnoi2013-12-124-5/+5
| |
* | Merge pull request #13290 from strzalek/inline-syntax-docsRafael Mendonça França2013-12-122-0/+17
|\ \ | |/ |/| Variants inline syntax documentation
| * Variants inline syntax documentation [ci skip]Łukasz Strzałkowski2013-12-122-0/+17
| | | | | | | | | | | | * Extend method documentation * Mention it in actionpack/CHANGELOG * Update release notes
* | Changelog improvements [ci skip]Carlos Antonio da Silva2013-12-121-4/+6
|/
* Merge pull request #13288 from dvsuresh/fix_typoDamien Mathieu2013-12-121-1/+1
|\ | | | | Fix typo in action_controller responder.rb [ci skip]
| * Fix typo in action_controller responder.rbdvsuresh2013-12-121-1/+1
| |
* | Merge pull request #13284 from aayushkhandelwal11/typos_correctedGodfrey Chan2013-12-111-1/+1
|\ \ | |/ |/| s/everytime/every time/
| * typos rectified [ci skip]Aayush khandelwal2013-12-121-1/+1
| |
* | Update CHANGELOG entry for Session#fetchTrent Ogren2013-12-111-3/+1
| | | | | | | | | | This reverts the changes to CHANGELOG.md in commit 38f8872aa5fd8f0a1d0895e9eb41f73261acd040.
* | Make ActionDispatch::Request::Session#fetch behave like Hash#fetchTrent Ogren2013-12-112-11/+10
|/ | | | | | Session#fetch was mutating the session when given a default argument and/or a block. Since Session duck-types as a Hash, it should behave like one in these cases.
* Fix mounting engines inside a resources blockPiotr Sarnacki2013-12-103-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | When a route is mounted inside a resources block, it's automatically prefixed, so a following code: resources :users do mount Blog::Engine => '/blog' end will generate a user_blog path helper. In order to access engine helpers, we also use "mounted_helpers", a list of helpers associated with each mounted engine, so a path to blog's post can be generated using user_blog.post_path(user, post). The problem I'm fixing here is that mount used a raw :as option, without taking nestings into account. As a result, blog was added to a route set as a `user_blog`, but helper was generated for just `blog`. This commit applies the proper logic for defining a helper for a mounted engine nested in resources or resource block. (closes #8533)
* Inline variants syntaxŁukasz Strzałkowski2013-12-103-3/+63
| | | | | | | | | | | | | | | | | | | | | | | In most cases, when setting variant specific code, you're not sharing any code within format. Inline syntax can vastly simplify defining variants in those situations: respond_to do |format| format.js { render "trash" } format.html do |variant| variant.phone { redirect_to progress_path } variant.none { render "trash" } end end Becomes: respond_to do |format| format.js { render "trash" } format.html.phone { redirect_to progress_path } format.html.none { render "trash" } end
* Simplify @responses hash initializationŁukasz Strzałkowski2013-12-101-1/+2
| | | | | | | | | | | | | @responses hash needs to be initialized with mime types that we get from Collector#collect_mimes_from_class_level. Mime::Type class as key and nil as value. This need to happen before content negotiation. Before that, it was looping though mime types and executing mime-type-generated method inside collector (see AbstractController::Collector#generate_method_for_mime). That approach resulted in 2 unnecessary method calls for each mime type collected by Collector#collect_mimes_from_class_level. Now hash is initialized in place, without usage of Collector#custom method.
* Revert "Merge pull request #13235 from strzalek/variants-inline" -- needs a ↵David Heinemeier Hansson2013-12-082-28/+10
| | | | | | | little more work! This reverts commit 186161148a189839a1e0924043f068a8d155ce69, reversing changes made to cad9eb178ea5eec0e27d74e93518f4ed34e2f997.
* Merge pull request #13235 from strzalek/variants-inlineDavid Heinemeier Hansson2013-12-082-10/+28
|\ | | | | Inline syntax for variants
| * Inline variants syntaxŁukasz Strzałkowski2013-12-082-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases, when setting variant specific code, you're not sharing any code within format. Inline syntax can vastly simplify defining variants in those sitiations: respond_to do |format| format.js { render "trash" } format.html do |variant| variant.phone { redirect_to progress_path } variant.none { render "trash" } end end ` Becomes: respond_to do |format| format.js { render "trash" } format.html.phone { redirect_to progress_path } format.html.none { render "trash" } end
| * Simplify @responses hash initializationŁukasz Strzałkowski2013-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | @responses hash needs to be initialized with mime types that we get from Collector#collect_mimes_from_class_level. Mime::Type class as key and nil as value. This need to happen before content negotiation. Before that, it was looping though mime types and executing mime-type-generated method inside collector (see AbstractController::Collector#generate_method_for_mime). That approach resulted in 2 unnecessary method calls for each mime type collected by Collector#collect_mimes_from_class_level. Now hash is initialized in place, without usage of Collector#custom method.
* | Require action_view explicitly in AC::BaseŁukasz Strzałkowski2013-12-082-0/+2
|/
* Variants can be declared without a block to signify their presence in the ↵David Heinemeier Hansson2013-12-073-2/+5
| | | | controller
* Allow code execution in case no variant has been set with variant.noneDavid Heinemeier Hansson2013-12-072-4/+21
|
* Fixed test for Mime::VCFArun Agrawal2013-12-061-3/+3
| | | | Added here 13dd38cee79be39f7b399e142fd78295dddd2abb
* Add Mime::Type.register "text/vcard", :vcf to the default list of mime typesDavid Heinemeier Hansson2013-12-052-0/+5
|
* Merge pull request #13189 from strzalek/retain-ap-av-depJeremy Kemper2013-12-055-19/+6
|\ | | | | Retain ActionPack dependency on ActionView. Fixes #12979.
| * Remove missing integration points of AV extractionCarlos Antonio da Silva2013-12-052-3/+1
| |
| * Retain ActionPack dependency on ActionViewŁukasz Strzałkowski2013-12-053-16/+5
| |
* | add missing CHANGELOG entry for d8c6f52. [ci skip]Yves Senn2013-12-051-0/+5
| | | | | | | | Discoverd by #13175.
* | Escalate missing error when :raise is trueShota Fukumori (sora_h)2013-12-051-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before ec16ba75a5493b9da972eea08bae630eba35b62f, ActionView::Helpers::TranslationHelper#translate has raised errors with specifying options[:raise] to true. This should work by this fix: begin t(:"translations.missing", raise: true) rescue I18n::MissingTranslationData p :hello! end
* | Update changelog [ci skip]Rafael Mendonça França2013-12-041-2/+2
| |
* | remove nil in NullType#ref.Angelo capilleri2013-12-041-3/+1
| | | | | | | | | | Return Nil is implicit in a method and this syntax is used in the others classes
* | Improve a couple exception messages related to variants and mime typesCarlos Antonio da Silva2013-12-033-15/+19
| | | | | | | | | | Avoid one-liner conditionals when they are too big. Avoid concatenating strings to build error messages. Improve messages a bit.
* | Add nodoc to added VariantFilter classCarlos Antonio da Silva2013-12-031-3/+3
|/
* Action Pack VariantsŁukasz Strzałkowski2013-12-049-6/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, variants in the templates will be picked up if a variant is set and there's a match. The format will be: app/views/projects/show.html.erb app/views/projects/show.html+tablet.erb app/views/projects/show.html+phone.erb If request.variant = :tablet is set, we'll automatically be rendering the html+tablet template. In the controller, we can also tailer to the variants with this syntax: class ProjectsController < ActionController::Base def show respond_to do |format| format.html do |html| @stars = @project.stars html.tablet { @notifications = @project.notifications } html.phone { @chat_heads = @project.chat_heads } end format.js format.atom end end end The variant itself is nil by default, but can be set in before filters, like so: class ApplicationController < ActionController::Base before_action do if request.user_agent =~ /iPad/ request.variant = :tablet end end end This is modeled loosely on custom mime types, but it's specifically not intended to be used together. If you're going to make a custom mime type, you don't need a variant. Variants are for variations on a single mime types.
* Change deep_munge call to avoid deprecation warningCarlos Antonio da Silva2013-12-031-2/+2
|
* Merge branch 'master-sec'Aaron Patterson2013-12-032-2/+17
|\ | | | | | | | | | | | | | | | | * master-sec: Deep Munge the parameters for GET and POST Stop using i18n's built in HTML error handling. Ensure simple_format escapes its html attributes Escape the unit value provided to number_to_currency Only use valid mime type symbols as cache keys
| * Deep Munge the parameters for GET and POSTMichael Koziarski2013-12-022-2/+17
| | | | | | | | | | | | | | | | The previous implementation of this functionality could be accidentally subverted by instantiating a raw Rack::Request before the first Rails::Request was constructed. Fixes CVE-2013-6417
* | Changelog improvements [ci skip]Carlos Antonio da Silva2013-12-031-5/+5
| |
* | Convert Mime::NullType in a singletonGuillermo Iguaran2013-12-031-1/+4
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 18:17:58 +0000