diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
| commit | 0d3a1f6030eec5631892ec733ec75001bfe2f9ff (patch) | |
| tree | 00ad96fd52bcdebc2e96ebb3157e314b2466fc22 /generate.sh | |
| parent | 59b2dc33ea83d5d5a52a72d14213f564afe8f0ce (diff) | |
| parent | 699bd065c06689a159c11ac3aacef6b34001617c (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
Diffstat (limited to 'generate.sh')
| -rwxr-xr-x | generate.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/generate.sh b/generate.sh index 2bf027a..807b9ef 100755 --- a/generate.sh +++ b/generate.sh @@ -28,6 +28,7 @@ bundle exec rails generate model game_attribute game:references key:text type:in bundle exec rails generate model server_settings $NOTEST bundle exec rails generate controller search $NOTEST bundle exec rails generate controller main $NOTEST +bundle exec rails generate controller static $NOTEST #for the tournament controller to generate options bundle exec rails generate model tournament_option $NOTEST |