TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
35,943 Commits 2 Branches 0 Tags 294 MiB
afddc0409e
Commit Graph

10163 Commits

Author SHA1 Message Date
Yves Senn
afddc0409e format: true does not override existing format constraints. 
Closes #9466.

Passing `format: true` used to override the constraints: { format: /json/ }
with `/.+/`. This patch only sets the format if there is no constraint present.
 2013-02-27 19:57:41 +01:00
José Valim
5c1354901e Improve docs for AbsC::Rendering 2013-02-27 08:30:46 -07:00
Carlos Antonio da Silva
02037c3ea0 Merge pull request #9218 from Fivell/master 
Fix calculation of db_runtime property in
ActiveRecord::Railties::ControllerRuntime#cleanup_view_runtime.

Previously, after raising ActionView::MissingTemplate, db_runtime was
not populated.

Closes #9218, Fixes #9215.

Conflicts:
	activerecord/CHANGELOG.md
 2013-02-27 11:47:24 -03:00
Igor
dd0bbd2ccb fix db_runtime attribute value after raising ActionView::MissingTemplate exception 2013-02-27 16:35:22 +02:00
Yves Senn
a689482490 cleanup AP number_helpers_test 
* use 1.9 style hash syntax
* don't use brances on assert_equal
* prefere " over '
 2013-02-27 13:40:26 +01:00
Yves Senn
152f2f3d3c remove duplicated number_helper tests in AP. They are already in AS. 
With 155cd5e6 the number_helpers were moved into AS all the tests were copied over
but the tests in AP were not deleted. This is confusing.

I removed all duplicated tests and reorganized the tests in AP to only test the
functionality, that is added in AP.
 2013-02-27 13:32:29 +01:00
Steve Klabnik
b080ad35a5 Merge pull request #9452 from frodsan/remove_private_attribute_warning 
remove private attribute? warning
 2013-02-26 16:08:00 -08:00
Francesco Rodriguez
16bd04f6bb remove private attribute? warning 2013-02-26 18:56:56 -05:00
Yves Senn
794cbf3e38 allow non-String default params in the router. 
Closes #9435.

Skip valid encoding checks for non-String parameters that come
from the matched route's defaults.
 2013-02-26 21:53:48 +01:00
Yves Senn
09d9f04d08 the router allows String contraints. 
Closes #9432.
 2013-02-26 21:09:49 +01:00
Rafael Mendonça França
e24e086ef1 Move the CHANGELOG entry to the proper place 
[ci skip]
 2013-02-26 14:16:55 -03:00
Rafael Mendonça França
28bebb225f Merge pull request #9434 from zires/dev 
Journey::Path::Pattern#new raise more meaningful exception message.
 2013-02-26 09:15:43 -08:00
zires
35f38b71df Make ActionDispatch::Journey::Path::Pattern#new raise more meaningful exception message. 2013-02-27 08:26:51 +08:00
Rafael Mendonça França
3d9cfe09ad Merge pull request #9444 from frodsan/add_test_for_977455cc 
Add tests for #9441
 2013-02-26 08:55:48 -08:00
Francesco Rodriguez
7487e79d4d Add tests for #9441 2013-02-26 11:50:48 -05:00
Rafael Mendonça França
0f75e2c51f Update CHANGELOGS 2013-02-26 13:45:57 -03:00
Vijay Dev
7184e3e02e Merge branch 'master' of github.com:lifo/docrails 2013-02-26 21:53:38 +05:30
Sam Ruby
977455cc2e Allow both a path and an option on root in config/routes 2013-02-26 09:51:35 -05:00
David Heinemeier Hansson
c0bc9ce38c Preparing for 4.0.0.beta1 release 2013-02-25 08:31:50 -06:00
David Heinemeier Hansson
2b7b5f535c Merge pull request #8530 from dasch/dependency-trackers 
Custom dependency trackers for the template digestor
 2013-02-25 05:11:56 -08:00
grosser
149e3cd376 fix respond_to without blocks not working if one of the blocks is all 2013-02-24 11:47:20 -05:00
Xavier Noria
c9c5656950 registers the encrypted session store in the AP changelog 2013-02-23 23:46:37 +01:00
Bouke van der Bijl
de47fc2c22 Fix debug helper not inspecting on Exception 
The debug helper should inspect the object when it can't be converted to YAML, this behavior was changed in 8f8d8eb1465069e2ed9b6f2404aa9d02e785f534.
 2013-02-23 13:54:17 +01:00
Carlos Antonio da Silva
38f347a825 Move number_to_human test from AP to AS 
Since all changes from #9347 are related to AS, it seems proper that the
test is placed there as well.
 2013-02-22 19:44:50 -03:00
