aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #20387 from y-yagi/fix_engine_generated_controller_testYves Senn2015-06-026-1/+48
|\ \ | | | | | | | | | set engine's route in the functional test is generated in the engine
| * | add test to run generated test files inside mountable engineyuuji.yaginuma2015-06-023-16/+25
| | |
| * | add engine's namespace to fixture nameyuuji.yaginuma2015-05-313-1/+11
| | |
| * | set engine's route in the functional test is generated in the engineyuuji.yaginuma2015-05-313-0/+24
| | |
* | | Merge pull request #20357 from ronakjangir47/remove_mocha1Rafael Mendonça França2015-06-011-27/+52
|\ \ \ | | | | | | | | Removed use of mocha from railties actions_test
| * | | Removed use of mocha from railties actions_testRonak Jangir2015-06-011-27/+52
| |/ /
* | | Merge pull request #20406 from yoongkang/add_edge_sprocketsSantiago Pastorino2015-06-011-0/+2
|\ \ \ | | | | | | | | Use sprockets-rails from github repo
| * | | Use sprockets-rails from github repoYoong Kang Lim2015-06-021-0/+2
| |/ / | | | | | | | | | See #20397
* | | Merge pull request #20138 from tgxworld/deprecated_assert_templateRafael Mendonça França2015-06-011-1/+1
|\ \ \ | |/ / |/| | Deprecate `assert_template` and `assigns()`.
| * | Remove `assigns` and `assert_template`.Guo Xiang Tan2015-05-301-1/+1
| | |
* | | Add test to ensure tmp:clear works when tmp is missingYoong Kang Lim2015-05-301-0/+7
| | | | | | | | | | | | See #20299.
* | | Generate a `.keep` file in `tmp` folderYoong Kang Lim2015-05-304-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` folderYoong Kang Lim2015-05-303-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-filenameRafael Mendonça França2015-05-284-3/+33
|\ \ | | | | | | | | | config.static_index configures directory Index "index.html" filename
| * | config.static_index configures directory index "index.html" filenameEliot Sykes2015-05-284-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-tasksRafael Mendonça França2015-05-281-9/+0
|\ \ \ | | | | | | | | Remove unused package tasks
| * | | Remove unused package tasksArun Agrawal2015-05-281-9/+0
| |/ / | | | | | | | | | We are using `all:build` now.
* / / Deprecate `:nothing` option for render methodMehmet Emin İNAÇ2015-05-281-9/+9
|/ / | | | | | | `head` method works similar to `render` method with `:nothing` option
* | Merge pull request #20326 from hderms/dh/fix_task_bugRafael Mendonça França2015-05-272-16/+66
|\ \ | | | | | | | | | Fix rake method definition leaking onto Object
| * | add fixed fileDermot Haughey2015-05-272-16/+66
| | | | | | | | | | | | | | | | | | add framework_test add another test
* | | :bomb: Fix another leftoverRafael Mendonça França2015-05-271-1/+1
| | |
* | | Fix file nameRafael Mendonça França2015-05-271-1/+1
| | | | | | | | | | | | This is a leftover of #19867
* | | Merge pull request #19867 from radar/rename-app-rails-loaderRafael Mendonça França2015-05-273-11/+11
|\ \ \ | |/ / |/| | Remove redundant 'Rails' from Rails::AppRailsLoader constant
| * | Remove redundant 'Rails' from Rails::AppRailsLoader constantRyan Bigg2015-05-213-11/+11
| | |
* | | Remove web-console and spring from test group on default Gemfile.Kassio Borges2015-05-271-2/+4
| | |
* | | Merge pull request #20262 from arunagw/aa-remove-broken-unused-release-taskYves Senn2015-05-271-9/+0
|\ \ \ | | | | | | | | Remove broken and unused release task
| * | | Remove broken and unused release taskArun Agrawal2015-05-221-9/+0
| | | | | | | | | | | | | | | | | | | | - We do release with release.rb - There is no `rake/gemcutter`
* | | | Merge pull request #20248 from ronakjangir47/remove_mochaRafael Mendonça França2015-05-251-18/+34
|\ \ \ \ | | | | | | | | | | Remove use of mocha in the railties generators tests
| * | | | Remove use of mocha in the railties generators tests Ronak Jangir2015-05-221-18/+34
| |/ / /
* | | | Add missing type reference hereZachary Scott2015-05-241-1/+1
| | | |
* | | | Omit .keep in .gitignore when generated with --skip-keeps.Ben Pickles2015-05-223-2/+12
|/ / /
* | | Remove use of mocha in the railties path testsRoque Pinel2015-05-181-59/+88
| | |
* | | [ci skip] Remove comments about Rails 3.1claudiob2015-05-112-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'sAnkit Gupta2015-05-112-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 commandsMehmet Emin İNAÇ2015-05-104-109/+103
| | | | | | | | | | | | fix minor convention problems
* | | Merge pull request #20063 from trayo/masterRafael Mendonça França2015-05-071-0/+10
|\ \ \ | | | | | | | | Adds documentaion for the Rails.root and Rails.public_path methods
| * | | better docs for Rails.root and Rails.public_pathTravis Yoder2015-05-071-0/+10
| | | |
* | | | require object/blank not usedAnkit Gupta2015-05-061-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 Senn2015-05-061-0/+54
| | | | | | | | | | | | | | | | Make sure this script keeps working and has consistent output.
* | | | Merge pull request #20023 from mohnish/patch-1Yves Senn2015-05-062-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | Use the built-in rake tasks
| * | | | Use the built-in rake tasksMohnish Thallavajhula2015-05-041-2/+2
| | | | | | | | | | | | | | | Use the `log:clear` and `tmp:clear` rake tasks in the setup file template
* | | | | list reserved words in generator errorSean Linsley2015-05-054-4/+4
| | | | |
* | | | | Merge pull request #19756 from georgemillo/docsRobin Dupret2015-05-051-17/+26
|\ \ \ \ \ | |/ / / / |/| | | | fixing English in Rails::Engine docs
| * | | | fixing English in Rails::Engine docsGeorge Millo2015-04-231-17/+26
| | |/ / | |/| | | | | | | | | | [ci skip]
* | | | Fix constant in void context warningsAndrew White2015-05-051-2/+2
| | | |
* | | | Fix URI.escape is obsolete warningsAndrew White2015-05-051-1/+1
| |/ / |/| |
* | | Document inline image mailer preview interceptorAndrew White2015-05-042-7/+20
| | | | | | | | | | | | Explain what the interceptor is used for and how to remove it.
* | | Tiny documentation edits [ci skip]Robin Dupret2015-05-041-2/+3
| | | | | | | | | | | | | | | | | | * Fix a few typos * Wrap lines to 80 chars * Use `+` instead of `<tt>`
* | | Fix railties configuration testAndrew White2015-05-041-2/+2
| | |
* | | Add support for inline images to mailer previewsAndrew White2015-05-042-8/+10
| | | | | | | | | | | | | | | Use a preview interceptor to search for inline cid: urls in src attributes and convert them to data urls.