Commit Graph

23362 Commits

Author SHA1 Message Date
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
José Valim
8bc4771291 Merge pull request #1560 from sikachu/master-escapejs
Make escape_javascript happy to handle SafeBuffers
2011-06-08 08:08:59 -07:00
Paul Gallagher
bf2f039a93 Make escape_javascript happy to handle SafeBuffers
* see GH#1553
* allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
2011-06-08 11:05:15 -04:00
José Valim
b937c76f0d Merge pull request #1559 from neerajdotname/before_filter_test
Make test meaningful
2011-06-08 08:05:04 -07:00
Neeraj Singh
7fff2f9fe3 Make test meaningful
If before_filter list was being called mistakenly then
the test should fail. However test will not fail because
second filter is assigning new values to @list. To truly
test that first before_filter is not called when it should
not be called then @list should not assigned value unconditionally.

This patch will make the test fail if first filter is called.
2011-06-08 10:51:10 -04:00
Vijay Dev
3dacc85278 minor corrections in configuring guide 2011-06-08 19:42:18 +05:30
José Valim
b64524d6fd Merge pull request #1556 from thoefer/master
Brought back alternative convention for namespaced models in i18n
2011-06-08 05:01:24 -07:00
thoefer
0831b7e076 Brought back alternative convention for namespaced models in i18n. 2011-06-08 13:40:17 +02:00
Vijay Dev
def4a538cc remove generators section from command line guide in favor of the separate generator guide 2011-06-08 15:01:19 +05:30
Xavier Noria
8c1762f11e Merge pull request #1550 from rsim/fix_test_has_many_with_pluralize_table_names_false
Do not hardcode :id as it was ignored by mass assignment filter
2011-06-08 02:13:52 -07:00
Raimonds Simanovskis
e58ee1dccc Do not hardcode :id as it was ignored by mass assignment filter
As a result test was failing on Oracle where ids are assigned by default from 1000
2011-06-08 11:56:23 +03:00
José Valim
47ac896936 Merge pull request #1549 from neerajdotname/rename_to_method_for_action
test name should reflect the name of the method
2011-06-08 00:41:55 -07:00
José Valim
2bf686f4db Merge pull request #1548 from neerajdotname/remove_class_me5
remove unused class from test
2011-06-08 00:30:11 -07:00
Neeraj Singh
8f3c9e87d9 test name should reflect the name of the method
that is actually being called
2011-06-08 03:17:27 -04:00
Neeraj Singh
cbfdd0df33 remove unused class from test 2011-06-08 02:54:19 -04:00
José Valim
c6503f48bd Merge pull request #1547 from sikachu/safebuffer
Fix ActionPack tests on `master`
2011-06-07 23:39:49 -07:00
José Valim
185235333c Merge pull request #1542 from cmeiklejohn/dont_gsub_on_safebuffer
Don't operate on the safebuffer, operate on a string and convert.
2011-06-07 23:32:03 -07:00
Prem Sichanugrist
1bbc51e5a7 Fix failing test on uninitialized Rails.config.assets.prefix
This was introduced in [2684f17a17e4f97bdb89d20b4cd08585235263a2] 💣
2011-06-08 02:30:50 -04:00
Prem Sichanugrist
9e2e242655 Add proper fix to mail_to helper.
* Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
* Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior.
2011-06-08 02:30:50 -04:00
Prem Sichanugrist
07f2481e15 Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform cloning before manipulation only on OutputBuffer.
After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223efbac6ad4d31ea33402892267bb77cb4] does not play nice with the String, and result in the fragment got lost.
2011-06-08 02:30:50 -04:00
José Valim
fcccfd7b6d Merge pull request #1535 from smartinez87/each
Prefer 'each' over 'for in' syntax.
2011-06-07 23:13:10 -07:00
Santiago Pastorino
1d3618a9b4 remove warning: assigned but unused variable 2011-06-08 00:26:09 -03:00
Santiago Pastorino
f2f63bf2ff ruby-prof doesn't work in 1.9.3 2011-06-08 00:25:57 -03:00
Aaron Patterson
80edbad786 Merge pull request #1539 from cmeiklejohn/fix_safe_buffer_in_fragment_caching
Fragment caching needs to operate on the pure output, not the safebuffer.
2011-06-07 20:25:11 -07:00
Christopher Meiklejohn
ef8b12a29e Don't operate on the safebuffer, operate on a string and convert. 2011-06-07 23:07:07 -04:00
Christopher Meiklejohn
823aa223ef Fragment caching needs to operate on the pure output, not the
safebuffer.
2011-06-07 22:36:51 -04:00
Vijay Dev
5c53754f33 fix generators guide url 2011-06-08 06:47:22 +05:30
Sebastian Martinez
49dcc4ff0c Prefer 'each' over 'for in' syntax. 2011-06-07 21:45:14 -03:00
Michael Koziarski
1300c03477 Ensure that the strings returned by SafeBuffer#gsub and friends aren't considered html_safe?
Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all.

Conflicts:

	activesupport/test/safe_buffer_test.rb
2011-06-07 17:02:48 -07:00
Vijay Dev
18d84e50a2 use git: rather than https: in git remote urls; else, github asks for passwords everytime we push 2011-06-08 05:06:58 +05:30
Jon Leighton
7d1782a2c1 Allow polymorphic has_one to work when the association is set before the owner has been saved. Fixes #1524. 2011-06-08 00:32:49 +01:00
Jon Leighton
4f5f6a3257 When you add a record to a polymorphic has_one, you should be able to access the owner from the associated record 2011-06-08 00:32:49 +01:00