aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
* Reduce string objects by using \ instead of + or << for concatenating stringsAkira Matsuda2017-01-125-8/+8
| | | | (I personally prefer writing one string in one line no matter how long it is, though)
* Merge pull request #27652 from y-yagi/remove_unused_requireRafael França2017-01-113-6/+0
|\ | | | | remove unused requires
| * remove unused requiresyuuji.yaginuma2017-01-123-6/+0
| | | | | | | | Related to 0129ca2eeb6d5b2ea8c6e6be38eeb770fe45f1fa, f7782812f7e727178e4a743aa2874c078b722eef, f9ed83321ac1d1902578a0aacdfe55d3db754219
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-01-116-14/+14
|\ \ | | | | | | | | | | | | Conflicts: railties/lib/rails/generators.rb
| * | Small grammar fixes in `Rails::Paths`Jon Moss2016-12-201-2/+2
| | | | | | | | | | | | [ci skip]
| * | Small grammar fixes in `Rails::Info`Jon Moss2016-12-201-3/+3
| | | | | | | | | | | | [ci skip]
| * | Capitalize RakeJon Moss2016-12-191-3/+3
| | | | | | | | | | | | [ci skip]
| * | Capitalize Ruby and small grammar fixJon Moss2016-12-191-1/+1
| | | | | | | | | | | | [ci skip]
| * | Capitalize Rack gem nameJon Moss2016-12-191-3/+3
| | | | | | | | | | | | [ci skip]
| * | Capitalize Thor gem nameJon Moss2016-12-192-2/+2
| | | | | | | | | | | | [ci skip]
* | | Current default Rails app encoding "utf-8" looks more like a W3C charset ↵Akira Matsuda2017-01-111-1/+1
| |/ |/| | | | | than a ruby encoding
* | Don't generate HTML/ERB templates for scaffold controller with --api flagPrathamesh Sonpatki2017-01-071-1/+6
| | | | | | | | - Fixes #27591.
* | `self.` is not needed when calling its own instance methodAkira Matsuda2017-01-058-9/+9
| | | | | | | | Actually, private methods cannot be called with `self.`, so it's not just redundant, it's a bad habit in Ruby
* | Merge pull request #27399 from sinogermany/rails-env-for-empty-string-env-varsRafael Mendonça França2017-01-031-1/+2
|\ \ | | | | | | | | | Rails env for empty string env vars
| * | Rails.env falls back to dev mode when env var is emptyDaniel Deng2017-01-041-1/+2
| |/
* | Revert "Merge pull request #27550 from ↵Rafael Mendonça França2017-01-035-6/+6
| | | | | | | | | | | | | | | | | | mtsmfm/fix-generator-command-for-nested-rails-engine" This reverts commit 1e969bfb98b88799e2c759fce25a1d8cf00d7ce7, reversing changes made to a5041f267ded119c2d00b8786c2f2c1e3f93c8a1. Reason: It breaks the public API
* | Merge pull request #27550 from ↵Rafael França2017-01-035-6/+6
|\ \ | | | | | | | | | | | | mtsmfm/fix-generator-command-for-nested-rails-engine Fix generator command for nested (namespaced) rails engine
| * | Fix generator command for nested (namespaced) rails engineFumiaki MATSUSHIMA2017-01-035-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we create nested (namespaced) rails engine such like bukkits-admin, `bin/rails g scaffold User name:string age:integer` will create `bukkits-admin/app/controllers/bukkits/users_controller.rb` but it should create `bukkits-admin/app/controllers/bukkits/admin/users_controller.rb`. In #6643, we changed `namespaced_path` as root path because we supposed application_controller is always in root but nested rails engine's application_controller will not.
* | | Remove deprecated CONTROLLER environment variable for routes taskRafael Mendonça França2017-01-031-7/+0
| | |
* | | Remove deprecated tasks in railtiesRafael Mendonça França2017-01-031-12/+0
| | |
* | | Remove deprecated file `rails/rack/debuggerRafael Mendonça França2017-01-031-3/+0
| | |
* | | Remove deprecated config.serve_static_filesRafael Mendonça França2017-01-031-19/+0
| | |
* | | Remove deprecated `config.static_cache_control`Rafael Mendonça França2017-01-032-13/+1
| | |
* | | Merge pull request #24814 from vipulnsward/24811-fix-double-tasksArthur Nogueira Neves2017-01-031-1/+0
|\ \ \ | | | | | | | | Don't list out tasks as separately that are under lib, which cause them to be listed twice under Libraries and tasks.
| * | | Don't list out tasks as separately that are under lib, which cause them to ↵Vipul A M2016-07-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be listed twice under Libraries and tasks. We already count and list it under libraries. Fixes #24811
* | | | Merge pull request #27435 from kamipo/follow_up_25307Sean Griffin2017-01-032-2/+2
|\ \ \ \ | |_|/ / |/| | | Active Record supports MySQL >= 5.1.10
| * | | Active Record supports MySQL >= 5.1.10Ryuta Kamizono2016-12-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #25307 and #23458. Related with #27422. We are using `information_schema.referential_constraints` since #25307. The table was introduced in MySQL 5.1.10. MySQL 5.0 is too old. It is enough to support >= 5.1.10 at least. MySQL 5.0 GA was released in Dec 2005 and already EOL in Dec 2011. MySQL 5.1 GA was released in Dec 2008 and already EOL in Dec 2013.
* | | | Remove bin/yarn if yarn is skipped, tidy up testsPrathamesh Sonpatki2017-01-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | - No need to remove bin/yarn separately for API only apps because :skip_yarn is set to true for API only apps. - Added a test for :skip_yarn config.
* | | | remove unnecessary `remove_file`yuuji.yaginuma2017-01-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | It deletes the `app/mailers` directory itself, it is not necessary to delete the file individually. https://github.com/rails/rails/blob/master/railties/lib/rails/generators/rails/app/app_generator.rb#L329
* | | | Match Thor's `desc` signature.Kasper Timm Hansen2016-12-311-1/+1
| | | | | | | | | | | | | | | | It can also take an options hash.
* | | | Prevent command name being printed twice.Kasper Timm Hansen2016-12-311-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thor would inadvertantly duplicate the command usage because of the help method in a command class. Fixes #26664. [ Yuji Yaginuma & Kasper Timm Hansen ]
* | | | remove `skip_bundle` option from plugin generatoryuuji.yaginuma2016-12-312-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `bundle install` is not executed regardless of whether the option is specified or not. Ref: fbd1e98cf983572ca9884f17f933ffe92833632a
* | | | Enforce middleware ordering with a test, instead of commentsMatthew Draper2016-12-311-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want the actual order to be very predictable, so it's rightly defined in code -- not with an on-the-fly tsort. But we can do the tsort here, and then verify that it matches the implemented ordering. This way we don't leave future readers guessing which parts of the ordering are deliberate and which are arbitrary.
* | | | Allow log remote ip addres when config.action_dispatch.trusted_proxies passedLeonid Batizhevsky2016-12-301-1/+2
| | | |
* | | | Remove needless `ActiveSupport::Deprecation.silence`Ryuta Kamizono2016-12-311-3/+1
| | | |
* | | | Remove deprecated support to passing a column to #quoteRafael Mendonça França2016-12-291-0/+1
| | | |
* | | | Merge branch 'master' into fix_26964Kasper Timm Hansen2016-12-2940-472/+449
|\ \ \ \
| * \ \ \ Merge branch 'master' into clear_all_environments_log_by_defaultRafael França2016-12-2966-500/+580
| |\ \ \ \
| | * | | | Fix Rubocop violations and fix documentation visibilityRafael Mendonça França2016-12-281-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some methods were added to public API in 5b14129d8d4ad302b4e11df6bd5c7891b75f393c and they should be not part of the public API.
| | * | | | Correct indent-accounting in controller route generationMatthew Draper2016-12-251-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #27447 [Matthew Draper & Yuuji Yaginuma]
| | * | | | Privatize unneededly protected methods in RailtiesAkira Matsuda2016-12-2525-135/+136
| | | | | |
| | * | | | Privatize some methods that were originally protectedAkira Matsuda2016-12-251-25/+27
| | | | | |
| | * | | | Prefer class << self; def over def self.Akira Matsuda2016-12-251-200/+200
| | | | | |
| | * | | | `protected` here doesn't protect anythingAkira Matsuda2016-12-251-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | there aren't any instance method defined in this class
| | * | | | Describe what we are protectingAkira Matsuda2016-12-232-0/+4
| | |/ / /
| | * | / `ARGV.shift` before calling Rails generatorsJon Moss2016-12-171-0/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | Gems like rspec-rails depend on `ARGV` being shifted, and `scaffold` (for example) not being the first item in `ARGV`. This should allow rspec-rails to be passing on Rails master.
| | * | Remove unused method `namespaced_file_path`Fumiaki MATSUSHIMA2016-12-141-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` $ git grep namespaced_file_path railties/lib/rails/generators/named_base.rb: def namespaced_file_path railties/lib/rails/generators/named_base.rb: @namespaced_file_path ||= namespaced_class_path.join("/") ```
| | * | use appropriate type for `rc` optionyuuji.yaginuma2016-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following warning. ``` Expected boolean default value for '--rc'; got "~/.railsrc" (string) ```
| | * | Don't assign a default to `webpack`.Kasper Timm Hansen2016-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unintentionally makes `--webpack` implied on `rails new apper`. If passed `--webpack` Thor assigns `"webpack"` to `options[:webpack]`, so we can check for that instead of `"base"`.
| | * | Add option to trigger JS framework-specific installation as part of webpack ↵David Heinemeier Hansson2016-12-121-2/+5
| | | | | | | | | | | | | | | | setup