summaryrefslogtreecommitdiff
path: root/plugins/rails
diff options
context:
space:
mode:
authorPavol Juhas <pavol.juhas@gmail.com>2014-03-17 19:48:10 -0400
committerPavol Juhas <pavol.juhas@gmail.com>2014-03-17 19:48:10 -0400
commit6952105bfe1fd4121fd355dc5f8ec5e03de5541c (patch)
tree604e65e52df88e28f99f49b939aa9547eb009b1c /plugins/rails
parented19ffee5ecc0db6617c1ae753e515d60cb486c6 (diff)
parentca900216302aa1138c793971cf877b5d4e88fb06 (diff)
downloadzsh-6952105bfe1fd4121fd355dc5f8ec5e03de5541c.tar.gz
zsh-6952105bfe1fd4121fd355dc5f8ec5e03de5541c.tar.bz2
zsh-6952105bfe1fd4121fd355dc5f8ec5e03de5541c.zip
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/rails')
-rw-r--r--plugins/rails/rails.plugin.zsh9
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 23d15a9a1..fb46cdcf0 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -1,10 +1,10 @@
function _rails_command () {
- if [ -e "script/server" ]; then
- ruby script/$@
+ if [ -e "bin/rails" ]; then
+ bin/rails $@
elif [ -e "script/rails" ]; then
ruby script/rails $@
- elif [ -e "bin/rails" ]; then
- bin/rails $@
+ elif [ -e "script/server" ]; then
+ ruby script/$@
else
rails $@
fi
@@ -51,6 +51,7 @@ alias rds='rake db:seed'
alias rdd='rake db:drop'
alias rdtc='rake db:test:clone'
alias rdtp='rake db:test:prepare'
+alias rdmtc='rake db:migrate db:test:clone'
alias rlc='rake log:clear'
alias rn='rake notes'