Commit Graph

35608 Commits

Author SHA1 Message Date
Jeremy Kemper
a0380e808d Prefer Ruby 2.0; require 1.9.3+ 2013-02-09 17:41:07 -07:00
Carlos Antonio da Silva
56f51888f1 Merge pull request #9234 from senny/9231_no_numbers_in_route_namespaces_allowed
The `:controller` option for routes can contain numbers. closes #9231.
2013-02-09 13:37:46 -08:00
Yves Senn
9e10d59199 the :controller option for routes can contain numbers. closes #9231. 2013-02-09 22:30:43 +01:00
Carlos Antonio da Silva
34238422b9 Merge pull request #9233 from rahul100885/master
Added notice message for destroy method in scaffold
2013-02-09 13:24:17 -08:00
Rahul P. Chaudhari
afdb84a1fe Added notice message for destroy method in scaffold 2013-02-10 01:19:02 +05:30
Guillermo Iguaran
9c5cc89ede Update activerecord/CHANGELOG.md 2013-02-09 12:23:32 -05:00
Guillermo Iguaran
1c2b185517 Merge pull request #9232 from robertomiranda/where-with-empty-hash
Use IN operator like Arel for empty hash in where clause
2013-02-09 09:22:27 -08:00
robertomiranda
34eee28264 Use IN operator like arel for empty hash in where clause 2013-02-09 12:20:25 -05:00
Carlos Antonio da Silva
da483d3f30 Add missing require to AP 2013-02-08 22:12:06 -02:00
Guillermo Iguaran
29f3a036e7 Reverting e170014113 (Change behaviour with empty hash in where clause) 2013-02-08 16:53:49 -05:00
Santiago Pastorino
b5645d0273 We don't need a CHANGELOG entry for an issue of something that was not released yet 2013-02-08 18:31:03 -02:00
Santiago Pastorino
86bfdbb509 Merge pull request #9196 from AndreyChernyh/fix-cookies-with-null-session
Fix #9168 Initialize NullCookieJar with all options needed for KeyGenerator
2013-02-08 12:27:11 -08:00
Santiago Pastorino
10d301e6ef Bump rack dependency to 1.5.2 2013-02-08 17:53:41 -02:00
Guillermo Iguaran
fa987cb8ec Reverting 16f6f25 (Change behaviour with empty array in where clause) 2013-02-08 14:22:10 -05:00
Andrey Chernih
4127332a5f Fix #9168 Initialize NullCookieJar with all options needed for KeyGenerator 2013-02-08 22:22:16 +04:00
Carlos Antonio da Silva
01e67316d8 Improve changelog entries in AR
Describe better the changes related to raising errors with empty
array/hash values in where clauses.

