rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Merge pull request #9240 from tricknotes/supress-warning	Guillermo Iguaran	2013-02-10	1	-0/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Supress warning about method redifinition
\| * \| \| \| \| \| \|	Supress warning about method redifinition	Ryunosuke SATO	2013-02-11	1	-0/+2
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In i18n gem, the following methods are defined. - `Hash#except` - `Hash#slice` But if there are defined already, i18n skips these definitions. So these definition by `active_support` are required before `require 'i18n'`.
* \| \| \| \| \| \|	Merge pull request #9238 from norman/unicode_62	Carlos Antonio da Silva	2013-02-10	2	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update to latest Unicode data.
\| * \| \| \| \| \| \|	Update to latest Unicode data.	Norman Clarke	2013-02-10	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Release notes at: http://www.unicode.org/versions/Unicode6.2.0/
* \| \| \| \| \| \| \|	Merge pull request #8643 from tricknotes/remove-method-redefined-warning	Andrew White	2013-02-10	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove method redefined warning
\| * \| \| \| \| \| \| \|	Remove method redefined warning	Ryunosuke SATO	2013-02-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In `i18n` gem, the method definition of `Hash#deep_merge!` is skipped when it is already defined. - warning: method redefined; discarding old deep_merge!
* \| \| \| \| \| \| \| \|	Merge pull request #7730 from beyond/gzip	Xavier Noria	2013-02-10	3	-2/+25
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added compress options for gzip
\| * \| \| \| \| \| \| \| \|	added compress options for gzip	Beyond	2013-02-10	3	-2/+25
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added test for compress options of gzip update changelog
* \| \| \| \| \| \| \| \|	Prefer Ruby 2.0; require 1.9.3+	Jeremy Kemper	2013-02-09	4	-9/+9
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #9234 from senny/9231_no_numbers_in_route_namespaces_allowed	Carlos Antonio da Silva	2013-02-09	2	-1/+13
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `:controller` option for routes can contain numbers. closes #9231.
\| * \| \| \| \| \| \| \| \|	the `:controller` option for routes can contain numbers. closes #9231.	Yves Senn	2013-02-09	2	-1/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #9233 from rahul100885/master	Carlos Antonio da Silva	2013-02-09	3	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Added notice message for destroy method in scaffold
\| * \| \| \| \| \| \| \| \|	Added notice message for destroy method in scaffold	Rahul P. Chaudhari	2013-02-10	3	-1/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Update activerecord/CHANGELOG.md	Guillermo Iguaran	2013-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #9232 from robertomiranda/where-with-empty-hash	Guillermo Iguaran	2013-02-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Use IN operator like Arel for empty hash in where clause
\| * \| \| \| \| \| \| \| \|	Use IN operator like arel for empty hash in where clause	robertomiranda	2013-02-09	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Add missing require to AP	Carlos Antonio da Silva	2013-02-08	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Reverting e170014113 (Change behaviour with empty hash in where clause)	Guillermo Iguaran	2013-02-08	3	-12/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	We don't need a CHANGELOG entry for an issue of something that was not ↵	Santiago Pastorino	2013-02-08	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	released yet
* \| \| \| \| \| \| \| \|	Merge pull request #9196 from AndreyChernyh/fix-cookies-with-null-session	Santiago Pastorino	2013-02-08	4	-5/+49
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #9168 Initialize NullCookieJar with all options needed for KeyGenerator
\| * \| \| \| \| \| \| \| \|	Fix #9168 Initialize NullCookieJar with all options needed for KeyGenerator	Andrey Chernih	2013-02-08	4	-5/+49
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Bump rack dependency to 1.5.2	Santiago Pastorino	2013-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Reverting 16f6f25 (Change behaviour with empty array in where clause)	Guillermo Iguaran	2013-02-08	6	-14/+13
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Improve changelog entries in AR	Carlos Antonio da Silva	2013-02-08	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Describe better the changes related to raising errors with empty array/hash values in where clauses. [ci skip]
* \| \| \| \| \| \| \| \|	Merge pull request #9216 from robertomiranda/where-with-empty-array	Guillermo Iguaran	2013-02-08	6	-13/+14
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Activer Record: Change behaviour with empty array in where clause
\| * \| \| \| \| \| \| \| \|	Change behaviour with empty array in where clause	robertomiranda	2013-02-08	6	-13/+14
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #9220 from robertomiranda/where-with-empty-hash	Michael Koziarski	2013-02-07	3	-3/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Active Record: Change behaviour with empty hash in where clause
\| * \| \| \| \| \| \| \| \|	Change behaviour with empty hash in where clause	robertomiranda	2013-02-08	3	-3/+11
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #9185 from tricknotes/fix-article-for-generator-name	Carlos Antonio da Silva	2013-02-07	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|	Fix article for generator name
\| * \| \| \| \| \| \| \|	Fix article for generator name	Ryunosuke SATO	2013-02-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use 'some' instead of 'a/an'.
* \| \| \| \| \| \| \| \|	Merge pull request #9207 from dylanahsmith/mysql-quote-numeric	Guillermo Iguaran	2013-02-07	8	-14/+60
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	active_record: Quote numeric values compared to string columns.
\| * \| \| \| \| \| \| \| \|	active_record: Quote numeric values compared to string columns.	Dylan Smith	2013-02-07	8	-14/+60
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Skip schema dumper extensions test if connection does not support it	Carlos Antonio da Silva	2013-02-07	1	-0/+1
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Travis failed because the postgresql version installed there does not support extensions, so we just need to skip this for now.
* \| \| \| \| \| \| \| \|	Run schema dumper extensions without creating real extensions	Carlos Antonio da Silva	2013-02-06	1	-9/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is no need to create the extension in the database just to test if it's dumped, we can stub that instead.
* \| \| \| \| \| \| \| \|	Do not print anything related to extensions when they don't none exist	Carlos Antonio da Silva	2013-02-06	2	-4/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When extensions are supported but there's no one enabled in the database, we should not print anything related to them in schema.rb.
* \| \| \| \| \| \| \| \|	Add blank line after extensions to separate from tables in schema	Carlos Antonio da Silva	2013-02-06	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix indentation of extensions in schema	Carlos Antonio da Silva	2013-02-06	1	-4/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Call super to use the abstract adapter implementation instead	Carlos Antonio da Silva	2013-02-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add changelog entry for #9203 about schema dumper with db extensions	Carlos Antonio da Silva	2013-02-06	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge pull request #9203 from jaggederest/dumping_pgsql_extensions	Aaron Patterson	2013-02-06	5	-0/+42
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding database extension support to schema.rb
\| * \| \| \| \| \| \| \| \|	add ActiveRecord::AbstractAdapter#extensions and ↵	Justin George	2013-02-06	3	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveRecord::ConnectionAdapters::PostgreSQLAdapter#extensions to allow dumping of enabled extensions to schema.rb, add ActiveRecord::SchemaDumper#extensions to dump extensions to schema.rb
\| * \| \| \| \| \| \| \| \|	improve tests to check for existence of extensions method, and skip testing ↵	Justin George	2013-02-06	2	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dumped extensions if they are unsupported by the database
\| * \| \| \| \| \| \| \| \|	Add some tests to enumerate how extensions should be stored in the schema output	Justin George	2013-02-06	2	-0/+15
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Update changelog from #9128 with author name	Carlos Antonio da Silva	2013-02-06	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And improve AS changelog a bit [ci skip]
* \| \| \| \| \| \| \| \|	Merge pull request #9128 from jamesotron/iso8601-sub-second-accuracy	Jeremy Kemper	2013-02-06	3	-2/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modify TimeWithZone#as_json to return 3DP of sub-second accuracy.
\| * \| \| \| \| \| \| \| \|	Modify TimeWithZone#as_json to return 3DP of sub-second accuracy by default, ↵	James Harton	2013-01-31	3	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	since it's allowed by the spec and is very useful.
* \| \| \| \| \| \| \| \| \|	Update actionpack/CHANGELOG.md	Rafael Mendonça França	2013-02-06	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge pull request #9039 from ↵	Rafael Mendonça França	2013-02-06	4	-9/+72
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	senny/warn_on_controller_option_with_ruby_constant_syntax ruby constant syntax is not supported as routing `:controller` option.
\| * \| \| \| \| \| \| \| \| \|	ruby constant syntax is not supported as routing `:controller` option.	Yves Senn	2013-02-06	4	-9/+72
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \| \|	Update .gitignore	José Valim	2013-02-05	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get rid of old .rvmrc and .rbenv-version files.