Rafael Mendonça França
d150387a38
Improve the CHANGELOG entry [ci skip]
2013-12-15 16:46:12 -02:00
Rafael Mendonça França
b0e06ec0da
Merge pull request #13312 from arthurnn/fix_db_task_req
...
db:test:clone and prepare must load environment
2013-12-15 10:45:03 -08:00
Guillermo Iguaran
0e5ef3f3ec
Merge pull request #13329 from robertomiranda/secret-token-docs
...
[ci-skip] Update secret_key_base Docs
2013-12-15 07:48:13 -08:00
robertomiranda
35d0d6fec5
Update secret_key_base Docs
2013-12-15 10:32:41 -05:00
Arthur Neves
2648819ef1
Regression test for load_structure and clone_structure
2013-12-14 18:00:17 -05:00
Arthur Neves
b3a806b7b2
db:test:clone and prepare must load environment
...
db:test:clone and db:test:prepare use
ActiveRecord::Base. configurations, so we need to load the rails
environment, otherwise the config wont be in place.
2013-12-14 17:33:50 -05:00
Robin Dupret
fc83efae51
Merge pull request #13181 from fluxusfrequency/patch-4
...
Clarification, grammar fixes, punctuation, and capitalization [ci skip]
2013-12-14 13:33:17 -08:00
Ben Lewis
f95d78e402
Word wrapping engines guide [ci skip]
2013-12-14 13:28:08 -07:00
Ben Lewis
39eb10c3b5
Clarification, grammar fixes, punctuation, and capitalization [ci skip]
2013-12-14 13:27:45 -07:00
Guillermo Iguaran
badcd7bb00
Merge pull request #13325 from kuldeepaggarwal/docs-update
...
Improved documents [ci skip]
2013-12-14 09:40:11 -08:00
Kuldeep Aggarwal
e10f91000b
Improved documents [ci skip]
2013-12-14 22:49:00 +05:30
Rafael Mendonça França
068237d02f
Merge pull request #13324 from fphilipe/fix-syntax-error-in-example
...
Fix syntax error in redirect_to example
2013-12-14 07:18:20 -08:00
Philipe Fatio
fd76b9d546
Fix syntax error in redirect_to example
...
Without parenthesis, ruby assumes that curly braces denote the beginning
of a block.
2013-12-14 15:35:50 +01:00
Godfrey Chan
068580d445
Merge pull request #13316 from JuanitoFatas/working-with-js
...
Improve document: working with javascript in rails [ci skip].
2013-12-14 03:30:29 -08:00
Juanito Fatas
02caba2b86
Improve document: working with javascript in rails [ci skip].
...
* Add form_tag generated output.
* improve some text.
* data-remote='true' should use double quotes.
2013-12-14 19:22:04 +08:00
Rafael Mendonça França
12affbe491
Fix typo [ci skip]
2013-12-13 18:33:30 -02:00
Guillermo Iguaran
eed8c85f4b
Merge pull request #13298 from rails/secret_tokens
...
Create config/secrets.yml file for store of tokens
2013-12-13 09:48:34 -08:00
Guillermo Iguaran
c1f4bc2628
Add comment about secret_key_base in secrets.yml
2013-12-13 12:47:37 -05:00
Rafael Mendonça França
92b92f1782
Merge pull request #13309 from arunagw/warning-fix-argumnet
...
argument prefix warning removed
2013-12-13 08:24:45 -08:00
Arun Agrawal
c2f1796c6d
argument prefix warning removed
...
* interpreted as a argument prefix
2013-12-13 17:19:20 +01:00
Rafael Mendonça França
1713e8fe16
Merge pull request #13306 from kassio/master
...
Fix mysql to support duplicated column names
2013-12-13 05:55:54 -08:00
Kassio Borges
b8569b9337
Fix mysql to support duplicated column names
...
This will fix the [broken
test](4a26508366
)
`test_with_limiting_with_custom_select`.
The query's result was built in a hash with column name as key, if the
result have a duplicated column name the last value was
overriding the first one.
2013-12-13 11:55:13 -02:00
Yves Senn
63f9a7507b
refactor, reuse assertions in range_test.rb.
2013-12-13 14:28:13 +01:00
Yves Senn
c4044b2f8a
extract PG range tests from datatype_test.rb into range_test.rb
2013-12-13 14:17:21 +01:00
Yves Senn
7ce846c177
Merge pull request #13305 from psahni/form_tag_with_parameters
...
form_tag with parameters fixed [ci skip]
2013-12-13 00:59:46 -08:00
Prashant Sahni
330883196b
form_tag with parameters fixed [ ci skip ]
2013-12-13 14:03:44 +05:30
Arun Agrawal
9b8f7e0303
Merge pull request #13303 from dvsuresh/typo_postgresqlyml
...
Correct comment in databases/postgresql.yml [ci skip]
2013-12-12 22:00:50 -08:00
Jeremy Kemper
0b142a6f84
Add a bunch of Relation -> Array delegate methods to the whitelist. This won't last - aim to switch back to a blacklist for mutator methods.
2013-12-12 21:10:03 -07:00
DV Suresh
8ffe2f0d77
Correct comment in databases/postgresql.yml
2013-12-12 21:40:41 -06:00
Jeremy Kemper
b474d06d5e
Perf: save ~9% of object allocations on heavy requests.
...
The per-thread registry is keyed on the class name, and each request for
the class name returns a new string. This is in the hot path for a lot
of Active Record behavior, so we easily accumulate thousands of repeated
strings.
To fix, we simply cache the key when the class is first extended with
the module.
TODO: Eliminate this module. The per-thread instance concept is common,
but this technique confuses and obfuscates.
2013-12-12 18:53:32 -07:00
Lauro Caetano
17922930c3
Merge pull request #13302 from afshinator/master
...
fix grammatical error
2013-12-12 15:14:49 -08:00
Afshin Mokhtari
6353ea4746
fix grammatical error
2013-12-12 17:52:18 -05:00
Rafael Mendonça França
81433addc2
Merge pull request #12590 from laurocaetano/whitelist-to-delegate-array-methods
...
Create a whitelist of methods to be delegated to Array.
2013-12-12 14:42:39 -08:00
Aaron Patterson
94cd08be38
extract cache counter logic to one method
2013-12-12 14:33:02 -08:00
Aaron Patterson
e2be6eacb8
remove duplicate code
2013-12-12 14:33:01 -08:00
Aaron Patterson
45940e7112
extract a method for updating without a record object
2013-12-12 14:33:01 -08:00
Aaron Patterson
9798a11c2b
extract methods out of the cache update method
2013-12-12 14:33:01 -08:00
Aaron Patterson
6772d5e74a
pull a nil check up one frame
2013-12-12 14:33:01 -08:00
Lauro Caetano
1244aa7c5f
Use public_send
instead of just use send
.
2013-12-12 20:19:04 -02:00
Guillermo Iguaran
bb7537bc87
Rename tokens.yml to secrets.yml
2013-12-12 17:05:52 -05:00
Lauro Caetano
aa85bdba68
Use a whitelist to delegate methods to array
2013-12-12 19:34:47 -02:00
laurocaetano
e87c3da2a2
Add changelog
2013-12-12 19:34:47 -02:00
laurocaetano
d1987846b3
Remove delegation test.
...
This test was removed, since Relation will not delegate class
methods to Array.
2013-12-12 19:31:48 -02:00
Xavier Noria
a176bd095c
docs guidelines: recommends wording in a way that avoids "you"s and "your"s
2013-12-12 21:48:33 +01:00
Xavier Noria
6814c78b67
copy-edits 68abbac [ci skip]
...
* Rewording to avoid "you"s.
* Suggest as first natural alternative to refactor the block
to evaluate to the returned value.
* Removes the quotes around "filters", since that is a common
work in our jargon.
2013-12-12 21:22:37 +01:00
Rafael Mendonça França
b34352e425
Merge pull request #13255 from strzalek/bump-builder
...
Bump up builder
2013-12-12 12:22:21 -08:00
Aaron Patterson
ab11742448
Merge pull request #13300 from chancancode/add_nodoc_am_dirty_methods
...
Added :nodoc: for `attribute_changed?` and `attribute_was` [ci skip]
2013-12-12 12:05:39 -08:00
Godfrey Chan
f650981483
Added :nodoc: for attribute_changed?
and attribute_was
[ci skip]
...
These methods were made "public" in 47617ecd so that `method_missing`
can invoke them without going through `send`, but they aren't meant
for consumption from outside of Rails.
2013-12-12 12:04:07 -08:00
Guillermo Iguaran
39fd0be766
Add test for custom tokens stored in config/tokens.yml
2013-12-12 14:59:11 -05:00
Guillermo Iguaran
4043147792
Replace config.secret_key_base with secrets.secret_key_base in test
2013-12-12 14:59:11 -05:00