Carlos Antonio da Silva
1fbfdf5e1b Changelog improvements, use 1.9 style hash in examples [ci skip] 2013-02-22 19:44:50 -03:00
hoffm
4e3ceedeba Address edge case for number_to_human with units option. 
ActiveSupport::NumberHelper#number_to_human now returns the number unaltered when
the units hash does not contain the needed key, e.g. when the number provided is less
than the largest key provided.
 2013-02-22 08:25:51 -05:00
Andrew White
31f807c7aa Merge pull request #9334 from NARKOZ/time_tag 
use ISO 8601 format in time_tag helper
 2013-02-21 23:33:36 -08:00
Nihad Abbasov
dc142f9cd4 document setting custom datetime attribute for time_tag helper 2013-02-22 11:20:10 +04:00
Nihad Abbasov
e8e92c7264 fix time_tag helper and update tests to not rely on dynamically generated values 
Before `time_tag Date.today` will return `<time
  datetime="2013-02-14T00:00:00+00:00">February 14, 2013</time>`.
  This commit fixes time_tag helper to use RFC-3339 full-date format
  (Y-m-d) in datetime attribute.
 2013-02-22 11:04:13 +04:00
Xavier Noria
4b48a75230 completes pass over the AP changelog [ci skip] 2013-02-21 21:18:25 +01:00
Xavier Noria
29927df3d3 tweaks to the AP changelog [ci skip] 2013-02-21 21:17:17 +01:00
Andrew White
f4b506f60a Merge pull request #9361 from senny/improved_match_shorthand_syntax 
determine the match shorthand target early.
 2013-02-21 11:36:15 -08:00
Santiago Pastorino
3893979524 Revert "Revert "Merge pull request #4803 from lucascaton/master"" 
This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.
 2013-02-21 15:34:02 -02:00
Santiago Pastorino
c60be72c52 This cache is not needed 2013-02-21 15:25:26 -02:00
Santiago Pastorino
765006ded8 Use composition to figure out the forgery protection strategy 2013-02-21 15:17:00 -02:00
Yves Senn
c88ee76928 determine the match shorthand target early. 
Closes #7554.

This patch determines the `controller#action` directly
in the `match` method when the shorthand syntax is used.
this prevents problems with namespaces and scopes.
 2013-02-21 17:44:31 +01:00
Carlos Antonio da Silva
b4051edf84 Use #grep to filter priority zones when a regexp is given 2013-02-21 13:32:34 -03:00
Carlos Antonio da Silva
953e19ecd9 Use Array Difference to calculate the zones array, instead of iterating 
It's faster, and doesn't force us to dup the timezones array.
 2013-02-21 13:32:34 -03:00
Carlos Antonio da Silva
1323374333 Fix test name and refactor fake timezones creation in form options test 2013-02-21 13:32:34 -03:00
Carlos Antonio da Silva
b20823ba41 Remove not necessary changelog about time zone array mutation 
This seemed to be introduced in master by
9dd64f2e0c1b3ce85b503b0f81c50c93f89ffbcd, so there's no need to add a
changelog entry for fixing it.

[ci skip]
 2013-02-21 13:32:34 -03:00
Xavier Noria
e2096e8882 tweaks to the AP changelog [ci skip] 2013-02-21 17:30:00 +01:00
Steve Klabnik
ea544e9b48 Merge pull request #9354 from NARKOZ/remove-warnings 
remove assigned but unused variables
 2013-02-21 06:58:16 -08:00
Carson McDonald
3206495d58 Typo fix. 2013-02-21 09:37:45 -05:00
Nihad Abbasov
5e5290586f remove assigned but unused variable warning 2013-02-21 18:12:24 +04:00
Fabio Kreusch
fa9ec0a678 Rack::Test::UploadedFile is a permitted scalar 2013-02-21 11:00:26 -03:00
Santiago Pastorino
6871bd9818 Revert "Merge pull request #4803 from lucascaton/master" 
This reverts commit bb842e8d2111e50b21a14b8bd6d89371a4b9cd68, reversing
changes made to 40c287c7983c20c498f6a8a2ea49e9a6455347f7.
This was causing issues in one of our apps we just upgraded.
ActionController::RoutingError: No route matches [GET]
"/images/favicon.ico"
favicon_link_tag now returns '/images/favicon.ico' and in 3.2 returned
'/favicon.ico'
Browsers by default look for favicon.ico in the root directory

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_view/helpers/asset_tag_helper.rb
 2013-02-20 15:51:51 -02:00
Daniel Schierbeck
ec23296eb6 Register trackers on extensions, not handlers 2013-02-20 16:42:30 +01:00
Daniel Schierbeck
50703703b4 Rename ErbTracker to ERBTracker 2013-02-20 16:18:34 +01:00
Daniel Schierbeck
4452849064 Return an empty array if no tracker is found 2013-02-20 16:17:55 +01:00
Daniel Schierbeck
9ca8c635f6 Use a thread safe hash 2013-02-20 16:17:55 +01:00