Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | Improve display of attachment names in mailer previews | Andrew White | 2015-05-04 | 1 | -1/+1 |
| | | | | | | | | | | Display attachment filenames as a comma separated list rather than showing the inspect output for the array. | ||||
* | | Fix mailer previews with attachments | Andrew White | 2015-05-04 | 4 | -7/+206 |
| | | | | | | | | | | | | Use the mail gem's own API to locate the correct part. Fixes #14435. | ||||
* | | Fix generator tests | Rafael Mendonça França | 2015-05-03 | 1 | -1/+1 |
| | | | | | | | | In my machine the output is different | ||||
* | | Remove unneeded base file | Rafael Mendonça França | 2015-05-03 | 2 | -57/+53 |
| | | | | | | | | We are only using for one test class | ||||
* | | Remove unused private classes | Rafael Mendonça França | 2015-05-03 | 2 | -186/+0 |
| | | | | | | | | | | | | | | The usage of these classes where removed at 8017e6af31caa58a58787274ff0ca01397219e49. cc @arthurnn @senny | ||||
* | | Merge pull request #19093 from ↵ | Rafael Mendonça França | 2015-05-03 | 3 | -3/+33 |
|\ \ | | | | | | | | | | | | | remomueller/fix-actionmailer-preview-links-on-subdirectories Mailer preview now uses `url_for` to fix links to emails for apps runnin... | ||||
| * | | Mailer preview now uses `url_for` to fix links to emails for apps running on ↵ | Remo Mueller | 2015-04-30 | 3 | -3/+33 |
| | | | | | | | | | | | | a subdirectory, closes #19092. | ||||
* | | | Merge pull request #19976 from prathamesh-sonpatki/rm-assigns | Rafael Mendonça França | 2015-05-03 | 2 | -5/+4 |
|\ \ \ | | | | | | | | | Removed `assigns` from functional_test templates | ||||
| * | | | Removed `assigns` from functional_test templates | Prathamesh Sonpatki | 2015-05-02 | 2 | -5/+4 |
| |/ / | | | | | | | | | | | | | - Based on DHH's suggestion about deprecating `assigns` in https://github.com/rails/rails/pull/18305#issuecomment-68605166. | ||||
* | | | Use `def before_setup` instead of `setup do` | eileencodes | 2015-05-02 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `setup do` creates unnecessary allocations of proc objects in test callbacks. This prevents that from happening and results in faster code. Originally I had done this as `def setup` and all Railties tests passed. See 044f9ab. Later it was reported there was an issue with this that caused routes in tests to be nil because devs don't generally call `super` in their test setups. Because of that I reverted the commit until I could find a suitble replacement. `before_setup` esentially does the same thing but without the requirement that applications call `super` in their test setups. | ||||
* | | | Added missing fullstop in engine API docs [ci skip] | Prathamesh Sonpatki | 2015-05-02 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #19949 from thiagoaugusto/create-thiago-punctuation-fix | Yves Senn | 2015-04-29 | 1 | -1/+1 |
|\ \ | | | | | | | | | | CHANGELOG punctuation fix | ||||
| * | | CHANGELOG punctuation fix | Thiago Augusto | 2015-04-29 | 1 | -1/+1 |
|/ / | | | | | Punctuation fix |