Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20326 from hderms/dh/fix_task_bug | Rafael Mendonça França | 2015-05-27 | 1 | -16/+18 |
|\ | | | | | | | Fix rake method definition leaking onto Object | ||||
| * | add fixed file | Dermot Haughey | 2015-05-27 | 1 | -16/+20 |
| | | | | | | | | | | | | add framework_test add another test | ||||
* | | :bomb: Fix another leftover | Rafael Mendonça França | 2015-05-27 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #19867 from radar/rename-app-rails-loader | Rafael Mendonça França | 2015-05-27 | 2 | -3/+3 |
|\ \ | |/ |/| | Remove redundant 'Rails' from Rails::AppRailsLoader constant | ||||
| * | Remove redundant 'Rails' from Rails::AppRailsLoader constant | Ryan Bigg | 2015-05-21 | 2 | -3/+3 |
| | | |||||
* | | Remove web-console and spring from test group on default Gemfile. | Kassio Borges | 2015-05-27 | 1 | -2/+4 |
| | | |||||
* | | 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 | 2 | -1/+7 |
| | | |||||
* | | [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. | ||||
* | | Refactor railties console and dbconsole commands | Mehmet Emin İNAÇ | 2015-05-10 | 3 | -101/+99 |
| | | | | | | | | 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 | ||||
* | | | Merge pull request #20023 from mohnish/patch-1 | Yves Senn | 2015-05-06 | 1 | -2/+1 |
|\ \ \ | | | | | | | | | | | | | 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 | 2 | -2/+2 |
| | | | | |||||
* | | | | 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 URI.escape is obsolete warnings | Andrew White | 2015-05-05 | 1 | -1/+1 |
| |/ |/| | |||||
* | | 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>` | ||||
* | | 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 | 2 | -7/+9 |
| | | | | | | | | | | | | Use the mail gem's own API to locate the correct part. Fixes #14435. | ||||
* | | Remove unused private classes | Rafael Mendonça França | 2015-05-03 | 1 | -126/+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 | 2 | -3/+3 |
|\ \ | | | | | | | | | | | | | 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 | 2 | -3/+3 |
| | | | | | | | | | | | | a subdirectory, closes #19092. | ||||
* | | | Merge pull request #19976 from prathamesh-sonpatki/rm-assigns | Rafael Mendonça França | 2015-05-03 | 1 | -3/+2 |
|\ \ \ | | | | | | | | | Removed `assigns` from functional_test templates | ||||
| * | | | Removed `assigns` from functional_test templates | Prathamesh Sonpatki | 2015-05-02 | 1 | -3/+2 |
| |/ / | | | | | | | | | | | | | - 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 |
|/ / | |||||
* | | mailer previews for `NullMail` instances. Closes #19849. | Yves Senn | 2015-04-28 | 2 | -6/+13 |
| | | |||||
* | | mailer previews, make sure labels and values line up. | Yves Senn | 2015-04-28 | 1 | -0/+4 |
| | | | | | | | | | | | | While this was true before when every `dd` had a value, this patch makes sure that everything keeps lining up even when the `dd` node is blank. | ||||
* | | Escape README in Plugin builder API documentation | Prathamesh Sonpatki | 2015-04-26 | 1 | -1/+1 |
| | | | | | | | | | | - So that RDoc will not generate link for README. [ci skip] | ||||
* | | Do not show --helper and --assets options in the controller generator help | Akira Matsuda | 2015-04-25 | 1 | -1/+2 |
| | | | | | | | | | | These options are not actually available. Thanks @soutaro for letting me aware of this. | ||||
* | | Merge pull request #19236 from sshaw/more_tagged_logging_docs | Yves Senn | 2015-04-24 | 1 | -0/+3 |
|\ \ | | | | | | | More docs on tagged logging [ci skip] | ||||
| * | | Refer to the constructer argument in docs | Skye Shaw | 2015-04-24 | 1 | -1/+1 |
| | | | |||||
| * | | More docs on tagged logging [ci skip] | sshaw | 2015-03-06 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | Mention that tags can also come from a Proc that accepts the request object or something's to_s method | ||||
* | | | Fix CSS formatting in welcome#index.html.erb | Sean Collins | 2015-04-23 | 1 | -3/+10 |
| |/ |/| | |||||
* | | Require yaml before trying to rescue its exception class | Rafael Mendonça França | 2015-04-22 | 1 | -1/+1 |
| | | |||||
* | | Remove sqlite support from `rails dbconsole` | Andrew White | 2015-04-22 | 1 | -3/+0 |
| | | | | | | | | | | | | Support for versions of SQLite less than 3 was removed in #6011 as part of the Rails 4.0 release. Therefore there is no need to have support for it in the `rails dbconsole` command anymore. | ||||
* | | Don't ask something that we don't want to | Rafael Mendonça França | 2015-04-22 | 1 | -1/+1 |
| | | | | | | | | | | | | We only want to support adapters that we officially support through the entire framework so it is better to not ask patches for adapters that we may not support | ||||
* | | Merge pull request #19858 from cllns/fix-scaffolding-css-formatting | Rafael Mendonça França | 2015-04-22 | 1 | -7/+20 |
|\ \ | | | | | | | Fix formatting of scaffold css | ||||
| * | | Fix formatting of scaffold css | Sean Collins | 2015-04-22 | 1 | -7/+20 |
| | | | |||||
* | | | Add blank lines between divs in form scaffolding | Sean Collins | 2015-04-20 | 1 | -0/+2 |
|/ / | |||||
* | | Implicitly skip spring for `rails new --dev` | Godfrey Chan | 2015-04-20 | 1 | -1/+1 |
| | | | | | | | | | | | | Spring seems like an obvious foot gun for the `--dev` setup, presumably you are about to make lots of changes to the codebase, so it should always reload the framework. | ||||
* | | [ci skip] Document running a rake command as a rails command | Nick Cox | 2015-04-15 | 1 | -0/+11 |
| | | |||||
* | | Merge pull request #19751 from y-yagi/fix_indent_of_controller | Andrew White | 2015-04-14 | 1 | -3/+4 |
|\ \ | | | | | | | fix indent in routes when using namespaced controllers | ||||
| * | | fix indent in routes when using namespaced controllers | yuuji.yaginuma | 2015-04-14 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: namespace :foo do namespace :bar do get 'baz/index' end end After: namespace :foo do namespace :bar do get 'baz/index' end end | ||||
* | | | Merge pull request #19753 from jonatack/use-ruby-2-2-2 | Guillermo Iguaran | 2015-04-13 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | Upgrade to Ruby 2.2.2 | ||||
| * | | Upgrade to Ruby 2.2.2 | Jon Atack | 2015-04-14 | 1 | -3/+3 |
| | | | | | | | | | | | | and fix the grammar in the ruby_version_check.rb user message. | ||||
* | | | Error message no longer tells you to set the (deprecated) secret_token. | Dan | 2015-04-12 | 1 | -1/+1 |
| | | |