Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: marseille/Gamer-Ryoudan
base: 118e26dd15
...
head fork: marseille/Gamer-Ryoudan
compare: 8fc551f602
Checking mergeability… Don't worry, you can still create the pull request.
  • 6 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Dec 19, 2011
muradin007@gmail.com added contact notice for a frequent error 2a1ffd2
muradin007@gmail.com Merge branch 'master' into error_notice 5a635f0
muradin007@gmail.com merged changes 0a5ed8b
muradin007@gmail.com added comment to hoe for heroku 02bd554
muradin007@gmail.com added comment to hoe for heroku 53633a6
muradin007@gmail.com Merge branch 'error_notice' 8fc551f
View
3  .gems
@@ -1,7 +1,8 @@
aws-s3
-rails -v 2.3.8
+rails -v 2.3.14
authlogic
mysql
+hoe -v 1.5.1
ruby-github
rmagick
will_paginate
View
2  app/views/header/_header_navigation.html.erb
@@ -6,4 +6,4 @@
<%= render :partial => "header/menu" %>
<%= render :partial => "header/spiky_thing" %>
<div class="line"></div><br />
- <%#<label class="red_text clear">slow site maitenance due to school, sorry </label>%>
+ <%#<label class="red_text clear">Please contact me directly if you are the user getting an error from "http://gamer-ryoudan.heroku.com/game_list/game_list" </label>%>
View
1  public/500.html
@@ -55,6 +55,7 @@
</div>
</div>
<div class="line"></div>
+ <label class="red_text clear">Please contact me directly if you see this error frequently. Especially if this is the "http://gamer-ryoudan.heroku.com/game_list/game_list" error </label>
<h1>ZOMG THE PAGE BLEW UP! OH NOES!</h1>
<br />
Try again another time, and make sure you are logged in for things that require a login. visiting the same page just from the url will likely have <br />problems since all the parameters haven't been passed

No commit comments for this range

Something went wrong with that request. Please try again.