Rafael Mendonça França
274d5e45e0
Merge pull request #14329 from pch/digestor-lookup-fix
...
Ensure LookupContext in Digestor selects correct variant
2014-03-14 14:58:34 -03:00
Rafael Mendonça França
b4c96490ee
Take in consideration guides CHANGELOG
2014-03-14 14:52:17 -03:00
Rafael Mendonça França
d153355d35
Match the whole string
2014-03-14 14:49:46 -03:00
Rafael Mendonça França
eaa19cc576
Force sass-rails ~> 4.0.2 to avoid sprockets compatibility error
...
See https://github.com/rails/sass-rails/issues/191 for more information
2014-03-14 13:20:16 -03:00
Carlos Antonio da Silva
13cdb5fb49
Avoid duplicated conditionals
2014-03-14 10:41:02 -03:00
Łukasz Strzałkowski
2c2326e6ea
Introduce #with_formats_and_variants to prevent problems with mutating finder object
2014-03-14 13:41:06 +01:00
Łukasz Strzałkowski
9f677bf043
Add mocked disable_cache for FixtureFinder
2014-03-14 13:18:21 +01:00
Łukasz Strzałkowski
03b8922ee4
Set format in finder
2014-03-14 13:18:21 +01:00
Łukasz Strzałkowski
3b9daf0ff9
Rename _setup_options to _options_for_digest
2014-03-14 13:18:20 +01:00
Łukasz Strzałkowski
4725d58896
Disable LookupContext's cache when looking for template
2014-03-14 13:18:20 +01:00
Łukasz Strzałkowski
48a6baea5e
Don't pass hash as keys to #find method
2014-03-14 13:18:20 +01:00
Łukasz Strzałkowski
c63b18de18
Add variants to Template class
2014-03-14 13:18:14 +01:00
Godfrey Chan
3560d7aad7
Merge pull request #14378 from afshinator/master
...
Fix probs in sections 5.6 and 5.9; [ci skip]
2014-03-13 14:24:20 -07:00
Afshin Mokhtari
4d1bc027e1
Fix probs in sections 5.6 and 5.9; [ci skip]
2014-03-13 20:28:02 +00:00
Rafael Mendonça França
a0936a1635
No need to binds be optional
2014-03-13 16:53:05 -03:00
Rafael Mendonça França
b4d4d93d6c
Merge pull request #14372 from arthurnn/fix_query_cache_binds
...
Make select_all on query cache accept a Relation without binds.
2014-03-13 16:28:08 -03:00
Godfrey Chan
229dd87717
Merge pull request #14376 from laurocaetano/test-deprecation-warning-for-find
...
Add test for deprecation warning for passing an AR object to `find`.
2014-03-13 12:13:14 -07:00
Lauro Caetano
a9023eccd6
Add test for deprecation warning for passing an AR object to find
.
2014-03-13 16:10:04 -03:00
Aaron Patterson
f8fb1fa67a
Merge pull request #14375 from laurocaetano/test-deprecation-warning-for-exists
...
Add test for deprecation warning for passing an AR object to `exists?`.
2014-03-13 12:05:27 -07:00
Aaron Patterson
499c6aa684
require actions rather than create_file
...
thor's create_file seems to have a circular dependency on itself when
used with our constant loading stuff.
fixes #14319
2014-03-13 12:02:32 -07:00
Arthur Neves
433b19d7e8
Make select_all on query cache accept a Relation without binds.
...
[fixes #14361 ]
[related #13886 ]
2014-03-13 15:01:37 -04:00
Lauro Caetano
d3d3d07d99
Test deprecation warning for passing an ActiveRecord object to
...
`exists?`
2014-03-13 15:59:54 -03:00
Aaron Patterson
d35f0033c7
passing an instance of an AR object to find
is deprecated
...
please pass the id of the AR object by calling `.id` on the model first.
2014-03-13 11:47:12 -07:00
Aaron Patterson
d92ae6ccca
passing an ActiveRecord object to exists?
is deprecated.
...
Pass the id of the object to the method by calling `.id` on the AR
object.
2014-03-13 11:40:35 -07:00
Aaron Patterson
e88da370f1
make tests pass on Ruby 2.2
...
Apparently we've been using a buggy feature for the past 6 years:
https://bugs.ruby-lang.org/issues/9593
2014-03-13 10:55:52 -07:00
Łukasz Strzałkowski
0ca6836a5a
Don't create addition vars, use options[] directly
2014-03-13 17:53:23 +01:00
Łukasz Strzałkowski
f72feae9ba
Don't pass variant in params, it's ignored
...
We're setting variant above, in request object directly
2014-03-13 17:53:11 +01:00
Julian Simioni
15720df180
Use Sqlite3 adapter in examples
...
Two bits of example code use sqlite as an adapter, which doesn't exist.
Using the code verbatim will raise a LoadError exception:
ActiveRecord::Base.establish_connection(
"adapter" => "sqlite",
"database" => "db.sqlite"
)
# => LoadError: Could not load 'active_record/connection_adapters/sqlite_adapter'...
Considering this is code a lot of people new to Rails might be running,
it's especially confusing.
Closes #14367 [ci skip]
2014-03-12 22:35:28 -03:00
Aaron Patterson
3df07d093a
use the body proxy to freeze headers
...
avoid freezing the headers until the web server has actually read data
from the body proxy. Once the webserver has read data, then we should
throw an error if someone tries to set a header
2014-03-12 17:40:08 -07:00
Aaron Patterson
c0a783610f
just ask the response for the commit status, we do not need to ask the jar
2014-03-12 16:21:01 -07:00
Aaron Patterson
77a09218f6
only write the jar if the response isn't committed
...
when streaming responses, we need to make sure the cookie jar is written
to the headers before returning up the stack. This commit introduces a
new method on the response object that writes the cookie jar to the
headers as the response is committed. The middleware and test framework
will not write the cookie headers if the response has already been
committed.
fixes #14352
2014-03-12 16:07:26 -07:00
Lauro Caetano
f6da9924b0
Merge pull request #14366 from sukolsak/grammar
...
Fix a grammatical error in the i18n guide
2014-03-12 19:14:04 -03:00
sukolsak
69ba49dd85
Fix a grammatical error in the i18n guide [ci skip]
2014-03-12 15:03:04 -07:00
Arthur Nogueira Neves
06934945e4
Merge pull request #14364 from why-el/better-docs-for-update-attribute
...
Enhance docs for update_attribute [skip ci]
2014-03-12 17:48:23 -04:00
Aaron Patterson
28d05f0a80
use method_defined? to check whether or not a method is defined
2014-03-12 13:34:07 -07:00
Rafael Mendonça França
81d08abccc
Merge pull request #14363 from arthurnn/usec_tests_mysql56
...
Add more tests for mysql 5.6 microseconds + Fix tests
2014-03-12 14:07:10 -03:00
Mohamed Wael Khobalatte
40847a7831
Enhance docs for update_attribute [ci-skip]
2014-03-12 17:49:23 +01:00
Arthur Neves
7058321725
Change usec to 0 on tests that compare seconds
...
Avoid rounding problems with `.usec` method rounding the seconds when the
field doesn't persist the `.usec` piece.
2014-03-12 11:52:39 -04:00
Arthur Neves
66d61ab63b
Unit test for mysql quote time usec
2014-03-12 11:50:50 -04:00
Rafael Mendonça França
591b8f395d
Merge pull request #13040 from kamipo/case_sensitive_comparison
...
Only use BINARY for mysql case sensitive uniqueness check when column has a case insensitive collation.
Conflicts:
activerecord/CHANGELOG.md
2014-03-12 10:51:10 -03:00
Rafael Mendonça França
79ceae6241
Merge pull request #14359 from arthurnn/mysql2_56_franc_sec
...
MySQL 5.6 Fractional Seconds
2014-03-12 10:24:50 -03:00
Arthur Neves
2ed1cbba52
Changelog entry for mysql56 microseconds
2014-03-12 09:20:22 -04:00
Arthur Neves
5a934e6787
Test microsecond on mysql 5.6
2014-03-12 09:06:12 -04:00
Tatsuhiko Miyagawa
df5a38fc6a
MySQL 5.6 and later supports microsecond precision in datetime.
...
You might want to branch it to include this only for 5.6, but
passing these values to < 5.6 doesn't cause issues either.
2014-03-12 09:02:20 -04:00
Yves Senn
7bbdb076c0
Merge pull request #14291 from laurocaetano/doc-for-original-fullpath
...
Add documentation for original_fullpath. [ci skip]
2014-03-12 08:41:45 +01:00
Lauro Caetano
0d191baa82
[ci skip] Add documentation for original_fullpath.
2014-03-11 20:11:53 -03:00
Rafael Mendonça França
7e21be3c29
Merge pull request #14353 from arthurnn/remove_small_mock
...
Remove mocking on save, when not necessary
2014-03-11 15:16:42 -03:00
Arthur Neves
3c23f76844
Remove mocking on save, when not necessary
2014-03-11 14:07:29 -04:00
Godfrey Chan
ccaf0ed791
Merge pull request #14345 from arthurnn/revert_14052
...
Fixes STI when 2+ levels deep.
2014-03-11 07:25:36 -07:00
Yves Senn
6868265fe3
comment why we are modifying global state. [ci skip]
2014-03-11 08:34:51 +01:00