Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add test to run generated test files inside mountable engine | yuuji.yaginuma | 2015-06-02 | 3 | -16/+25 |
| | |||||
* | add engine's namespace to fixture name | yuuji.yaginuma | 2015-05-31 | 3 | -1/+11 |
| | |||||
* | set engine's route in the functional test is generated in the engine | yuuji.yaginuma | 2015-05-31 | 3 | -0/+24 |
| | |||||
* | Attempt to fix travis failures | Sean Griffin | 2015-05-30 | 1 | -0/+3 |
| | | | | | The version of SQLite used by Travis is outdated. We need to install a newer version. | ||||
* | Ensure symbols passed to `select` are always quoted | Sean Griffin | 2015-05-30 | 4 | -10/+37 |
| | | | | | | | | | | | | | | | | | Our general contract in Active Record is that strings are assumed to be SQL literals, and symbols are assumed to reference a column. If a from clause is given, we shouldn't include the table name, but we should still quote the value as if it were a column. Upon fixing this, the tests were still failing on SQLite. This was because the column name being returned by the query was `"\"join\""` instead of `"join"`. This is actually a bug in SQLite that was fixed a long time ago, but I was using the version of SQLite included by OS X which has this bug. Since I'm guessing this will be a common case for contributors, I also added an explicit check with a more helpful error message. Fixes #20360 | ||||
* | Add docs and changelog entry for 73aab03 [ci skip] | Sean Griffin | 2015-05-30 | 2 | -1/+15 |
| | |||||
* | Merge pull request #20380 from kamipo/add_changelog_for_17654 | Eileen M. Uchitelle | 2015-05-30 | 1 | -0/+13 |
|\ | | | | | Add CHANGELOG entry for #17654 | ||||
| * | Add CHANGELOG entry for #17654 [ci skip] | Ryuta Kamizono | 2015-05-30 | 1 | -0/+13 |
|/ | |||||
* | Merge pull request #20378 from vngrs/fix_doc_of_match_method | Kasper Timm Hansen | 2015-05-30 | 1 | -3/+6 |
|\ | | | | | match method doc fix [ci skip] | ||||
| * | match method doc fix [ci skip] | Mehmet Emin İNAÇ | 2015-05-30 | 1 | -3/+6 |
|/ | | | | | | match method without setting `:via` option has been deprecated fix minor typo | ||||
* | Merge pull request #20375 from yoongkang/docfix | Claudio B. | 2015-05-30 | 1 | -1/+1 |
|\ | | | | | [ci skip] match without via is now deprecated | ||||
| * | [ci skip] match without via is now deprecated | Yoong Kang Lim | 2015-05-30 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #20370 from manishspuri/master | Godfrey Chan | 2015-05-30 | 8 | -4/+56 |
|\ \ | |/ |/| | | | Add tmp directory before touching | ||||
| * | Add test to ensure tmp:clear works when tmp is missing | Yoong Kang Lim | 2015-05-30 | 1 | -0/+7 |
| | | | | | | | | See #20299. | ||||
| * | Generate a `.keep` file in `tmp` folder | Yoong Kang Lim | 2015-05-30 | 4 | -1/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of scripts assumes the existence of this folder and most would fail if it is absent. One example of this is `rake restart` (before the previous commit) – it tries to `touch tmp/restart.txt`, which would fail if `tmp` does not exist, which was the case for a freshly-cloned project as `tmp` is `.gitignored` by default. See #20299. [Yoong Kang Lim, Sunny Juneja] | ||||
| * | `rake restart` should work without a `tmp` folder | Yoong Kang Lim | 2015-05-30 | 3 | -3/+12 |
|/ | | | | | | | | | | | | | In restart.rake, the creation of tmp/restart.txt would fail if the tmp folder does not exist in the app. This is a problem because apps cloned using git would not have the tmp folder, as the folder is in .gitignore. This commit creates the tmp folder if it does not exist. Fixes #20299 [Yoong Kang Lim, Sunny Juneja] | ||||
* | Require yaml for isolation test | Rafael Mendonça França | 2015-05-29 | 1 | -0/+1 |
| | | | | | It was removed when we removed mocha at 5a6ae7f7539216931f2b3f4aa53394ac4136c74e | ||||
* | Merge pull request #20370 from manishspuri/master | Kasper Timm Hansen | 2015-05-29 | 2 | -5/+5 |
|\ | | | | | formatting changes | ||||
| * | formatting changes | unknown | 2015-05-29 | 2 | -5/+5 |
|/ | |||||
* | Make the wording less confusing | Rafael Mendonça França | 2015-05-29 | 1 | -1/+1 |
| | | | | | | This partially reverts commit ac02df5c7827630a91acd9a6b916db9eda1f38b4. [ci skip] | ||||
* | Merge pull request #20367 from manishspuri/master | Rafael Mendonça França | 2015-05-29 | 2 | -2/+2 |
|\ | | | | | minor text change [ci skip] | ||||
| * | minor text change | Manish Puri | 2015-05-29 | 1 | -1/+1 |
| | | |||||
| * | Update inline_preview_interceptor.rb | Manish Puri | 2015-05-29 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #20365 from ↵ | Rafael Mendonça França | 2015-05-29 | 5 | -79/+89 |
|\ | | | | | | | | | repinel/revert-19878-replace_alias_chains_with_prepend Revert "Replace use of alias chains with prepend at core_ext/date and… | ||||
| * | Revert "Replace use of alias chains with prepend at core_ext/date and ↵ | Roque Pinel | 2015-05-29 | 5 | -79/+89 |
| | | | | | | | | core_ext/time" | ||||
* | | Merge pull request #20366 from Gaurav2728/gaurav-mailer | Matthew Draper | 2015-05-30 | 1 | -1/+0 |
|\ \ | |/ |/| | not require mail file | ||||
| * | not require mail file | Gaurav Sharma | 2015-05-29 | 1 | -1/+0 |
|/ | | | | | | ``` it added in this commit (https://github.com/rails/rails/commit/2a25c4ce6da6ea23ebdf44e7eb2d2441dbea20a1), now no warnings occur. ``` | ||||
* | Merge pull request #20364 from ernie/update-serialize-docs | Sean Griffin | 2015-05-29 | 1 | -0/+9 |
|\ | | | | | | | | | | | Update docs for ActiveRecord `serialize` [ci skip] | ||||
| * | Update docs for ActiveRecord `serialize` | Ernie Miller | 2015-05-29 | 1 | -0/+9 |
|/ | | | | | | | | | | | | For certain column types, using `serialize` is unnecessary, or the user may get unexpected contents back from the DB adapter (which is handling some basic deserialization for them). Call this out in the documentation. For background, see: https://gist.github.com/ernie/33f75f2294885b9806f9 https://twitter.com/erniemiller/status/604262907442905090 | ||||
* | Merge pull request #20355 from segiddins/seg-bundler-1-10 | Santiago Pastorino | 2015-05-29 | 2 | -2/+4 |
|\ | | | | | Bundler 1.10 should work now! | ||||
| * | Generate Bundler 1.10.1 lockfile | Samuel E. Giddins | 2015-05-28 | 1 | -0/+3 |
| | | |||||
| * | Revert "Use bundler < 1.10 until its bugs are fixed" | Samuel E. Giddins | 2015-05-28 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 81b42970f02d07ca5007bbce920b489d80172636. | ||||
| * | Revert "Uninstall bundler 1.10" | Samuel E. Giddins | 2015-05-28 | 1 | -1/+0 |
| | | | | | | | | This reverts commit 410d246bc0ddabe47f0bf54116be9087bd3d4bda. | ||||
| * | Revert "Force the uninstall" | Samuel E. Giddins | 2015-05-28 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 9ff901bd3e046b0373b28459269146707b5bf8c9. | ||||
* | | Merge pull request #20358 from tgxworld/remove_code | Santiago Pastorino | 2015-05-29 | 1 | -2/+0 |
|\ \ | | | | | | | Remove unused code. | ||||
| * | | Remove unused code. | Guo Xiang Tan | 2015-05-29 | 1 | -2/+0 |
| |/ | | | | | | | Code was moved into the `assign` method. | ||||
* | | Merge pull request #20354 from arunagw/fix-warning-ambiguous-first-argument | Yves Senn | 2015-05-29 | 1 | -1/+1 |
|\ \ | |/ |/| | Fix warning about ambiguous first argument | ||||
| * | Fix warning about ambiguous first argument | Arun Agrawal | 2015-05-29 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #19878 from pabloh/replace_alias_chains_with_prepend | Rafael Mendonça França | 2015-05-28 | 5 | -89/+79 |
|\ | | | | | Replace use of alias chains with prepend at core_ext/date and core_ext/time | ||||
| * | Replace use of alias chains with prepend at core_ext/date | Pablo Herrero | 2015-05-04 | 5 | -89/+79 |
| | | |||||
* | | Force the uninstall | Rafael Mendonça França | 2015-05-28 | 1 | -1/+1 |
| | | |||||
* | | Uninstall bundler 1.10 | Rafael Mendonça França | 2015-05-28 | 1 | -0/+1 |
| | | |||||
* | | Use bundler < 1.10 until its bugs are fixed | Rafael Mendonça França | 2015-05-28 | 1 | -1/+1 |
| | | | | | | | | See https://github.com/bundler/bundler/issues/3681 | ||||
* | | Merge pull request #20351 from kddeisz/enumerable_pluck | Rafael Mendonça França | 2015-05-28 | 1 | -0/+10 |
|\ \ | | | | | | | Updating the guides for Enumerable#pluck | ||||
| * | | Updating the guides for Enumerable#pluck | Kevin Deisz | 2015-05-28 | 1 | -0/+10 |
|/ / | |||||
* | | Merge pull request #20341 from ↵ | Rafael Mendonça França | 2015-05-28 | 1 | -36/+0 |
|\ \ | | | | | | | | | | | | | vngrs/remove_already_defined_methods_in_rack_request Remove already defined methods in super class of ActionDispatch::Request class | ||||
| * | | Remove already defined methods in super class of ActionDispatch::Request class | Mehmet Emin İNAÇ | 2015-05-28 | 1 | -36/+0 |
| | | | | | | | | | | | | | | | | | | | | | These methods had defined in 2004 by dhh in initial commit and `ActionDispatch::Request` class has been inherited from `Rack::Request` class in 2009 by josh. In 2014 these methods and more of them defined in `Rack::Request` class so we don't need them anymore in rails codebase. | ||||
* | | | Merge pull request #20346 from repinel/remove-mocha2 | Rafael Mendonça França | 2015-05-28 | 4 | -59/+117 |
|\ \ \ | | | | | | | | | Remove use of mocha from Active Model | ||||
| * | | | Remove use of mocha from Active Model | Roque Pinel | 2015-05-28 | 4 | -59/+117 |
| | | | | |||||
* | | | | Merge pull request #20267 from kaspth/fix-minitest-constant-clashing | Rafael Mendonça França | 2015-05-28 | 8 | -43/+45 |
|\ \ \ \ | | | | | | | | | | | Avoid E constant clashing with Minitest defined version. |