[ci skip]
2013-02-08 11:29:48 -02:00
Guillermo Iguaran
85e1c4a058 Merge pull request #9216 from robertomiranda/where-with-empty-array
Activer Record:  Change behaviour with empty array in where clause
2013-02-08 05:22:38 -08:00
robertomiranda
16f6f2592e Change behaviour with empty array in where clause 2013-02-08 06:37:30 -05:00
Michael Koziarski
bcf0e08a8d Merge pull request #9220 from robertomiranda/where-with-empty-hash
Active Record: Change behaviour with empty hash in where clause
2013-02-07 23:33:00 -08:00
robertomiranda
e170014113 Change behaviour with empty hash in where clause 2013-02-08 01:04:32 -05:00
Carlos Antonio da Silva
f1637492f1 Merge pull request #9185 from tricknotes/fix-article-for-generator-name
Fix article for generator name
2013-02-07 17:21:41 -08:00
Guillermo Iguaran
408227d9c5 Merge pull request #9207 from dylanahsmith/mysql-quote-numeric
active_record: Quote numeric values compared to string columns.
2013-02-07 12:16:53 -08:00
Carlos Antonio da Silva
dca0b57d03 Skip schema dumper extensions test if connection does not support it
Travis failed because the postgresql version installed there does not
support extensions, so we just need to skip this for now.
2013-02-07 08:33:35 -02:00
Dylan Smith
a712e08ebe active_record: Quote numeric values compared to string columns. 2013-02-07 04:59:33 -05:00
Carlos Antonio da Silva
1b75666f7f Run schema dumper extensions without creating real extensions
There is no need to create the extension in the database just to test if
it's dumped, we can stub that instead.
2013-02-06 23:03:48 -02:00
Carlos Antonio da Silva
86f4db97aa Do not print anything related to extensions when they don't none exist
When extensions are supported but there's no one enabled in the
database, we should not print anything related to them in schema.rb.
2013-02-06 22:57:10 -02:00
Carlos Antonio da Silva
73510b1fb2 Add blank line after extensions to separate from tables in schema 2013-02-06 22:49:00 -02:00
Carlos Antonio da Silva
3ee3eddf61 Fix indentation of extensions in schema 2013-02-06 22:47:23 -02:00
Carlos Antonio da Silva
f88c336e37 Call super to use the abstract adapter implementation instead 2013-02-06 22:42:29 -02:00
Carlos Antonio da Silva
7173919af9 Add changelog entry for #9203 about schema dumper with db extensions
[ci skip]
2013-02-06 22:42:29 -02:00
Aaron Patterson
34ac46ceeb Merge pull request #9203 from jaggederest/dumping_pgsql_extensions
Adding database extension support to schema.rb
2013-02-06 16:18:06 -08:00
Justin George
fba496f2c0 add ActiveRecord::AbstractAdapter#extensions and ActiveRecord::ConnectionAdapters::PostgreSQLAdapter#extensions to allow dumping of enabled extensions to schema.rb, add ActiveRecord::SchemaDumper#extensions to dump extensions to schema.rb 2013-02-06 16:01:25 -08:00
Justin George
e2fdfa9c07 improve tests to check for existence of extensions method, and skip testing dumped extensions if they are unsupported by the database 2013-02-06 16:01:25 -08:00
Justin George
c0990f040f Add some tests to enumerate how extensions should be stored in the schema output 2013-02-06 16:01:25 -08:00
Carlos Antonio da Silva
2f0c26bf59 Update changelog from #9128 with author name
And improve AS changelog a bit [ci skip]
2013-02-06 19:02:40 -02:00
Jeremy Kemper
c7598134a4 Merge pull request #9128 from jamesotron/iso8601-sub-second-accuracy
Modify TimeWithZone#as_json to return 3DP of sub-second accuracy.
2013-02-06 12:33:28 -08:00
Rafael Mendonça França
f14dcc058e Update actionpack/CHANGELOG.md
[ci skip]
2013-02-06 18:01:32 -02:00
Rafael Mendonça França
329c82380e Merge pull request #9039 from senny/warn_on_controller_option_with_ruby_constant_syntax
ruby constant syntax is not supported as routing `:controller` option.
2013-02-06 11:59:58 -08:00
Yves Senn
69f28a7d8d ruby constant syntax is not supported as routing :controller option.
The current implementation only works correctly if you supply the `:controller`
with directory notation (eg. `:controller => 'admin/posts'`).

The ruby constant notation (eg. `:controller => 'Admin::Posts`) leads to unexpected problems with `url_for`.

This patch prints a warning for every non supported `:controller` option. I also added documentation how
to work with namespaced controllers. The warning links to that documentation in the rails guide.
2013-02-06 20:56:09 +01:00
Ryunosuke SATO
3b7b887ac1 Fix article for generator name
Use 'some' instead of 'a/an'.
2013-02-07 01:41:02 +09:00
José Valim
99bb2fd892 Update .gitignore
Get rid of old .rvmrc and .rbenv-version files.
2013-02-05 14:03:13 -07:00
Rafael Mendonça França
b713f1b3cc Enable hstore extensions on tests if it is not enabled and database supports it 2013-02-05 17:47:50 -02:00
Rafael Mendonça França
655e95c8c3 Merge pull request #9192 from adammck/ignore-dot-ruby-version
Ignore .ruby-version
2013-02-05 09:00:16 -08:00
Adam Mckaig
36acc0a7f4 Ignore .ruby-version 2013-02-05 11:46:51 -05:00
Carlos Antonio da Silva
c163916810 Merge pull request #9178 from robertomiranda/best-standard-support-guide
Update upgrading guide with ActionDispatch::BestStandardsSupport removal [ci skip]
2013-02-04 15:50:10 -08:00
robertomiranda
ebcb53c1cf Update upgrading guide with ActionDispatch::BestStandardsSupport removal 2013-02-04 18:02:52 -05:00
Aaron Patterson
5efce21a80 Merge pull request #9177 from zenspider/master
Added test:all and test:all:db tasks to speed up full test runs
2013-02-04 14:59:44 -08:00
Ryan Davis
0e006373e0 Added test:all and test:all:db tasks to speed up full test runs.
Speed up depends on the number of test phases (N) you have for your
app, but it is roughly a 1/N improvement. In my app, it goes from
15.51s to 5.56s.

Inspired by http://ngauthier.com/2012/02/quick-tests-with-bash.html

Reviewed by @tenderlove
2013-02-04 14:50:04 -08:00
Guillermo Iguaran
cb48bbeb00 Merge pull request #9175 from robertomiranda/add--rc-desc
Add --rc description on the command line
2013-02-04 13:30:15 -08:00
robertomiranda
3a5b38bc3d Add --rc description on the command line 2013-02-04 16:25:44 -05:00