aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-12-31 13:30:08 +0100
committerGitHub <noreply@github.com>2016-12-31 13:30:08 +0100
commit714941687220effbd12dc5217904f0b8da5647f5 (patch)
treeee566887e29a4161b7a02c476d054408424c0989
parentc3ff36815c542fac25b2da4e3cff320499b60998 (diff)
parent9b72fcc3c22a6f75f37f52dd6cb682bc00c51cf0 (diff)
downloadrails-714941687220effbd12dc5217904f0b8da5647f5.tar.gz
rails-714941687220effbd12dc5217904f0b8da5647f5.tar.bz2
rails-714941687220effbd12dc5217904f0b8da5647f5.zip
Merge pull request #27522 from y-yagi/remove_skip_bundle_option_from_plugin_generator
remove `skip_bundle` option from plugin generator
-rw-r--r--railties/lib/rails/generators/app_base.rb3
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb3
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 66e2804a67..ea88afe9f4 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -42,9 +42,6 @@ module Rails
class_option :skip_gemfile, type: :boolean, default: false,
desc: "Don't create a Gemfile"
- class_option :skip_bundle, type: :boolean, aliases: "-B", default: false,
- desc: "Don't run bundle install"
-
class_option :skip_git, type: :boolean, aliases: "-G", default: false,
desc: "Skip .gitignore file"
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 070a6ac124..9ae48b3648 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -175,6 +175,9 @@ module Rails
class_option :api, type: :boolean,
desc: "Preconfigure smaller stack for API only apps"
+ class_option :skip_bundle, type: :boolean, aliases: "-B", default: false,
+ desc: "Don't run bundle install"
+
def initialize(*args)
super