Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| | * | | Fix typo in rails plugins guide | Manish Valechha | 2013-01-27 | 1 | -1/+1 |
| |/ / | |||||
| * | | Detail middleware initialization points in the initialization guide [ci skip] | Michael de Silva | 2013-01-27 | 1 | -1/+74 |
| | | | |||||
* | | | Refactor --rc option | Guillermo Iguaran | 2013-02-02 | 1 | -6/+1 |
| | | | |||||
* | | | Merge pull request #9147 from amparo-luna/custom_rc | Guillermo Iguaran | 2013-02-01 | 2 | -1/+11 |
|\ \ \ | |_|/ |/| | | Add --rc option to support the load of a custom rc file | ||||
| * | | Add --rc option to support the load of a custom rc file | Amparo Luna | 2013-02-01 | 2 | -1/+11 |
| | | | |||||
* | | | Merge pull request #9149 from robertomiranda/remove-ref-best-standards-support | Guillermo Iguaran | 2013-02-01 | 3 | -10/+3 |
|\ \ \ | | | | | | | | | Remove BestStandardsSupport References | ||||
| * | | | Remove BestStandardsSupport references | robertomiranda | 2013-02-01 | 3 | -10/+3 |
|/ / / | |||||
* | | | Fix markdown syntax in actionpack CHANGELOG. | Steve Klabnik | 2013-02-01 | 1 | -1/+2 |
| | | | | | | | | | | | | Starting a line with an octothorpe makes an <h1> | ||||
* | | | Added extra note about when to email other rubies to RELEASING_RAILS.rdoc | Steve Klabnik | 2013-02-01 | 1 | -0/+3 |
|/ / | |||||
* | | Prefer File.read over File.open.read | Akira Matsuda | 2013-02-01 | 1 | -1/+1 |
| | | |||||
* | | --no-rc in the railties tests | Akira Matsuda | 2013-02-01 | 2 | -2/+2 |
| | | | | | | | | so that the tester's local .railsrc file does not affect the test results | ||||
* | | Missing require hash/keys | Akira Matsuda | 2013-02-01 | 2 | -0/+3 |
| | | |||||
* | | Missing or unneeded require extract_options | Akira Matsuda | 2013-02-01 | 10 | -1/+10 |
| | | |||||
* | | Merge pull request #9138 from amparo-luna/no_rc | Rafael Mendonça França | 2013-01-31 | 2 | -6/+12 |
|\ \ | | | | | | | Add --no-rc option to skip the loading of railsrc file | ||||
| * | | Add --no-rc option to skip the loading of railsrc file | Amparo Luna | 2013-01-31 | 2 | -6/+12 |
|/ / | |||||
* | | Fix typo :bomb: | Rafael Mendonça França | 2013-01-31 | 1 | -1/+1 |
| | | |||||
* | | Fix typo | Rafael Mendonça França | 2013-01-31 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #9133 from homakov/patch-6 | Rafael Mendonça França | 2013-01-31 | 1 | -1/+1 |
|\ \ | | | | | | | Use \A in Regexps | ||||
| * | | Use \A in Regexps | Egor Homakov | 2013-02-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | So, if there is redirect_to params[:q] i can send ?q=javascript:asdf()%0A/localpath Or something more nasty, so please use \A | ||||
* | | | CHANGELOG review | Rafael Mendonça França | 2013-01-31 | 1 | -3/+3 |
| | | | |||||
* | | | Strict regexp | Rafael Mendonça França | 2013-01-31 | 1 | -2/+2 |
| | | |