aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
* pass a config to the route setAaron Patterson2015-03-051-1/+1
| | | | | This way we can get the relative_url_root from the application without setting another global value
* Revert work arounds for upstream Ruby 2.2.0 kwargs bugGenadi Samokovarov2015-03-051-3/+3
| | | | | | | | | | | | | | | | | | | The bug caused a segfault and you can find more info about it at: https://bugs.ruby-lang.org/issues/10685. We did a couple of work arounds, but 2.2.1 rolled out and those aren't needed anymore. Here are the reverted commits: - Revert "Work around for upstream Ruby bug #10685", commit 707a433870e9e06af688f85a4aedc64a90791a64. - Revert "Fix segmentation fault in ActionPack tests", commit 22e0a22d5f98e162290d9820891d8191e720ad3b. I'm also bumping the Ruby version check to 2.2.1 to prevent future segfaults.
* Some documentation edits [ci skip]Robin Dupret2015-03-051-3/+3
| | | | | | * Fix a few typos * Wrap some lines around 80 chars * Rephrase some statements
* ask the routes objects for its Rack env keyAaron Patterson2015-03-021-1/+1
| | | | | | this centralizes the logic for determining the script name key and drops object allocations when calling `engine_script_name` (which is called on each `url_for`).
* Merge pull request #19173 from robin850/rbx-buildRafael Mendonça França2015-03-021-1/+1
|\ | | | | Improve the Rubinius build
| * Avoid Ruby versions check on RubiniusRobin Dupret2015-03-021-1/+1
| | | | | | | | | | Rubinius is still targeting compliance with Ruby 2.1.0 but we are pretty close to a green build so let's avoid this check for the moment.
* | Rake restart task no longer loads entire Rails environment when run.Hyonjee Joo2015-03-021-1/+1
|/ | | | | The restart task does not need access to models or other classes and helpers from the application environment.
* Lines of code can be 100,000+ in a Rails appAkira Matsuda2015-03-011-4/+4
| | | | Actually, our app has 400,000 LOC :boom:
* Created rake restart task.Hyonjee Joo2015-02-262-0/+5
| | | | | | Fixes #18876. Rake restart touches `tmp/restart.txt` to restart application on next request. Updated tests and documentation accordingly.
* Merge pull request #18434 from brainopia/change_filter_on_rails_info_routesRichard Schneeman2015-02-261-2/+23
|\ | | | | Change filter on /rails/info/routes to use an actual path regexp from rails
| * Change filter on /rails/info/routes to use an actual path regexp from railsbrainopia2015-02-231-2/+23
| | | | | | | | | | | | | | | | Change filter on /rails/info/routes to use an actual path regexp from rails and not approximate javascript version. Oniguruma supports much more extensive list of features than javascript regexp engine. Fixes #18402.
* | fix typo [ci-skip]Robert Krzyzanowski2015-02-251-1/+1
|/
* Merge pull request #18395 from shunsukeaida/improve_generator_name_suggestionsRichard Schneeman2015-02-231-3/+1
|\ | | | | Improve generator name suggestions a bit.
| * Improve generator name suggestions a bit.ShunsukeAida2015-02-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the Levenshtein distances to most commands were wrongly calculated due to a big shortcut. This might be included in the original code for the performance sake, but I'm not sure that's something we should take over accuracy in Rails. Before 'foo' to 'assets' #=> 3 'foo' to 'controller' #=> 3 'foo' to 'generator' #=> 3 'foo' to 'helper' #=> 3 'foo' to 'integration_test' #=> 3 'foo' to 'jbuilder' #=> 3 'foo' to 'job' #=> 2 'foo' to 'mailer' #=> 3 'foo' to 'migration' #=> 3 'foo' to 'model' #=> 3 'foo' to 'resource' #=> 3 'foo' to 'resource_route' #=> 3 'foo' to 'scaffold' #=> 3 'foo' to 'scaffold_controller' #=> 3 'foo' to 'task' #=> 4 'foo' to 'active_record:migration' #=> 3 'foo' to 'active_record:model' #=> 3 'foo' to 'coffee:assets' #=> 3 'foo' to 'css:assets' #=> 3 'foo' to 'css:scaffold' #=> 3 'foo' to 'erb:controller' #=> 3 'foo' to 'erb:mailer' #=> 3 'foo' to 'erb:scaffold' #=> 3 'foo' to 'js:assets' #=> 3 'foo' to 'scss:assets' #=> 3 'foo' to 'scss:scaffold' #=> 3 'foo' to 'test_unit:controller' #=> 3 'foo' to 'test_unit:generator' #=> 3 'foo' to 'test_unit:helper' #=> 3 'foo' to 'test_unit:integration' #=> 3 'foo' to 'test_unit:job' #=> 3 'foo' to 'test_unit:mailer' #=> 3 'foo' to 'test_unit:model' #=> 3 'foo' to 'test_unit:plugin' #=> 3 'foo' to 'test_unit:scaffold' #=> 3 After 'foo' to 'assets' #=> 6 'foo' to 'controller' #=> 8 'foo' to 'generator' #=> 8 'foo' to 'helper' #=> 6 'foo' to 'integration_test' #=> 15 'foo' to 'jbuilder' #=> 8 'foo' to 'job' #=> 2 'foo' to 'mailer' #=> 6 'foo' to 'migration' #=> 8 'foo' to 'model' #=> 4 'foo' to 'resource' #=> 7 'foo' to 'resource_route' #=> 12 'foo' to 'scaffold' #=> 6 'foo' to 'scaffold_controller' #=> 16 'foo' to 'task' #=> 4 'foo' to 'active_record:migration' #=> 21 'foo' to 'active_record:model' #=> 17 'foo' to 'coffee:assets' #=> 12 'foo' to 'css:assets' #=> 10 'foo' to 'css:scaffold' #=> 10 'foo' to 'erb:controller' #=> 12 'foo' to 'erb:mailer' #=> 10 'foo' to 'erb:scaffold' #=> 10 'foo' to 'js:assets' #=> 9 'foo' to 'scss:assets' #=> 11 'foo' to 'scss:scaffold' #=> 11 'foo' to 'test_unit:controller' #=> 18 'foo' to 'test_unit:generator' #=> 18 'foo' to 'test_unit:helper' #=> 16 'foo' to 'test_unit:integration' #=> 20 'foo' to 'test_unit:job' #=> 12 'foo' to 'test_unit:mailer' #=> 16 'foo' to 'test_unit:model' #=> 14 'foo' to 'test_unit:plugin' #=> 16 'foo' to 'test_unit:scaffold' #=> 16 Besides that, the conjunction "or" of the message now appears only between the last two suggestions.
* | Require `belongs_to` by default.Josef Šimánek2015-02-212-0/+15
| | | | | | | | Deprecate `required` option in favor of `optional` for belongs_to.
* | Prefer request_id over uuid and test the aliasRafael Mendonça França2015-02-201-1/+1
| |
* | Remove last empty line when we don't use Windows or JRubymeganemura2015-02-202-2/+2
| |
* | Do not mutate the operations arrayRafael Mendonça França2015-02-191-1/+1
| |
* | Merge pull request #18994 from tgxworld/run_delete_middleware_operations_lastGuillermo Iguaran2015-02-191-2/+4
|\ \ | | | | | | Allow Rack::Runtime to be deleted from middleware stack.
| * | Allow Rack::Runtime to be deleted from middleware stack.Guo Xiang Tan2015-02-191-2/+4
| | | | | | | | | | | | Fixes: https://github.com/rails/rails/issues/16433.
* | | Merge pull request #18393 from y-yagi/fix_mailerRafael Mendonça França2015-02-183-2/+11
|\ \ \ | | | | | | | | follow up to #18074
| * | | follow up to #18074yuuji.yaginuma2015-01-083-2/+11
| | |/ | |/| | | | | | | | | | * ignore mailer suffix when generate test files * add mailer suffix to view files
* | | Revert "Merge pull request #18951 from ↵Rafael Mendonça França2015-02-181-1/+0
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | jurezove/gemfile-lock-to-plugin-gitignore-template" This reverts commit b824dfd44bf2dd932d6d955ac868af1020f0099a, reversing changes made to 265dcb779dd4bfd9745e0131f585749d7034c3c7. Our general recommendation is to check in the lock file in the repository. This make possible to developers and contributors of a plugin always run their tests against a working set of dependencies. Also, bisect is a lot easier, specially if you have git dependencies in your Gemfile.
* | 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
| |
* | 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-062-2/+2
| | | | | | | | | | | | 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-064-94/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #18526 from vipulnsward/add-silence-streamRafael Mendonça França2015-02-051-16/+2
|\ \ | | | | | | Extracted silence_stream method to new module in activesupport/testing
| * | - Extracted silence_stream method to new module in activesupport/testing.Vipul A M2015-01-201-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-051-1/+1
| | | | | | | | | | | | | | | | | | | | | 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-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | 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-314-4/+4
| | | | | | | | | | | | ref: https://github.com/rails/rails/pull/18763#issuecomment-72349769
* | | Fixed a few things from ee9e4c3Godfrey Chan2015-01-304-5/+5
| | | | | | | | | | | | | | | 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-3020-63/+92
| | | | | | | | | | | | | | | | | | 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/
* | | 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.
* | | 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-297-11/+11
|\ \ \ | | | | | | | | Update option to skip test in generators
| * | | Change option description and update test namesMelanie Gilman2015-01-291-1/+1
| | | |
| * | | Update option to skip test in generatorsMelanie Gilman2015-01-277-11/+11
| | | | | | | | | | | | | | | | 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-282-0/+2
|/ / / | | | | | | | | | | | | | | | 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.