aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Don't unhook autoloading in production"Aaron Patterson2015-02-161-0/+7
| | | | This reverts commit a8bf12979e5fa15282b39c8cfa315e663f613539.
* Remove unused Rails::Server#log_pathPhill Baker2015-02-161-4/+0
| | | | | | | With refactors to Rails::Sever from v3 to v4, this method is no longer used and is untested. Previous usage: https://github.com/rails/rails/blob/3-2-stable/railties/lib/rails/commands/server.rb#L79 Currently set from: https://github.com/rails/rails/blob/7b75551a1a4539876f878f37a2439cd02f89d961/railties/lib/rails/application/configuration.rb#L69
* Add Gemfile.lock to plugin's gitignore templateJure Žove2015-02-151-0/+1
|
* Fix some typos in railties/lib/rails/engine.rb [ci-skip]RobertZK2015-02-101-4/+4
|
* Fix typo in Rails::Application#migration_railtiesRobertZK2015-02-101-2/+2
|
* Dont check bundler output on plugin generator testArthur Neves2015-02-101-4/+2
|
* Actually fix the buildSean Griffin2015-02-101-1/+1
| | | | Like for real this time. I checked.
* Fix the buildSean Griffin2015-02-101-1/+1
|
* tests, reset global to previous value.Yves Senn2015-02-091-1/+3
| | | | | The default of the global might change. It's better to reset it to what it was than a hardcoded value.
* Merge pull request #18839 from ↵Yves Senn2015-02-091-10/+0
|\ | | | | | | | | yuki24/remove-warning-from-generators-named-base-test Remove warning from generator named base test
| * Remove warning from generator named base testYuki Nishijima2015-02-081-10/+0
| | | | | | | | | | | | | | | | | | This removes the following warning: railties/test/generators/named_base_test.rb:9: warning: method redefined; discarding old pluralize_table_names activesupport/lib/active_support/core_ext/class/attribute.rb:86: warning: previous definition of pluralize_table_names was here railties/test/generators/named_base_test.rb:9: warning: method redefined; discarding old pluralize_table_names= activesupport/lib/active_support/core_ext/class/attribute.rb:83: warning: previous definition of pluralize_table_names= was here
* | Remove warning from Plugin GeneratorYuki Nishijima2015-02-081-3/+3
|/ | | | | | This removes the following warning: rails/railties/lib/rails/generators/rails/plugin/plugin_generator.rb:321: warning: shadowing outer local variable - content
* Remove reference to the now done documentation.rakeXavier Noria2015-02-061-1/+0
|
* README.rdoc -> README.md for newly generated applicationsXavier Noria2015-02-065-5/+9
| | | | | | README.rdoc was generated to support the doc:app task. Now that this task is gone we can switch to Markdown, which is nowadays a better default.
* Remove documentation tasksXavier Noria2015-02-066-99/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the tasks doc:app, doc:rails, and doc:guides. In our experience applications do not generate APIs using doc:app. Methods may be certainly documented for maintainers, annotated with YARD tags, etc. but that is intended to be read with the source code, not in a separate website. Then, teams also have typically selected topics written down in Markdown files, or in a GitHub wiki... that kind of thing. If a team absolutely needs to generate application documentation for internal purposes, they can still easily write their own task. Regarding doc:rails and doc:guides, we live in 2015. We are used to go to online docs all the time. If you really want access to the API offline RubyGems generates it for every Rails component unless you tell it not to, and you can checkout the Rails source code to read the guides as Markdown, or download them for a Kindle reader. All in all, maintaining this code does not seem to be worthwhile anymore. As a consequence of this, guides (+3 MB uncompressed) won't be distributed with the rails gem anymore. Of course, guides and API are going to be still part of releases, since documentation is maintained alongside code and tests. Also, time permitting, this will allow us to experiment with novel ways to generate documentation in the Rails docs server, since right now we were constrained by being able to generate them in the user's environment.
* Merge pull request #18399 from kommen/unify-structure-file-envvar-namesRafael Mendonça França2015-02-051-1/+1
|\ | | | | | | | | | | | | Use SCHEMA instead of DB_STRUCTURE for specifiying structure file. Conflicts: activerecord/CHANGELOG.md
| * Use `SCHEMA` instead of `DB_STRUCTURE` for specifiying structure file.Dieter Komendera2015-01-081-1/+1
| | | | | | | | | | `rake test:load_structure` already uses `SCHEMA` and there's no need to maintain two different env vars.
* | Merge pull request #18526 from vipulnsward/add-silence-streamRafael Mendonça França2015-02-054-87/+10
|\ \ | | | | | | Extracted silence_stream method to new module in activesupport/testing
| * | - Extracted silence_stream method to new module in activesupport/testing.Vipul A M2015-01-204-87/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added include for the same in ActiveSupport::Test. - Removed occurrences of silence_stream being used elsewhere. - Reordered activesupport testcase requires alphabetically. - Removed require of silence stream from test_case - Moved quietly method to stream helper - Moved capture output to stream helper module and setup requires for the same elsewhere
* | | Force generated route to be insertedAndrew White2015-02-053-1/+10
| | | | | | | | | | | | | | | | | | | | | Thor isn't very discerning over whether some content is present when passed to `inject_into_file`, e.g. a commented out route is detected as being present. So to prevent people scratching their heads as to why a route hasn't appeared it's better to fall on the side of having duplicate routes.
* | | Don't remove all line endings from routes.rbAndrew White2015-02-033-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is a single scaffold in the routes.rb with no other lines then revoking/destroying it will create a routes.rb file with a syntax error. This is because the sentinel for the Thor `route` action didn't include the newline but the logged route code did. The fix is to add the newline to the sentinel and remove it from the the logged route code. Fixes #15913.
* | | Merge pull request #18795 from vipulnsward/remove-magic-commentsJeremy Kemper2015-02-035-5/+0
|\ \ \ | | | | | | | | Removed magic comments (`# encoding: utf-8`) from tests since it's default from ruby 2 onwards
| * | | Removed magic comments # encoding: utf-8 , since its default from ruby 2.0 ↵Vipul A M2015-02-035-5/+0
| | | | | | | | | | | | | | | | onwards.
* | | | Small enhancement for generatorsHolger Frohloff2015-02-031-2/+2
|/ / / | | | | | | | | | | | | Changes a call to #map and a subsequent call to #flatten to the more idiomatic version of #flat_map. This commit also removes an unnessecary return statement.
* | | Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846robertomiranda2015-01-315-5/+5
| | | | | | | | | | | | ref: https://github.com/rails/rails/pull/18763#issuecomment-72349769
* | | Fixed a few things from ee9e4c3Godfrey Chan2015-01-305-12/+12
| | | | | | | | | | | | | | | Mostly cosmetics, except that `isolate_namespace` should be applied to the last module in the chain.
* | | Allow hyphenated names for `rails plugin new` generator.Robin Böning2015-01-3021-67/+194
| | | | | | | | | | | | | | | | | | It was not possible to create a new gem with a hyphenated name via the `rails plugin new` generator. The naming guide of rubygems clearly says dashes should be used for gems that extend other gems. http://guides.rubygems.org/name-your-gem/
* | | build fix II, adjust broken tests as a consequence of 670ac73126.Yves Senn2015-01-301-4/+4
| | |
* | | build fix.Yves Senn2015-01-301-4/+4
| | |
* | | scaffold controller_test template should use kwargs. refs #18323.Yves Senn2015-01-301-5/+5
| | | | | | | | | | | | This prevents a flood of warnings when generating a new scaffold.
* | | tests, use `capture` instead of custom `redirect_stderr` helper.Yves Senn2015-01-301-12/+2
| | |
* | | Add a margin to body and padding to th, td.Adrien Lamothe2015-01-291-0/+11
| | | | | | | | | | | | Add space to new css defs.
* | | Merge pull request #18705 from mrgilman/skip-testRafael Mendonça França2015-01-2911-22/+26
|\ \ \ | | | | | | | | Update option to skip test in generators
| * | | Change option description and update test namesMelanie Gilman2015-01-293-3/+3
| | | |
| * | | Update option to skip test in generatorsMelanie Gilman2015-01-2711-20/+24
| | | | | | | | | | | | | | | | Rails no longer generates Test::Unit files by default.
* | | | Merge pull request #18719 from ↵Yves Senn2015-01-291-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5t111111/add-fix-for-loading-fixtures-in-engine-tests Add fix for loading fixtures in engine tests (additional fix for #4971) Conflicts: railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb
| * | | | Add fix for loading fixtures in engine testsWAKASUGI 5T1111112015-01-291-0/+1
| | | | |
* | | | | reassign `file_fixture_path` in plugins `test_helper.rb`. refs #18658.Yves Senn2015-01-291-0/+1
|/ / / /
* | | | table name should be plural [ci skip]Jian Weihang2015-01-291-1/+1
| | | |
* | | | introduce `ActiveSupport::Testing::FileFixtures`.Yves Senn2015-01-283-0/+3
|/ / / | | | | | | | | | | | | | | | It's a thin layer to provide easy access to sample files throughout test-cases. This adds the directory `test/fixtures/files` to newly generated applications.
* | | Fix typo 'has' => 'have'Sean Collins2015-01-251-1/+1
| | |
* | | Fix typo 'another frameworks' => 'other frameworks'Sean Collins2015-01-251-1/+1
| | |
* | | fix task description for tmp:createyuuji.yaginuma2015-01-251-1/+1
| | |
* | | fix wording of CSS manifest instructionsRachel Warbelow2015-01-222-6/+4
| | |
* | | Merge pull request #18636 from josh/railties-remove-config-assetsRafael Mendonça França2015-01-222-22/+1
|\ \ \ | | | | | | | | Remove config.assets
| * | | Remove config.assetsJoshua Peek2015-01-212-22/+1
| | | | | | | | | | | | | | | | Provided by sprockets-rails plugin
* | | | Merge pull request #18546 from brainopia/action_view_renderRafael Mendonça França2015-01-221-0/+6
|\ \ \ \ | | | | | | | | | | A shortcut to setup controller environment
| * | | | Add ApplicationController.renderer initializer [ci skip]brainopia2015-01-221-0/+6
| | | | |
* | | | | use two spaces instead of one for include root in jsonBen A Morgan2015-01-211-1/+1
| |/ / / |/| | |
* | | | Merge pull request #18380 from nobu/Use-EXEEXTSantiago Pastorino2015-01-191-1/+3
|\ \ \ \ | | | | | | | | | | Use EXEEXT