Commit Graph

30279 Commits

Author SHA1 Message Date
Francesco Rodriguez
84784b4f23 added docs to String#first 2012-05-11 12:20:57 -05:00
Francesco Rodriguez
07045fa919 added docs to String#from 2012-05-11 11:47:40 -05:00
Francesco Rodriguez
0822dc01f6 improve String#to docs 2012-05-11 11:41:22 -05:00
Francesco Rodriguez
315350847f added docs to String#to 2012-05-11 11:35:26 -05:00
Eric Carty-Fickes
7d07666e62 Merge branch 'master' of https://github.com/lifo/docrails 2012-05-11 11:16:35 -05:00
Eric Carty-Fickes
1004ccc84b Clarify expire_action with namespaced controllers 2012-05-11 11:12:32 -05:00
Francesco Rodriguez
7ce4ce33c7 added docs to String#at 2012-05-11 10:51:36 -05:00
Hrvoje Šimić
1b956700ee better wording 2012-05-11 16:27:21 +02:00
Egor Homakov
5613fb0b87 Update railties/lib/rails/application/bootstrap.rb 2012-05-11 18:11:58 +04:00
Hrvoje Šimić
bd2b1c126b missing 'with' 2012-05-11 16:09:10 +02:00
Elia Schito
24e4bc31b9 Move HTTP Token auth docs above the Token module 2012-05-11 14:47:26 +02:00
Xavier Noria
b892b4c08f Merge pull request #6269 from edtsech/hash-except-test
Add test Hash#except can receive more than one argument.
2012-05-11 05:18:15 -07:00
Edward Tsech
21190f37f8 Test Hash#except can receive more than one argument. 2012-05-11 14:09:55 +02:00
Egor Homakov
d4f4b858d3 Update guides/source/configuring.textile 2012-05-11 15:40:03 +04:00
Egor Homakov
c9a4e65217 Update guides/source/configuring.textile 2012-05-11 14:48:02 +04:00
José Valim
fe3b742bd6 Merge pull request #6268 from carlesso/master
In robots.txt User-agent should be all downcase except for the first 'U'
2012-05-11 03:23:51 -07:00
Enrico Carlesso
1abf15657b In robots.txt, User-agent should be all downcase except for the first 'U', according with http://en.wikipedia.org/wiki/Robots_exclusion_standard 2012-05-11 11:50:15 +02:00
Edward Tsech
1065ef8fd3 Fix copypaste. [ci skip] 2012-05-11 11:11:41 +02:00
Andrew White
9b4514c3b8 Copy literal route constraints to defaults - fixes #3571 and #6224. 2012-05-11 07:29:17 +01:00
David Padilla
0d48b12fc5 Fixes issue #6251
Plugin generator crashes when using the --dummy-path option

Code was assuming the application name in `config/application.rb`
was module Dummy.
2012-05-10 17:37:12 -07:00
Piotr Sarnacki
b14d1cd8ae Failing test for #6251 2012-05-10 17:37:12 -07:00
Andrew White
fa21b73ebb Return false for exists? with new records - fixes #6199. 2012-05-10 23:16:40 +01:00
Andrew White
09a48b2324 Don't ignore nil positional arguments for url helpers - fixes #6196. 2012-05-10 22:52:00 +01:00
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
Ben Wilhelm
c8f5a216df Modified template in sample is new.html.erb, not index.html.erb 2012-05-10 11:15:32 -07:00
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
Francesco Rodriguez
6cbe8dab1e deleting empty lines in docs parts 2012-05-10 02:09:59 -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
Nick Novitski
3a6ffbbe42 remove inappropriate comma
A qualifying clause beginning with words like "as", "if", or "although" should have a comma separating it from any following clauses in a sentence, but should not have a comma immediately after the beginning word, unless it is to separate a third, non-essential clause.  

Example 1: "Although I would quite like to go to lunch with you, I find myself instead writing a detailed commit message to justify a single-character documentation change."

Example 2: "Despite, as you might well imagine, wishing I hadn't even noticed it in the first place, I still felt the error was worth correcting."
2012-05-09 13:20:19 -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