Vijay Dev
3c06d25cf9
favor includes over old AR way
2011-06-11 19:20:54 +05:30
Vijay Dev
83289beddd
fixed incorrect command usage. (This section needs to be updated in any case).
2011-06-11 19:20:54 +05:30
Vijay Dev
94c52e8bd7
minor fixes in action view guide
2011-06-11 19:20:54 +05:30
Xavier Noria
4699c93301
Merge branch 'master' of git://github.com/lifo/docrails
2011-06-11 00:59:46 +02:00
thoefer
029290f3de
Fixed minor typo: 'Arraw' to 'Array'
2011-06-11 00:54:42 +02:00
Xavier Noria
6c58585ff5
shell out to run bundler on app generation, see rationale in the comment
2011-06-10 23:43:24 +02:00
José Valim
8eb2b519f2
Merge pull request #1631 from vijaydev/runner-help
...
rails runner without any options should show usage information
2011-06-10 06:45:52 -07:00
Vijay Dev
880371ef2b
make 'rails runner' show usage when run without any options
2011-06-10 18:48:50 +05:30
José Valim
78acd17f31
Merge pull request #1567 from BDQ/engine_migrations
...
Ensure engine migrations are copied in correct sequence
2011-06-10 04:43:43 -07:00
Brian Quinn
25ad43015c
Updated test to ensure correct sequence when copying engine/plugin migrations.
2011-06-10 12:12:50 +01:00
Brian Quinn
9f2e91414f
Ensure engine migrations are copied in the same sequence that they are required.
2011-06-10 12:11:45 +01:00
Andrew White
0bcbcdfdad
Ensure number helpers can handle HTML safe strings - closes #1597 .
2011-06-10 11:32:28 +01:00
Xavier Noria
90c4885766
Merge pull request #1523 from raghunadhd/refactor_regex
...
rafactored the regex related code in the mapper class
2011-06-10 03:27:45 -07:00
ganesh
262a42b12e
shallow_path example updated
2011-06-10 15:53:55 +05:30
Raghunadh
46ecb53fc2
removed the unnecessary back slashes from the regular expression
2011-06-10 13:39:24 +05:30
José Valim
2bda229c2f
Merge pull request #1625 from neerajdotname/page_caching
...
Three minor fixes to tests
2011-06-10 00:29:50 -07:00
Neeraj Singh
06d772c0ce
add missing ensure
2011-06-10 02:48:44 -04:00
Neeraj Singh
fdbe8eb08c
replaced and with && as per coding guidelines
2011-06-10 02:27:57 -04:00
Neeraj Singh
49d032929b
The test name is misleading. It says
...
test_should_cache_with_trailing_slash_on_url
A trailing slash is removed when a page is cached.
What the test meant to say was : a url with trailing slash
should be cached and the cached page should not have any
trailing slash.
This patch clarifies the name a bit.
2011-06-10 02:24:37 -04:00
Aaron Patterson
0b02284545
ensuring that json_escape returns html safe strings when passed an html safe string
2011-06-09 15:29:17 -07:00
Damien Mathieu
84f71e42b7
don't reinitialize the arel_table unless the table_name changes
2011-06-09 14:56:07 -07:00
Jacob Poulsgaard Tjoernholm
35ae29f305
Fix issue #1598 by adding a dependency to the RDoc gem.
2011-06-09 14:37:54 -07:00
Jon Leighton
4b371b602b
Print out information about whether the identity map is on or off when running unit tests
2011-06-09 20:20:51 +01:00
Jon Leighton
e48829946d
Update the RUNNING_UNIT_TESTS file
2011-06-09 20:20:51 +01:00
Aaron Patterson
d0a1e37d70
Merge pull request #1609 from sikachu/master-javascript
...
Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
2011-06-09 11:37:06 -07:00
Prem Sichanugrist
8c8652c37f
Make sure escape_javascript
return SafeBuffer
if the incoming argument is already html_safe
2011-06-09 14:30:02 -04:00
John Hinnegan
1395b30803
update palmist link on performance_testing
2011-06-09 10:22:44 -07:00
José Valim
834bebf9cc
Merge pull request #1606 from neerajdotname/remove_users_controller_from_test
...
remove unused UserController from test
2011-06-09 08:30:45 -07:00
Mohammad Typaldos
79647c6fdf
Merge branch 'master' of github.com:lifo/docrails
2011-06-09 03:58:22 -04:00
Mohammad Typaldos
45a5201b86
Match tone already established
2011-06-09 03:57:55 -04:00
José Valim
eb8c0a7b1a
Merge pull request #1356 from flippingbits/fix_engine_generator
...
Fix engine's generator
2011-06-09 00:01:00 -07:00
José Valim
af3f0b6204
Merge pull request #1591 from smartinez87/unused
...
Fix "warning: assigned but unused variable" on AR tests
2011-06-08 23:36:49 -07:00
José Valim
077f65c36f
Merge pull request #1588 from neerajdotname/remove_unused_class_with_symbol_returning
...
class WithSymbolReturningString is not used anywhere in the test.
2011-06-08 23:35:46 -07:00
José Valim
0ad228027d
Merge pull request #1579 from bradleybuda/master
...
Date#freeze fails when called more than once in 1.8
2011-06-08 23:34:30 -07:00
José Valim
12245a3325
Merge pull request #1577 from reu/useless-variable-set
...
Instance variable not used.
2011-06-08 23:33:42 -07:00
Aaron Patterson
9295053d9d
Merge pull request #1593 from r00k/master
...
Simplify boolean logic into ternary
2011-06-08 20:29:12 -07:00
Ben Orenstein
4f9e242521
Describe the user name 'variable' in a way that doesn't confuse the textile parser.
2011-06-08 23:20:13 -04:00
Ben Orenstein
f87888066a
Simplify boolean logic into ternary.
2011-06-08 23:11:19 -04:00
Neeraj Singh
fa5b34ed22
remove unused user_controller from test
2011-06-08 22:49:38 -04:00
Sebastian Martinez
9af4e803ec
Remove unused 'y' variable.
2011-06-08 23:13:59 -03:00
Sebastian Martinez
0b86ac244c
Remove unused 'quoted_column_names' variable.
2011-06-08 23:13:43 -03:00
Neeraj Singh
277eb05733
class WithSymbolReturningString is not used anywhere in the test.
...
Secondly it seemed from the method that the intent was to test a case
where layout was declared in a symbol and the method named mention in
layout returns nil.
That case is already covered with class class WithSymbolReturningNil .
Also the case of SymbolReturningString is covered with the class
WithSymbol.
2011-06-08 20:22:13 -04:00
David Heinemeier Hansson
54b0aeba64
Indention style + whitespace for readability
2011-06-09 01:31:06 +02:00
David Heinemeier Hansson
93f30f0536
If you set a js_compressor, it means that you want shit compressed -- we dont need a second option to turn that on
2011-06-09 01:30:58 +02:00
Mohammad Typaldos
fe2482e50b
require_tree is pretty simple
2011-06-08 18:50:55 -04:00
Bradley Buda
dd3e7a6a34
Allow a Date to be frozen more than once without an error in Ruby 1.8.x
2011-06-08 13:54:48 -07:00
Rodrigo Navarro
8166e4b0c3
No need to create a new Arel::Table, as the arel_table method already creates a new one
2011-06-08 16:56:01 -03:00
Bratish Goswami
266b1bd9b4
Added acronym and reference link for Model–view–controller
2011-06-08 22:47:25 +05:30
Aaron Patterson
7d537b2106
Merge pull request #1564 from sikachu/master-changelog
...
Update CHANGELOG to mention the new SafeBuffer change
2011-06-08 09:01:45 -07:00
Prem Sichanugrist
7ab06004da
Update CHANGELOG to mention the new SafeBuffer change
2011-06-08 11:47:27 -04:00