Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #20387 from y-yagi/fix_engine_generated_controller_test | Yves Senn | 2015-06-02 | 6 | -1/+48 | |
|\ \ | | | | | | | | | | set engine's route in the functional test is generated in the engine | |||||
| * | | 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 | |
| | | | ||||||
* | | | Merge pull request #20357 from ronakjangir47/remove_mocha1 | Rafael Mendonça França | 2015-06-01 | 1 | -27/+52 | |
|\ \ \ | | | | | | | | | Removed use of mocha from railties actions_test | |||||
| * | | | Removed use of mocha from railties actions_test | Ronak Jangir | 2015-06-01 | 1 | -27/+52 | |
| |/ / | ||||||
* | | | Merge pull request #20406 from yoongkang/add_edge_sprockets | Santiago Pastorino | 2015-06-01 | 1 | -0/+2 | |
|\ \ \ | | | | | | | | | Use sprockets-rails from github repo | |||||
| * | | | Use sprockets-rails from github repo | Yoong Kang Lim | 2015-06-02 | 1 | -0/+2 | |
| |/ / | | | | | | | | | | See #20397 | |||||
* | | | Merge pull request #20138 from tgxworld/deprecated_assert_template | Rafael Mendonça França | 2015-06-01 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | Deprecate `assert_template` and `assigns()`. | |||||
| * | | Remove `assigns` and `assert_template`. | Guo Xiang Tan | 2015-05-30 | 1 | -1/+1 | |
| | | | ||||||
* | | | 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] | |||||
* | | Merge pull request #20017 from eliotsykes/configurable-static-index-filename | Rafael Mendonça França | 2015-05-28 | 4 | -3/+33 | |
|\ \ | | | | | | | | | | config.static_index configures directory Index "index.html" filename | |||||
| * | | config.static_index configures directory index "index.html" filename | Eliot Sykes | 2015-05-28 | 4 | -3/+33 | |
| | | | | | | | | | | | | | | | | | | Set `config.static_index` to serve a static directory index file not named `index`. For example, to serve `main.html` instead of `index.html` for directory requests, set `config.static_index` to `"main"`. | |||||
* | | | Merge pull request #20331 from arunagw/arunagw-remove-unused-package-tasks | Rafael Mendonça França | 2015-05-28 | 1 | -9/+0 | |
|\ \ \ | | | | | | | | | Remove unused package tasks | |||||
| * | | | Remove unused package tasks | Arun Agrawal | 2015-05-28 | 1 | -9/+0 | |
| |/ / | | | | | | | | | | We are using `all:build` now. | |||||
* / / | Deprecate `:nothing` option for render method | Mehmet Emin İNAÇ | 2015-05-28 | 1 | -9/+9 | |
|/ / | | | | | | | `head` method works similar to `render` method with `:nothing` option | |||||
* | | Merge pull request #20326 from hderms/dh/fix_task_bug | Rafael Mendonça França | 2015-05-27 | 2 | -16/+66 | |
|\ \ | | | | | | | | | | Fix rake method definition leaking onto Object | |||||
| * | | add fixed file | Dermot Haughey | 2015-05-27 | 2 | -16/+66 | |
| | | | | | | | | | | | | | | | | | | add framework_test add another test | |||||
* | | | :bomb: Fix another leftover | Rafael Mendonça França | 2015-05-27 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fix file name | Rafael Mendonça França | 2015-05-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | This is a leftover of #19867 | |||||
* | | | Merge pull request #19867 from radar/rename-app-rails-loader | Rafael Mendonça França | 2015-05-27 | 3 | -11/+11 | |
|\ \ \ | |/ / |/| | | Remove redundant 'Rails' from Rails::AppRailsLoader constant | |||||
| * | | Remove redundant 'Rails' from Rails::AppRailsLoader constant | Ryan Bigg | 2015-05-21 | 3 | -11/+11 | |
| | | | ||||||
* | | | Remove web-console and spring from test group on default Gemfile. | Kassio Borges | 2015-05-27 | 1 | -2/+4 | |
| | | | ||||||
* | | | Merge pull request #20262 from arunagw/aa-remove-broken-unused-release-task | Yves Senn | 2015-05-27 | 1 | -9/+0 | |
|\ \ \ | | | | | | | | | Remove broken and unused release task | |||||
| * | | | Remove broken and unused release task | Arun Agrawal | 2015-05-22 | 1 | -9/+0 | |
| | | | | | | | | | | | | | | | | | | | | - We do release with release.rb - There is no `rake/gemcutter` | |||||
* | | | | Merge pull request #20248 from ronakjangir47/remove_mocha | Rafael Mendonça França | 2015-05-25 | 1 | -18/+34 | |
|\ \ \ \ | | | | | | | | | | | Remove use of mocha in the railties generators tests | |||||
| * | | | | Remove use of mocha in the railties generators tests | Ronak Jangir | 2015-05-22 | 1 | -18/+34 | |
| |/ / / | ||||||
* | | | | Add missing type reference here | Zachary Scott | 2015-05-24 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Omit .keep in .gitignore when generated with --skip-keeps. | Ben Pickles | 2015-05-22 | 3 | -2/+12 | |
|/ / / | ||||||
* | | | Remove use of mocha in the railties path tests | Roque Pinel | 2015-05-18 | 1 | -59/+88 | |
| | | | ||||||
* | | | [ci skip] Remove comments about Rails 3.1 | claudiob | 2015-05-11 | 2 | -11/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Stems from https://github.com/rails/rails/pull/20105#issuecomment-100900939 where @senny said: > From my point of view, all the docs (guides, API) are version bound. > They should describe that version and continue to be available when newer versions are released. > The cross referencing can be done by the interested user. | |||||
* | | | removing unused and already required require's | Ankit Gupta | 2015-05-11 | 2 | -3/+0 | |
| | | | | | | | | | | | | | | | custom test - Does not include EnvHelpers and the require is not needed path generation test - require abstract_unit which has . rails/all requires rails and corresponding | |||||
* | | | Refactor railties console and dbconsole commands | Mehmet Emin İNAÇ | 2015-05-10 | 4 | -109/+103 | |
| | | | | | | | | | | | | fix minor convention problems | |||||
* | | | Merge pull request #20063 from trayo/master | Rafael Mendonça França | 2015-05-07 | 1 | -0/+10 | |
|\ \ \ | | | | | | | | | Adds documentaion for the Rails.root and Rails.public_path methods | |||||
| * | | | better docs for Rails.root and Rails.public_path | Travis Yoder | 2015-05-07 | 1 | -0/+10 | |
| | | | | ||||||
* | | | | require object/blank not used | Ankit Gupta | 2015-05-06 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | the current class is not the blank?, present? as well as other inheriting, the test suite runs | |||||
* | | | | add test coverage for `bin/setup`. | Yves Senn | 2015-05-06 | 1 | -0/+54 | |
| | | | | | | | | | | | | | | | | Make sure this script keeps working and has consistent output. | |||||
* | | | | Merge pull request #20023 from mohnish/patch-1 | Yves Senn | 2015-05-06 | 2 | -2/+5 | |
|\ \ \ \ | | | | | | | | | | | | | | | | Use the built-in rake tasks | |||||
| * | | | | Use the built-in rake tasks | Mohnish Thallavajhula | 2015-05-04 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | Use the `log:clear` and `tmp:clear` rake tasks in the setup file template | |||||
* | | | | | list reserved words in generator error | Sean Linsley | 2015-05-05 | 4 | -4/+4 | |
| | | | | | ||||||
* | | | | | Merge pull request #19756 from georgemillo/docs | Robin Dupret | 2015-05-05 | 1 | -17/+26 | |
|\ \ \ \ \ | |/ / / / |/| | | | | fixing English in Rails::Engine docs | |||||
| * | | | | fixing English in Rails::Engine docs | George Millo | 2015-04-23 | 1 | -17/+26 | |
| | |/ / | |/| | | | | | | | | | | [ci skip] | |||||
* | | | | Fix constant in void context warnings | Andrew White | 2015-05-05 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Fix URI.escape is obsolete warnings | Andrew White | 2015-05-05 | 1 | -1/+1 | |
| |/ / |/| | | ||||||
* | | | Document inline image mailer preview interceptor | Andrew White | 2015-05-04 | 2 | -7/+20 | |
| | | | | | | | | | | | | Explain what the interceptor is used for and how to remove it. | |||||
* | | | Tiny documentation edits [ci skip] | Robin Dupret | 2015-05-04 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | * Fix a few typos * Wrap lines to 80 chars * Use `+` instead of `<tt>` | |||||
* | | | Fix railties configuration test | Andrew White | 2015-05-04 | 1 | -2/+2 | |
| | | | ||||||
* | | | Add support for inline images to mailer previews | Andrew White | 2015-05-04 | 2 | -8/+10 | |
| | | | | | | | | | | | | | | | Use a preview interceptor to search for inline cid: urls in src attributes and convert them to data urls. |