Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | | Enable hstore extensions on tests if it is not enabled and database supports it | Rafael Mendonça França | 2013-02-05 | 1 | -1/+8 |
| | | | |||||
* | | | Merge pull request #9192 from adammck/ignore-dot-ruby-version | Rafael Mendonça França | 2013-02-05 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | Ignore .ruby-version | ||||
| * | | Ignore .ruby-version | Adam Mckaig | 2013-02-05 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #9178 from robertomiranda/best-standard-support-guide | Carlos Antonio da Silva | 2013-02-04 | 1 | -0/+2 |
|\ \ | | | | | | | Update upgrading guide with ActionDispatch::BestStandardsSupport removal [ci skip] | ||||
| * | | Update upgrading guide with ActionDispatch::BestStandardsSupport removal | robertomiranda | 2013-02-04 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #9177 from zenspider/master | Aaron Patterson | 2013-02-04 | 1 | -0/+12 |
|\ \ \ | |/ / |/| | | Added test:all and test:all:db tasks to speed up full test runs | ||||
| * | | Added test:all and test:all:db tasks to speed up full test runs. | Ryan Davis | 2013-02-04 | 1 | -0/+12 |
|/ / | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Merge pull request #9175 from robertomiranda/add--rc-desc | Guillermo Iguaran | 2013-02-04 | 1 | -0/+3 |
|\ \ | | | | | | | Add --rc description on the command line | ||||
| * | | Add --rc description on the command line | robertomiranda | 2013-02-04 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #9174 from robertomiranda/railsrc-cli-option | Rafael Mendonça França | 2013-02-04 | 1 | -2/+6 |
|\ \ \ | |/ / |/| | | Use --rc=PATH instead of --rc PATH | ||||
| * | | Use --rc= instead of --rc | robertomiranda | 2013-02-04 | 1 | -2/+6 |
|/ / | |||||
* | | Merge pull request #8520 from senny/8516_assert_template_with_locals | Carlos Antonio da Silva | 2013-02-04 | 6 | -3/+46 |
|\ \ | | | | | | | Improved `assert_template` when matching :locals with partials | ||||
| * | | partials inside directory work with `assert_template` | Yves Senn | 2013-02-04 | 6 | -3/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously when a partial was placed inside a directory (eg. '/dir/_partial'), `assert_template` did not replace the '_' prefix when looking through rendered tempaltes, which resulted in an error. I modified it to replace both, the leading '_' and the last '_' after a '/'. | ||||
| * | | descriptive `assert_template` error when partial wasn't rendered | Yves Senn | 2013-02-04 | 3 | -0/+16 |
|/ / | | | | | | | | | | | | | When `assert_template` is used with the :locals option, and the partial was not rendered, a method_missing error was raised. This changes first checks, if the partial actually was rendered and raises a descriptive error. | ||||
* | | Take care of whitespaces and changing the hash syntax | Rafael Mendonça França | 2013-02-04 | 1 | -57/+56 |
| | | |||||
* | | Merge pull request #9152 from dahakawang/master | Aaron Patterson | 2013-02-03 | 1 | -0/+8 |
|\ \ | | | | | | | test for issue 8931 | ||||
| * | | test for issue 8931 | David | 2013-02-02 | 1 | -0/+8 |
| | | | |||||
* | | | Merge pull request #9164 from yuki24/put_rdoc_at_the_end_of_RUNNING_UNIT_TESTS | Xavier Noria | 2013-02-03 | 2 | -0/+0 |
|\ \ \ | | | | | | | | | Put .rdoc at the end of the files named RUNNING_UNIT_TESTS | ||||
| * | | | Put .rdoc at the end of the files named RUNNING_UNIT_TESTS | Yuki Nishijima | 2013-02-03 | 2 | -0/+0 |
|/ / / | | | | | | | | | | So that they are printed nicely on GitHub. | ||||
* | | | Merge pull request #9154 from robertomiranda/add-rc-desc | Guillermo Iguaran | 2013-02-02 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Add --no-rc description on the command line | ||||
| * | | | Add --no-rc description on the command line | robertomiranda | 2013-02-02 | 1 | -0/+3 |
|/ / / | |||||
* | | | Merge pull request #9151 from gogogarrett/patch-1 | Rafael Mendonça França | 2013-02-02 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix link to point to new RefineryCMS repo | ||||
| * | | | Fix link to point to new RefineryCMS repo | Garrett Heinlen | 2013-02-01 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge remote-tracking branch 'docrails/master' | Xavier Noria | 2013-02-02 | 3 | -5/+5 |
|\ \ \ | |||||
| * | | | Revert "Detail middleware initialization points in the initialization guide ↵ | Xavier Noria | 2013-02-02 | 1 | -74/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]" I feel this is too detailed for the guide. Most of that is not public interface, and if tomorrow something is added or removed in those chains we do not want to come here to maintain it. Also, linking to a gist is not a good idea in a guide. We could have a more broad description of what goes in what order, the most key and public things. This reverts commit 862a05edf3af128f25a87999936262b733ed781e. | ||||
| * | | | Fix formatting: ruby->erb. [ci skip] | Nicholas Schultz-Møller | 2013-01-31 | 1 | -3/+3 |
| | | | | |||||
| * | | | Typo in code | manishval | 2013-01-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #125 from manishval/fix-typo-in-rails-guide | manishval | 2013-01-26 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Fix typo in rails plugins guide |