aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9238 from norman/unicode_62Carlos Antonio da Silva2013-02-102-1/+1
|\ | | | | Update to latest Unicode data.
| * Update to latest Unicode data.Norman Clarke2013-02-102-1/+1
| | | | | | | | Release notes at: http://www.unicode.org/versions/Unicode6.2.0/
* | Merge pull request #8643 from tricknotes/remove-method-redefined-warningAndrew White2013-02-101-0/+1
|\ \ | | | | | | Remove method redefined warning
| * | Remove method redefined warningRyunosuke SATO2013-02-111-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/gzipXavier Noria2013-02-103-2/+25
|\ \ \ | | | | | | | | added compress options for gzip
| * | | added compress options for gzipBeyond2013-02-103-2/+25
|/ / / | | | | | | | | | | | | | | | added test for compress options of gzip update changelog
* | | Prefer Ruby 2.0; require 1.9.3+Jeremy Kemper2013-02-094-9/+9
| | |
* | | Merge pull request #9234 from senny/9231_no_numbers_in_route_namespaces_allowedCarlos Antonio da Silva2013-02-092-1/+13
|\ \ \ | | | | | | | | The `:controller` option for routes can contain numbers. closes #9231.
| * | | the `:controller` option for routes can contain numbers. closes #9231.Yves Senn2013-02-092-1/+13
| | | |
* | | | Merge pull request #9233 from rahul100885/masterCarlos Antonio da Silva2013-02-093-1/+6
|\ \ \ \ | |/ / / |/| | | Added notice message for destroy method in scaffold
| * | | Added notice message for destroy method in scaffoldRahul P. Chaudhari2013-02-103-1/+6
| | | |
* | | | Update activerecord/CHANGELOG.mdGuillermo Iguaran2013-02-091-1/+1
| | | |
* | | | Merge pull request #9232 from robertomiranda/where-with-empty-hashGuillermo Iguaran2013-02-091-1/+1
|\ \ \ \ | |/ / / |/| | | Use IN operator like Arel for empty hash in where clause
| * | | Use IN operator like arel for empty hash in where clauserobertomiranda2013-02-091-1/+1
|/ / /
* | | Add missing require to APCarlos Antonio da Silva2013-02-081-0/+1
| | |
* | | Reverting e170014113 (Change behaviour with empty hash in where clause)Guillermo Iguaran2013-02-083-12/+3
| | |
* | | We don't need a CHANGELOG entry for an issue of something that was not ↵Santiago Pastorino2013-02-081-5/+0
| | | | | | | | | | | | released yet
* | | Merge pull request #9196 from AndreyChernyh/fix-cookies-with-null-sessionSantiago Pastorino2013-02-084-5/+49
|\ \ \ | | | | | | | | Fix #9168 Initialize NullCookieJar with all options needed for KeyGenerator
| * | | Fix #9168 Initialize NullCookieJar with all options needed for KeyGeneratorAndrey Chernih2013-02-084-5/+49
| | | |
* | | | Bump rack dependency to 1.5.2Santiago Pastorino2013-02-081-1/+1
| | | |
* | | | Reverting 16f6f25 (Change behaviour with empty array in where clause)Guillermo Iguaran2013-02-086-14/+13
|/ / /
* | | Improve changelog entries in ARCarlos Antonio da Silva2013-02-081-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-arrayGuillermo Iguaran2013-02-086-13/+14
|\ \ \ | | | | | | | | Activer Record: Change behaviour with empty array in where clause
| * | | Change behaviour with empty array in where clauserobertomiranda2013-02-086-13/+14
|/ / /
* | | Merge pull request #9220 from robertomiranda/where-with-empty-hashMichael Koziarski2013-02-073-3/+11
|\ \ \ | | | | | | | | Active Record: Change behaviour with empty hash in where clause
| * | | Change behaviour with empty hash in where clauserobertomiranda2013-02-083-3/+11
|/ / /
* | | Merge pull request #9185 from tricknotes/fix-article-for-generator-nameCarlos Antonio da Silva2013-02-071-2/+2
|\ \ \ | | | | | | | | Fix article for generator name
| * | | Fix article for generator nameRyunosuke SATO2013-02-071-2/+2
| | | | | | | | | | | | | | | | Use 'some' instead of 'a/an'.
* | | | Merge pull request #9207 from dylanahsmith/mysql-quote-numericGuillermo Iguaran2013-02-078-14/+60
|\ \ \ \ | | | | | | | | | | active_record: Quote numeric values compared to string columns.
| * | | | active_record: Quote numeric values compared to string columns.Dylan Smith2013-02-078-14/+60
| | | | |
* | | | | Skip schema dumper extensions test if connection does not support itCarlos Antonio da Silva2013-02-071-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 extensionsCarlos Antonio da Silva2013-02-061-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 existCarlos Antonio da Silva2013-02-062-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 schemaCarlos Antonio da Silva2013-02-061-0/+1
| | | |
* | | | Fix indentation of extensions in schemaCarlos Antonio da Silva2013-02-061-4/+2
| | | |
* | | | Call super to use the abstract adapter implementation insteadCarlos Antonio da Silva2013-02-061-1/+1
| | | |
* | | | Add changelog entry for #9203 about schema dumper with db extensionsCarlos Antonio da Silva2013-02-062-2/+7
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #9203 from jaggederest/dumping_pgsql_extensionsAaron Patterson2013-02-065-0/+42
|\ \ \ \ | | | | | | | | | | Adding database extension support to schema.rb
| * | | | add ActiveRecord::AbstractAdapter#extensions and ↵Justin George2013-02-063-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 George2013-02-062-8/+8
| | | | | | | | | | | | | | | | | | | | dumped extensions if they are unsupported by the database
| * | | | Add some tests to enumerate how extensions should be stored in the schema outputJustin George2013-02-062-0/+15
|/ / / /
* | | | Update changelog from #9128 with author nameCarlos Antonio da Silva2013-02-061-2/+4
| | | | | | | | | | | | | | | | And improve AS changelog a bit [ci skip]
* | | | Merge pull request #9128 from jamesotron/iso8601-sub-second-accuracyJeremy Kemper2013-02-063-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 Harton2013-01-313-2/+7
| | | | | | | | | | | | | | | | | | | | since it's allowed by the spec and is very useful.
* | | | | Update actionpack/CHANGELOG.mdRafael Mendonça França2013-02-061-4/+4
| | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #9039 from ↵Rafael Mendonça França2013-02-064-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 Senn2013-02-064-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 .gitignoreJosé Valim2013-02-051-2/+0
| | | | | | | | | | | | | | | Get rid of old .rvmrc and .rbenv-version files.
* | | | | Enable hstore extensions on tests if it is not enabled and database supports itRafael Mendonça França2013-02-051-1/+8
| | | | |
* | | | | Merge pull request #9192 from adammck/ignore-dot-ruby-versionRafael Mendonça França2013-02-051-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Ignore .ruby-version