diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-03 14:16:54 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-03 14:16:54 -0500 |
| commit | d7d7636973b5d90bd9b245b4b1bac75a9d190a3f (patch) | |
| tree | b24b83836a871720e3ad027b78f6dd43d5c50615 | |
| parent | a034c6fff6aad728eae7d7056e8e538f58a0e0e7 (diff) | |
| parent | 455fa5b30e224407e4fdca46d087ba300a050567 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
| -rw-r--r-- | app/views/users/new.html.erb | 5 | ||||
| -rwxr-xr-x | generate.sh | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 715d40e..2a745cc 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -54,4 +54,7 @@ <p> <input name="commit" type="submit" value="Save User" /> </p> -</form>
\ No newline at end of file +</form> + +<%= link_to 'Already Have an Account? Log in', "signin", :class => "btn btn-warning btn-lg" %> + diff --git a/generate.sh b/generate.sh index 7f0467c..4d70de1 100755 --- a/generate.sh +++ b/generate.sh @@ -14,7 +14,7 @@ NOTEST='--skip-test-unit' set -x bundle exec rails generate scaffold server --force $NOTEST -bundle exec rails generate scaffold tournament game:references --force $NOTEST +bundle exec rails generate scaffold tournament game:references $NOTEST bundle exec rails generate scaffold match tournament:references name:string --force $NOTEST bundle exec rails generate scaffold team $NOTEST bundle exec rails generate scaffold alert author:references message:text $NOTEST |