aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorMatthew Eagar <meagar@gmail.com>2017-01-25 10:27:37 -0500
committerGitHub <noreply@github.com>2017-01-25 10:27:37 -0500
commit255babc98b650db7469653aba6405a60efc9e608 (patch)
tree82b8a1fe278d81bb11266648c44e55db5f53c46c /railties/lib/rails
parente524327e510996ad741ba44c5403fe7353519e40 (diff)
parentc6f7c18e25a7fb3719ae15c2d3662e340f63c164 (diff)
downloadrails-255babc98b650db7469653aba6405a60efc9e608.tar.gz
rails-255babc98b650db7469653aba6405a60efc9e608.tar.bz2
rails-255babc98b650db7469653aba6405a60efc9e608.zip
Merge branch 'master' into fix-missing-partial-iteration
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb4
-rw-r--r--railties/lib/rails/generators/rails/plugin/plugin_generator.rb4
2 files changed, 0 insertions, 8 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index fb2af96b45..3cf923faf0 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -187,10 +187,6 @@ module Rails
def initialize(*args)
super
- unless app_path
- raise Error, "Application name should be provided in arguments. For details run: rails --help"
- end
-
if !options[:skip_active_record] && !DATABASES.include?(options[:database])
raise Error, "Invalid value for --database option. Supported for preconfiguration are: #{DATABASES.join(", ")}."
end
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
index 22604d4d9d..49259f32c8 100644
--- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
@@ -195,10 +195,6 @@ task default: :test
def initialize(*args)
@dummy_path = nil
super
-
- unless plugin_path
- raise Error, "Plugin name should be provided in arguments. For details run: rails plugin new --help"
- end
end
public_task :set_default_accessors!