diff options
| author | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-14 10:32:03 -0400 |
|---|---|---|
| committer | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-14 10:32:03 -0400 |
| commit | 223fd60ba597b8c23569c65878d766c3c933fa70 (patch) | |
| tree | 33c5c6a150293e6cf81f26f0f1b9c733dcf8aab7 /plugins/rails | |
| parent | 185cb6e37352cc0d92042e35d259b0de3f5f3886 (diff) | |
| parent | ee21fe94473404b58cbaea5b2c279f7a07c34ce1 (diff) | |
| download | zsh-223fd60ba597b8c23569c65878d766c3c933fa70.tar.gz zsh-223fd60ba597b8c23569c65878d766c3c933fa70.tar.bz2 zsh-223fd60ba597b8c23569c65878d766c3c933fa70.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'plugins/rails')
| -rw-r--r-- | plugins/rails/rails.plugin.zsh | 9 |
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' |