aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | Cleanups in comment about conditionalGuillermo Iguaran2013-12-031-1/+2
| |
* | Merge branch 'format_localized_template' of https://github.com/acapilleri/railsGuillermo Iguaran2013-12-034-1/+22
|\ \ | |/ |/| | | | | Conflicts: actionpack/CHANGELOG.md
| * Fix header Content-Type: #<Mime::NullType:...> in localized templateAngelo capilleri2013-12-034-1/+22
| | | | | | | | | | | | | | | | This PR fixes #13064 regression bug introduced by the #8085 Now in _process_format when the format is a Mime::NullType nothing is written in self.content_type. In this way the method Response#assign_default_content_type_and_charset can write the the default mime_type.
* | Merge pull request #12123 from aredondo/masterCarlos Antonio da Silva2013-12-021-0/+8
|\ \ | | | | | | | | | | | | Add regression test for IpSpoofAttackError issue Closes #10780
| * | Add regression test for IpSpoofAttackError issueAlvaro Redondo2013-09-031-0/+8
| | | | | | | | | | | | See #10780
* | | Remove deprecated cattr_* requiresGenadi Samokovarov2013-12-034-4/+4
| | |
* | | Try to escape each part of a path redirect route correctlyAndrew White2013-12-023-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A path redirect may contain any and all parts of a url which have different escaping rules for each part. This commit tries to escape each part correctly by splitting the string into three chunks - path (which may also include a host), query and fragment; then it applies the correct escape pattern to each part. Whilst using `URI.parse` would be better, unfortunately the possible presence of %{name} parameters in the path redirect string prevents us from using it so we have to use a regular expression instead. Fixes #13110.
* | | [ci skip] Removing some gender sensitive object pronounsTejas Dinkar2013-12-021-2/+2
| | |
* | | Use genderless pronouns in API docsGuillermo Iguaran2013-12-011-1/+1
| | |
* | | Typo fixes [ci skip]Akshay Vishnoi2013-11-301-2/+2
| | |
* | | first pass through CHANGELOGS to extract 4_1_release_notes. [ci skip]Yves Senn2013-11-281-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract **notable changes**, **deprecations** and **removals** from each CHANGELOG. I tried to reference the commits and pull requests for new features and deprecations. In the process I also made some minor changes to the CHANGELOGS. The 4_1_release_notes guide is declared WIP.
* | | fixed-case when invalid action name has passedKuldeep Aggarwal2013-11-281-0/+3
| | |
* | | fixed typo `destory` => `destroy` [ci skip]Kuldeep Aggarwal2013-11-281-1/+1
| |/ |/|
* | Better error message for typos in assert_response argument.Victor Costan2013-11-253-0/+19
| | | | | | | | | | This commit makes it really easy to debug errors due to typos like "assert_response :succezz".
* | Merge pull request #13020 from razielgn/raise-inspectable-messagesCarlos Antonio da Silva2013-11-242-4/+4
|\ \ | | | | | | Raise RuntimeErrors with inspectable and MRI-independent messages.
| * | Raise RuntimeErrors with inspectable and MRI-independent messages.Federico Ravasio2013-11-242-4/+4
| | | | | | | | | | | | | | | | | | Previous behaviour was MRI-dependent, now we're making sure the message is correctly shown: something that can be relyied upon across every Ruby implementation.
* | | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-241-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb
| * | Change syntax format for example returned valuesPrem Sichanugrist2013-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip]
* | | Improve changelogsCarlos Antonio da Silva2013-11-221-1/+1
| | | | | | | | | | | | | | | Also make Action Mailer changelog format more consistent with the others [ci skip]
* | | Build fix for Routing InspectorArun Agrawal2013-11-221-2/+2
| | | | | | | | | | | | | | | | | | Broken by 6701b4cf41f6f3d9cfc6a93715acbf852d1e468e
* | | Revert "Merge pull request #12990 from vipulnsward/remove_visualizer_param"Rafael Mendonça França2013-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5a19346d2855ecb1c791cdef3af92589566d00db, reversing changes made to d82588ee4756b03025813b3997f4db171ee0fcdc. This argument is being used in the view https://github.com/rails/rails/blob/5a19346d2855ecb1c791cdef3af92589566d00db/actionpack/lib/action_dispatch/journey/visualizer/index.html.erb#L4 It is being set using the binding https://github.com/rails/rails/blob/5a19346d2855ecb1c791cdef3af92589566d00db/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb#L108
* | | Remove unused param `title`to `TransitionTable#visualizer`Vipul A M2013-11-221-1/+1
| | |
* | | unify punctuation in Action Pack changelog. [ci skip]Yves Senn2013-11-211-5/+7
| | |
* | | Fix for routes taskSıtkı Bağdat2013-11-213-17/+22
| | | | | | | | | | | | This commit fixes formatting issue for `rake routes` task, when a section is shorter than a header.
* | | `skiping` => `skipping`Kuldeep Aggarwal2013-11-191-1/+1
| | |
* | | Merge pull request #12898 from chocoby/fix/changelog_commentCarlos Antonio da Silva2013-11-151-1/+1
|\ \ \ | | | | | | | | Fix CHANGELOG typo [ci skip]
| * | | Fix CHANGELOG typo [ci skip]chocoby2013-11-151-1/+1
| | | |
* | | | Avoid hash lookups for building an array of required defaultsCarlos Antonio da Silva2013-11-151-2/+3
| | | | | | | | | | | | | | | | Only set the value once after it's calculated.
* | | | Get rid of useless temp variableCarlos Antonio da Silva2013-11-151-2/+1
| | | |
* | | | Set values instead of building hashes with single values for mergingCarlos Antonio da Silva2013-11-151-2/+2
|/ / /
* | | Take Hash with options inside Array in #url_forAndrey Ognevsky2013-11-153-0/+29
| | |
* | | Revert "Used Yield instead of block.call" -- this causes all of ↵David Heinemeier Hansson2013-11-141-2/+2
| | | | | | | | | | | | | | | | | | atom_feed_helper_test.rb to fail with "SystemStackError: stack level too deep". This reverts commit d3a1ce1cdc60d593de1682c5f4e3230c8db9a0fd.
* | | Merge pull request #12892 from akshay-vishnoi/refactorRafael Mendonça França2013-11-141-9/+12
|\ \ \ | | | | | | | | avoiding next statements
| * | | avoiding next statementsAkshay Vishnoi2013-11-151-9/+12
| | | |
* | | | Merge pull request #12889 from kuldeepaggarwal/speed_upsRafael Mendonça França2013-11-141-2/+2
|\ \ \ \ | |/ / / |/| | | Used Yield instead of block.call
| * | | Used Yield instead of block.callKuldeep Aggarwal2013-11-151-2/+2
| | | |
* | | | class methods moved to already defined class<<self blockAkshay Vishnoi2013-11-151-6/+6
| | | |
* | | | #presence usedAkshay Vishnoi2013-11-141-5/+1
| | | |
* | | | Merge pull request #12838 from strzalek/remove_mime_type_order_varGuillermo Iguaran2013-11-101-4/+3
|\ \ \ \ | | | | | | | | | | Remove @order attribute from collector
| * | | | Remove order attribute from collectorLukasz Strzalkowski2013-11-101-4/+3
| |/ / / | | | | | | | | | | | | Ruby 1.8 legacy. Since 1.9 hash preserves insertion order. No need for additional array to achieve this
* | | | Merge pull request #12740 from gaurish/patch-1Rafael Mendonça França2013-11-101-2/+4
|\ \ \ \ | |/ / / |/| | | Improve Errors when Controller Name or Action isn't specfied
| * | | Improve Errors when Controller Name or Action isn't specfiedGaurish Sharma2013-11-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These errors occur when, there routes are wrongly defined. example, the following line would cause a missing :action error root "welcomeindex" Mostly beginners are expected to hit these errors, so lets improve the error message a bit to make their learning experience bit better.
* | | | Skip test which is broken on jrubyGaurish Sharma2013-11-091-0/+4
| |/ / |/| | | | | | | | | | | | | | This test is broken from quite a while & is expected to remain broken as encoding issues are hardest to fix in JRuby. so lets skip this test for now
* | | calculate the ivars to remove in advance as a set and cache them in aAaron Patterson2013-11-062-11/+12
| | | | | | | | | | | | | | | | | | | | | constant. `view_assigns` can use the precalculated sets and remove instance variables without allocating any extra arrays
* | | use a set and reject to avoid array allocationsAaron Patterson2013-11-061-4/+11
| | |
* | | each_with_object on the view_assigns hashAaron Patterson2013-11-061-3/+1
| | |
* | | use slice to avoid range allocationAaron Patterson2013-11-061-1/+3
| | |
* | | these variables are also privateAaron Patterson2013-11-061-0/+1
| | |
* | | instance_variables returns symbols, so we should use symbols in our listAaron Patterson2013-11-061-1/+1
| | |
* | | Eliminate `JSON.{parse,load,generate,dump}` and `def to_json`Godfrey Chan2013-11-056-26/+27
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSON.{dump,generate} offered by the JSON gem is not compatiable with Rails at the moment and can cause a lot of subtle bugs when passed certain data structures. This changed all direct usage of the JSON gem in internal Rails code to always go through AS::JSON.{decode,encode}. We also shouldn't be implementing `to_json` most of the time, and these occurances are replaced with an equivilent `as_json` implementation to avoid problems down the road. See [1] for all the juicy details. [1]: intridea/multi_json#138 (comment)