aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Improve display of attachment names in mailer previewsAndrew White2015-05-041-1/+1
| | | | | Display attachment filenames as a comma separated list rather than showing the inspect output for the array.
* Fix mailer previews with attachmentsAndrew White2015-05-044-7/+206
| | | | | | Use the mail gem's own API to locate the correct part. Fixes #14435.
* Fix generator testsRafael Mendonça França2015-05-031-1/+1
| | | | In my machine the output is different
* Remove unneeded base fileRafael Mendonça França2015-05-032-57/+53
| | | | We are only using for one test class
* Remove unused private classesRafael Mendonça França2015-05-032-186/+0
| | | | | | | The usage of these classes where removed at 8017e6af31caa58a58787274ff0ca01397219e49. cc @arthurnn @senny
* Merge pull request #19093 from ↵Rafael Mendonça França2015-05-033-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 Mueller2015-04-303-3/+33
| | | | | | | | a subdirectory, closes #19092.
* | Merge pull request #19976 from prathamesh-sonpatki/rm-assignsRafael Mendonça França2015-05-032-5/+4
|\ \ | | | | | | Removed `assigns` from functional_test templates
| * | Removed `assigns` from functional_test templatesPrathamesh Sonpatki2015-05-022-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`eileencodes2015-05-021-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 Sonpatki2015-05-021-2/+2
|/
* Merge pull request #19949 from thiagoaugusto/create-thiago-punctuation-fixYves Senn2015-04-291-1/+1
|\ | | | | | | CHANGELOG punctuation fix
| * CHANGELOG punctuation fixThiago Augusto2015-04-291-1/+1
|/ | | Punctuation fix
* Merge pull request #19939 from artofhuman/remove-mocha-from-some-testsRafael Mendonça França2015-04-281-10/+13
|\ | | | | Remove use of mocha in the named base tests
| * Remove use of mocha in the named base testsSemyon Pupkov2015-04-281-10/+13
| |
* | mailer previews for `NullMail` instances. Closes #19849.Yves Senn2015-04-283-6/+39
| |
* | mailer previews, make sure labels and values line up.Yves Senn2015-04-281-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.
* Revert "Merge pull request #17920 from ↵Yves Senn2015-04-271-0/+28
| | | | | | | | | | | | | | | calebthompson/dont-rely-on-environment-task-for-schema-load" This reverts commit 08ff4ccbbb3fb143a02e6752efb974a4bcfcd3bb, reversing changes made to 6c9ed6dbc62450cdb87559afd15798305e069146. Caused by #17920. Closes #19545. This patch introduced regressions because initializers were no longer loaded. Specifically missing inflections result in broken restores of the database.
* Need to add config.assets.compile=true to access `.assets`Arthur Neves2015-04-261-0/+1
| | | | | | sprockets-rails will only add `Rails.application.assets` if compile is no false. See change on sprockets-rails https://github.com/rails/sprockets-rails/commit/d7c7ee19991c565eb77ee143be2d009ba4472122
* assets:cache:clean wont clean cache anymoreArthur Neves2015-04-261-11/+0
| | | | | See the behaviour change on sprockets-rails https://github.com/rails/sprockets-rails/commit/56725e5843662189c6701478f7598db306d5fb02
* Escape README in Plugin builder API documentationPrathamesh Sonpatki2015-04-261-1/+1
| | | | | - So that RDoc will not generate link for README. [ci skip]
* Revert "Fix multiple suggestion test"Arthur Neves2015-04-251-1/+1
| | | | This reverts commit 6a7cf515123889360d272e8ab4be045578dfc0fb.
* Fix multiple suggestion testArthur Neves2015-04-251-1/+1
|
* Add test for multiple suggested generator names.Josef Šimánek2015-04-251-0/+6
|
* Why do we add a top-level constant here?Akira Matsuda2015-04-251-4/+2
|
* Do not show --helper and --assets options in the controller generator helpAkira Matsuda2015-04-251-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_docsYves Senn2015-04-241-0/+3
|\ | | | | More docs on tagged logging [ci skip]
| * Refer to the constructer argument in docsSkye Shaw2015-04-241-1/+1
| |
| * More docs on tagged logging [ci skip]sshaw2015-03-061-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.erbSean Collins2015-04-231-3/+10
| |
* | Require yaml before trying to rescue its exception classRafael Mendonça França2015-04-221-1/+1
| |
* | Remove sqlite support from `rails dbconsole`Andrew White2015-04-223-9/+4
| | | | | | | | | | | | 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 toRafael Mendonça França2015-04-221-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-formattingRafael Mendonça França2015-04-221-7/+20
|\ \ | | | | | | Fix formatting of scaffold css
| * | Fix formatting of scaffold cssSean Collins2015-04-221-7/+20
| | |
* | | pass over CHANGELOGs. [ci skip]Yves Senn2015-04-221-8/+10
| | |
* | | Add blank lines between divs in form scaffoldingSean Collins2015-04-201-0/+2
|/ /
* | Implicitly skip spring for `rails new --dev`Godfrey Chan2015-04-202-1/+9
| | | | | | | | | | | | 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 commandNick Cox2015-04-151-0/+11
| |
* | Fix typos and improve the documentationJon Atack2015-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a squash of the following commits, from first to last: - Fix minor, random things I’ve come across lately that individually did not seem worth making a PR for, so I saved them for one commit. One common error is using “it’s” (which is an abbreviation of “it is”) when the possessive “its” should be used for indicating possession. - Changes include the name of a test, so remove the `[skip ci]` (thanks @senny). - Line wrap the changes at 80 chars and add one more doc fix. - Add a missing line wrap in the Contributing to Ruby on Rails Guide. - Line wrap the `TIP` section in the Contributing to Ruby on Rails Guide as well. Rendering the guide locally with `bundle exec rake guides:generate` did not show any change in on-screen formatting after adding the line wrap. The HTML generated is (extra line added to illustrate where the line wrap takes place): <div class="info"><p>Please squash your commits into a single commit when appropriate. This simplifies future cherry picks and also keeps the git log clean.</p></div> - Squash commits.
* | Merge pull request #19751 from y-yagi/fix_indent_of_controllerAndrew White2015-04-142-4/+7
|\ \ | | | | | | fix indent in routes when using namespaced controllers
| * | fix indent in routes when using namespaced controllersyuuji.yaginuma2015-04-142-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2Guillermo Iguaran2015-04-132-4/+4
|\ \ \ | |/ / |/| | Upgrade to Ruby 2.2.2
| * | Upgrade to Ruby 2.2.2Jon Atack2015-04-142-4/+4
| | | | | | | | | | | | and fix the grammar in the ruby_version_check.rb user message.