Santiago Pastorino
5843069e7e
Rack body respond to each and not to join
...
This fixes undef `to_str' for Rack::Chunked::Body when using
caches_action + streaming on an action
Closes #5027
2012-02-14 21:53:15 -02:00
Vijay Dev
4baaf0a0fe
CSS fix for guides. Closing #5028 [ci skip]
...
In Ubuntu Chrome, in the last lines of code blocks, the underscore isn't
visible. Increasing the line height slightly seems to fix this. This
problem doesn't exist in Firefox even on Ubuntu. Too lazy to test in
any other OS-browser combo :)
2012-02-15 02:37:07 +05:30
Vijay Dev
4f6d310110
Merge pull request #5042 from parndt/patch-2
...
"Or" was not meaningful anymore, per dad7fdc5734a3813246f238ac5760b2076932216
2012-02-14 12:41:18 -08:00
Philip Arndt
8b88a20e29
"Or" was not meaningful anymore, per dad7fdc5734a3813246f238ac5760b2076932216
2012-02-15 09:21:21 +13:00
Aaron Patterson
848c3d4ea3
Merge pull request #3544 from amatsuda/_field_changed
...
Rename field_changed? to _field_changed? so that users can create a field named field
2012-02-14 08:47:42 -08:00
José Valim
abdff445fb
Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo
...
Always reenable _dump task in AR databases rake. Closes #5030
2012-02-14 03:10:22 -08:00
José Valim
fa04a737d5
Merge pull request #5039 from funny-falcon/fix_callback
...
sync __run_callbacks with ruby-trunk
2012-02-14 03:09:55 -08:00
Sokolov Yura
1076c88784
sync __run_callbacks with ruby-trunk
...
https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580
In this revision behavior of respond_to? had changed: now to ask about
protected method one should pass second argument `true`
2012-02-14 15:05:45 +04:00
Carlos Antonio da Silva
4b44c20e5a
Always reenable _dump task in AR databases rake. Closes #5030
...
This allows the internal :_dump task to be called as many times as
required. For instance, `rake db:migrate:redo` calls two tasks that
internally call :_dump, and without reenabling it to be reinvoked,
the database was left in incorrect state.
2012-02-14 09:00:19 -02:00
José Valim
7f6ee93b0e
Merge pull request #5036 from carlosantoniodasilva/form-button
...
Remove not used button translation from av locale
2012-02-14 02:24:18 -08:00
Carlos Antonio da Silva
bb461248f0
Remove not used button translation from av locale
2012-02-14 08:00:42 -02:00
José Valim
65ffcec5a6
Merge pull request #5032 from carlosantoniodasilva/collection-helpers-object
...
Allow collection helpers with block to access current object in the collection
2012-02-14 01:28:22 -08:00
Akira Matsuda
bdb6c4ef86
A test case for GH #3544 to ensure that a field named field works fine
2012-02-14 17:14:22 +09:00
Akira Matsuda
0bd44f9159
Rename field_changed? to _field_changed? so that users can create a field named field
2012-02-14 16:49:57 +09:00
José Valim
c5b90a6ab1
Merge pull request #5035 from lest/patch-1
...
remove unnecessary require core_ext/string/encoding
2012-02-13 23:21:02 -08:00
Sergey Nartimov
b5f5e279a6
remove unnecessary require core_ext/string/encoding
2012-02-14 10:09:21 +03:00
Jeremy Kemper
bd90f9e95d
Merge pull request #3305 from cjolly/request_filtered_env
...
Exclude rack.request.form_vars from request.filtered_env
2012-02-13 21:04:01 -08:00
Carlos Antonio da Silva
a10ed70999
Allow collection helpers with block to access current object in the collection
...
This gives a lot more flexibility to the user, for instance to generate
a collection of check boxes and labels, allowing to add custom classes
or data-* attributes to the label/check_box using another object
attribute.
This basically mimics options_for_select functionality that accepts a
third option for each item to generate html attributes for each option.
2012-02-13 22:48:48 -02:00
Jeremy Kemper
11d1bdc09e
Merge pull request #5031 from carlosantoniodasilva/sprockets-compressors-refactor
...
Sprockets compressors refactor
2012-02-13 15:32:47 -08:00
Carlos Antonio da Silva
6960e481cb
Use Hash#fetch instead of testing for #key?
2012-02-13 20:37:02 -02:00
Carlos Antonio da Silva
9b9838ec4b
Refactor sprockets compressors module
2012-02-13 20:37:02 -02:00
Santiago Pastorino
10cf66c034
Merge pull request #5026 from castlerock/remove_require_for_string_encoding
...
remove unused require for string encoding
2012-02-13 14:18:31 -08:00
Aaron Patterson
957da55702
Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare
...
Fix usage of psql in db:test:prepare
2012-02-13 11:01:02 -08:00
Vishnu Atrai
a9e18df9c2
remove unwanted require for string encoding
2012-02-13 23:24:30 +05:30
Aaron Patterson
04c0aea47a
Merge pull request #5000 from flavorpill/master-with-multidb-association-fix
...
Fix associations with per-class/multiple database connections
2012-02-13 09:11:33 -08:00
Aaron Patterson
3a5a01f7f6
Merge pull request #5012 from waseem/alias-reconnect-mysql2
...
Alias reconnect! to reset! for Mysql2 adapter since they have same behavior.
2012-02-13 09:05:29 -08:00
Aaron Patterson
9bcfb1a974
Merge pull request #5018 from hammerdr/issue-4659-docs
...
Adding documentation to clarify usage of attributes hash.
2012-02-13 09:00:59 -08:00
José Valim
804135be91
Merge pull request #5024 from carlosantoniodasilva/amo-serializable-hash-string-keys
...
Fix ActiveModel serializable hash to return string keys with :methods
2012-02-13 05:43:36 -08:00
Carlos Antonio da Silva
ad9f968c4a
Make sure serializable hash with :methods option returns always string keys
2012-02-13 11:22:59 -02:00
Carlos Antonio da Silva
5bcb4e3c18
Cleanup extra spaces
2012-02-13 11:20:19 -02:00
José Valim
400bcaef19
Merge pull request #5016 from exviva/form_helper_date_fields
...
Add HTML5 input[type="date"] helper
2012-02-12 22:47:43 -08:00
José Valim
97f7f30872
Merge pull request #5021 from tchandy/clean_controller_tests
...
Removing old Controller test
2012-02-12 22:44:35 -08:00
Xavier Noria
6bd7023e2f
prefer tr to gsub for replacing characters
2012-02-12 16:59:51 -08:00
Xavier Noria
5cff94fd85
inflection regexp are meant to be applied once
2012-02-12 16:57:47 -08:00
Xavier Noria
dc03a2f56c
removes redundant argument
2012-02-12 16:45:14 -08:00
Xavier Noria
d3071db120
boosts inflections
...
The impact of this change has been measured pluralizing
the entire /usr/share/dict/words, showing a 6x speedup
2012-02-12 15:58:10 -08:00
Thiago Pradi
c6e6598d96
Removing old Controller test
2012-02-12 21:05:30 -02:00
Olek Janiszewski
d6b26a6040
Add HTML5 input[type="date"] helper
2012-02-12 16:23:43 +01:00
Derek Hammer
a3a1a6f9ed
Missed a code example. Fixing the docs to be consistant.
2012-02-12 08:17:18 -06:00
Derek Hammer
a469ec787c
Adding documentation to clarify usage of attributes hash.
...
Serialization uses only the attributes hash's keys and calls
methods that are of the same name as the keys on the serialized
object.
2012-02-12 08:08:09 -06:00
José Valim
815e445331
Merge pull request #5015 from castlerock/revert_PR_5001_fix_isolated_test_run
...
TO make build green Revert PR#5001 "removed unuseful require for reply as we are not using require model"
2012-02-12 03:20:24 -08:00
Vishnu Atrai
33e37b89fb
Revert PR#5001 "removed unuseful require for reply as we are not using require model"
...
This reverts commit 7381596ea32aff47222af89e4bc66000f4597acb.
2012-02-12 16:07:51 +05:30
Xavier Noria
8671802fe8
Merge pull request #5014 from castlerock/fix_build_PR_5001
...
fix build #5001 , model reply is required in cases/primary_keys_test too! for isolated test
2012-02-12 02:02:24 -08:00
Vishnu Atrai
ed8fc19c6a
fix build 5001, model reply is required in cases/primary_keys_test too!
2012-02-12 14:02:24 +05:30
José Valim
730d8a55ee
Merge pull request #5013 from castlerock/fix_build_pull_5001
...
fix build #5001 , reply model required in relations_test
2012-02-12 00:10:26 -08:00
Vishnu Atrai
a62088a4da
fix build #5001 reply model required in relations_test
2012-02-12 13:35:50 +05:30
Waseem Ahmad
caa21e42b8
Alias reconnect! to reset! for Mysql2 adapter since they have same
...
behavior.
2012-02-12 12:07:45 +05:30
José Valim
d822a651c2
Merge pull request #5010 from tchandy/clean_routing_tests
...
Cleaning Route generation tests
2012-02-11 22:30:51 -08:00
Thiago Pradi
c0a1a86693
Cleaning Route generation tests
2012-02-12 03:09:03 -02:00
Xavier Noria
5138a8f254
Merge pull request #5006 from lest/patch-1
...
handle id attribute in PrimaryKey module
2012-02-11 11:14:00 -08:00