Andrew White
e306ca3627
Refactor the handling of default_url_options in integration tests
...
This commit improves the handling of default_url_options in integration
tests by making behave closer to how a real application operates.
Specifically the following issues have been addressed:
* Options specified in routes.rb are used (fixes #546 )
* Options specified in controllers are used
* Request parameters are recalled correctly
* Tests can override default_url_options directly
2012-05-10 20:42:57 +01:00
Vijay Dev
5277d550d9
remove unnecessary 'examples' noise [ci skip]
2012-05-11 00:29:39 +05:30
José Valim
9b1eb4f1aa
Merge pull request #6253 from rafmagana/master
...
remove duplicate usage of Rack::Utils.status_code in LogSubscriber#process_action
2012-05-10 10:02:56 -07:00
Rafael Magana
32dd5fcaad
remove duplicate usage of Rack::Utils.status_code in LogSubscriber#process_action
2012-05-10 08:59:44 -07:00
José Valim
41420675fd
Merge pull request #6252 from grosser/unless_exist_for_memory_store
...
add unless_exist option to memory store
2012-05-10 08:57:59 -07:00
grosser
b5005b6259
add unless_exist option to memory store
2012-05-10 08:19:45 -07:00
José Valim
dd9ea8d4de
Merge pull request #6244 from frodsan/fix_build_remove_key
...
Remove key argument from run_callbacks to fix build
2012-05-10 01:33:47 -07:00
Francesco Rodriguez
039917b408
Remove key argument from run_callbacks to fix build
2012-05-10 03:29:46 -05:00
José Valim
ffa1c72d1d
Merge pull request #6242 from frodsan/fix_abstract_controller
...
Removing key argument from run_callbacks method in abstract_controller
2012-05-10 01:03:03 -07:00
Francesco Rodriguez
e471aacf60
removing key argument from run_callbacks - fix build
2012-05-10 02:56:36 -05:00
José Valim
a45a5d88e4
Merge pull request #6241 from frodsan/deprecate_key_callbacks
...
AS::Callbacks#run_callbacks remove key argument
2012-05-10 00:39:47 -07:00
Francesco Rodriguez
c1ce4144d1
AS::Callbacks#run_callbacks remove key argument
2012-05-10 02:21:03 -05:00
Jeremy Kemper
42a14c436c
Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rb
...
Rename variables and remove unused code in fixtures.rb
2012-05-09 19:01:03 -07:00
Piotr Sarnacki
ea40990f4b
Allow to run connection_adapters/quoting_test.rb
independently
2012-05-09 17:08:36 -07:00
Aaron Patterson
df0324f7dd
Merge pull request #5362 from zenprogrammer/quoting_bug
...
Fixed bug in ActiveRecord that caused classes to be quoted incorrectly
2012-05-09 16:12:07 -07:00
Aaron Patterson
9bf1a0db4a
Merge pull request #6226 from gnufied/master
...
Update tranasaction state when record gets commited
2012-05-09 14:42:48 -07:00
Alexey Muranov
12ceb4581a
Rename some variables
...
Rename some parameters and instance and local variables, mostly in fixtures.rb. Also remove an unused assignment to an instance variable.
There are minor code changes.
2012-05-09 18:46:13 +02:00
Vijay Dev
fed97091b9
Merge pull request #6227 from mjtko/changelog-fixes
...
Updated activesupport CHANGELOG
2012-05-09 07:22:29 -07:00
Hemant Kumar
041b6c6ccb
make both cached and record_updated accessors in one line
2012-05-09 18:43:18 +05:30
Hemant Kumar
1024c688a9
after_commit :on => :update should be called when save is
...
called from after_commit callback
2012-05-09 18:39:59 +05:30
Mark J. Titorenko
946875db22
Consistent CHANGELOG entry indentation.
2012-05-09 13:40:08 +01:00
Mark J. Titorenko
821771374f
Add CHANGELOG section for unreleased Rails 3.2.4; document addition of #beginning_of_hour and #end_of_hour to Time and DateTime core extensions.
2012-05-09 13:35:49 +01:00
Hemant Kumar
44d1804b0a
Fix transaction state not changing when after record gets commited
2012-05-09 17:32:15 +05:30
Andrew White
beea9f5d4e
Refactor Generator class to not rely on in-place editing the controller
2012-05-09 11:53:15 +01:00
Nikita Beloglazov
e154823935
Fix bug when url_for changes controller.
2012-05-09 11:53:14 +01:00
Alexey Muranov
caeca1f69b
Remove unused private method in fixtures.rb
...
Remove the unused private method ActiveRecord::Fixtures#yaml_fixtures_key(path).
2012-05-09 11:25:19 +02:00
Alexey Muranov
af44c2ba4a
Remove unused parameter in ::instantiate_fixtures
...
Second parameter of Fixtures::instantiate_fixtures was not used, so i removed it.
2012-05-09 11:25:19 +02:00
Vijay Dev
f1cc45e56a
fix a couple of formatting issues [ci skip]
2012-05-09 13:40:34 +05:30
Xavier Noria
ef9dd27223
registers ceb1dcc in the CHANGELOG
2012-05-09 00:47:45 +02:00
Vijay Dev
8a9e031bce
update some examples in asset tag helper docs [ci skip]
2012-05-09 01:41:22 +05:30
Vijay Dev
2882a3c827
remove redundant and stray line [ci skip]
2012-05-09 00:06:17 +05:30
Vijay Dev
7918d7bf5c
Merge branch 'master' of github.com:lifo/docrails
2012-05-08 23:56:25 +05:30
Vijay Dev
7e26f7f0f7
simplify the alias_attribute example [ci skip]
2012-05-08 23:54:47 +05:30
Vijay Dev
f31613a031
cut some duplication and minor edits [ci skip]
2012-05-08 23:49:20 +05:30
Mark J. Titorenko
e8c9aeca4e
Fix NumberHelper options wrapping to prevent verbatim blocks being rendered instead of line continuations. While I'm at it, wrap long comment lines consistently.
2012-05-08 15:44:30 +01:00
Edward Tsech
a9c27e7d5e
Add example for image_submit_tag with confirmation. [ci skip]
2012-05-08 16:29:24 +02:00
Xavier Noria
882e750cbe
Merge pull request #6205 from arunagw/humnans_txt_test
...
Adding test for humans.txt
2012-05-08 05:42:42 -07:00
Arun Agrawal
757a0ce6aa
Adding test for humans.txt
2012-05-08 18:02:25 +05:30
Xavier Noria
30f5b1a1cb
Merge pull request #2734 from paulca/humans
...
add humans.txt
2012-05-08 03:48:49 -07:00
Paul Campbell
ceb1dcc3db
add humans.txt
2012-05-08 11:44:58 +01:00
Edward Tsech
b3bd01c154
Add annotaion for class_eval in AbstractController#helper_method [ci skip]
2012-05-08 11:08:15 +02:00
José Valim
fc5c41e942
Merge pull request #6201 from whistlerbrk/master
...
Allow explicitly set content-type via head method when status code allows it according to the RFCs
2012-05-08 00:52:31 -07:00
Kunal Shah
c09a92fb9e
Add failing test re #3436 which demonstrates content_type is not respected when using the :head method/shortcut
2012-05-08 03:11:46 -04:00
Kunal Shah
3ca28dec0f
If content_type is explicitly passed to the :head method use the value or fallback
2012-05-08 03:11:17 -04:00
Edward Tsech
e8d1f10ac4
Improve readability of metaprogramming annotations at AbstractController callbacks.
2012-05-08 09:05:38 +02:00
Francesco Rodriguez
4831a895c4
added docs to alias_attribute method
2012-05-07 22:47:35 -05:00
Michael Koziarski
c52ba1b372
Merge pull request #5500 from panthomakos/load-all
...
Removed ActiveSupport#load_all!
2012-05-07 18:57:59 -07:00
Francesco Rodriguez
2805c28e3e
added docs to cattr_reader
2012-05-07 19:37:00 -05:00
Francesco Rodriguez
1ff3530488
better docs for cattr_accessor and cattr_writer
2012-05-07 19:04:27 -05:00
Francesco Rodriguez
2fb6d12ad3
added docs and examples to cattr_writer method
2012-05-07 17:33:54 -05:00