aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/commands/plugin.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index c86607fe21..f5831d3352 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Make "script/plugin install" work with svn+ssh URLs. [Sam Stephenson]
+
* Added lib/ to the directories that will get application docs generated [DHH]
* Add observer generator. Closes #5167. [francois.beausoleil@gmail.com]
diff --git a/railties/lib/commands/plugin.rb b/railties/lib/commands/plugin.rb
index 51c75aac3b..946e947f70 100644
--- a/railties/lib/commands/plugin.rb
+++ b/railties/lib/commands/plugin.rb
@@ -159,7 +159,7 @@ class Plugin
end
def svn_url?
- @uri =~ /svn:\/\/*/
+ @uri =~ /svn(?:\+ssh)?:\/\/*/
end
def installed?