| |   |
| 38 | 38 | <li><%= link_to "Dashboard", dashboard_path -%></li> |
| 39 | 39 | <% end -%> |
| 40 | 40 | <li><%= link_to "Projects", projects_path -%></li> |
| 41 | <% if logged_in? -%> |
| 42 | <li><%= link_to "FAQ", faq_path -%></li> |
| 43 | <% else -%> |
| 41 | 44 | <li><%= link_to "About", about_path -%></li> |
| 45 | <% end -%> |
| 42 | 46 | </ul> |
| 43 | 47 | </div> |
| 44 | 48 | <div id="submenu"> |
| … | … | |
| 76 | 76 | <ul> |
| 77 | 77 | <li><%= link_to "Home", root_path -%> | </li> |
| 78 | 78 | <li><%= link_to "About", about_path -%> | </li> |
| 79 | <li><%= link_to "FAQ", faq_path -%> | </li> |
| 79 | 80 | <li><%= link_to "Discussion group", "http://groups.google.com/group/gitorious" -%></li> |
| 80 | 81 | </ul> |
| 81 | 82 | </div> |
| toggle raw diff |
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -38,7 +38,11 @@
<li><%= link_to "Dashboard", dashboard_path -%></li>
<% end -%>
<li><%= link_to "Projects", projects_path -%></li>
+ <% if logged_in? -%>
+ <li><%= link_to "FAQ", faq_path -%></li>
+ <% else -%>
<li><%= link_to "About", about_path -%></li>
+ <% end -%>
</ul>
</div>
<div id="submenu">
@@ -72,6 +76,7 @@
<ul>
<li><%= link_to "Home", root_path -%> | </li>
<li><%= link_to "About", about_path -%> | </li>
+ <li><%= link_to "FAQ", faq_path -%> | </li>
<li><%= link_to "Discussion group", "http://groups.google.com/group/gitorious" -%></li>
</ul>
</div> |
| |   |
| 52 | 52 | </p> |
| 53 | 53 | </div> |
| 54 | 54 | |
| 55 | | <div class="section"> |
| 56 | | <a name="faq"></a><h1>FAQ</h1> |
| 57 | | |
| 58 | | <h3>I get "fatal: no matching remote head" when trying to clone a repository</h3> |
| 59 | | <p> |
| 60 | | Most likely the repository you're trying to clone is empty, and the error |
| 61 | | message is git's friendly way of telling you that. See below (or by clicking |
| 62 | | "more info" next to repositorys "push url") for info on how t push to it. |
| 63 | | </p> |
| 64 | | |
| 65 | | <hr /> |
| 66 | | |
| 67 | | <h3>How do I point my local Git repository at Gitorious?</h3> |
| 68 | | <p> |
| 69 | | Easiest way is to put something like the following in your <code>.git/config</code> |
| 70 | | file of the repository you wish to push: |
| 71 | | <pre> |
| 72 | | [remote "origin"] |
| 73 | | url = git@gitorious.org:<em>project</em>/<em>repository.git</em> |
| 74 | | fetch = +refs/heads/*:refs/remotes/origin/* |
| 75 | | [branch "master"] |
| 76 | | remote = origin |
| 77 | | merge = refs/heads/master |
| 78 | | </pre> |
| 79 | | and then <code>git push origin master</code> to push the code to Gitorious. |
| 80 | | </p> |
| 81 | | <p> |
| 82 | | You can also just run "<code>git push git@gitorious.org:tumbline/mainline.git</code>", or |
| 83 | | you can setup a remote by doing the following (add --fetch to the add call to |
| 84 | | get the config from above): |
| 85 | | <pre> |
| 86 | | git remote add origin git@gitorious.org:<em>project</em>/<em>repository.git</em> |
| 87 | | # to push the master branch to the origin remote we added above: |
| 88 | | git push origin master |
| 89 | | # after that you can just do: |
| 90 | | git push |
| 91 | | </pre> |
| 92 | | </p> |
| 93 | | |
| 94 | | <hr /> |
| 95 | | |
| 96 | | <h3>Why is my email displayed?</h3> |
| 97 | | <p> |
| 98 | | The email you used to signup with Gitorious is displayed to other users, so that they |
| 99 | | can contact you about your projects if they need to. We do however take light |
| 100 | | measures against crawlers by not displaying your email in completely plain text. <br /> |
| 101 | | But just to be clear: we won't sell or use any information you give to |
| 102 | | gitorious.org against you or anyone else for financial and/or personal gains. |
| 103 | | </p> |
| 104 | | |
| 105 | | <hr /> |
| 106 | | |
| 107 | | <h3>Why do I need to upload my public SSH key?</h3> |
| 108 | | <p> |
| 109 | | When you push to a Git repository, your public key is how we authenticate |
| 110 | | you and if have the permissions required to do a commit to a given repository |
| 111 | | </p> |
| 112 | | </div> |
| 113 | | |
| 114 | 55 | <% content_for :sidebar do -%> |
| 115 | 56 | <ul class="links"> |
| 116 | 57 | <li><a href="#about">About</a></li> |
| 117 | 58 | <li><a href="#contact">Contact</a></li> |
| 118 | | <li><a href="#faq">FAQ</a></li> |
| 59 | <li><%= link_to "FAQ", faq_path -%></li> |
| 119 | 60 | </ul> |
| 120 | 61 | <% end -%> |
| toggle raw diff |
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -52,69 +52,10 @@
</p>
</div>
-<div class="section">
- <a name="faq"></a><h1>FAQ</h1>
-
- <h3>I get "fatal: no matching remote head" when trying to clone a repository</h3>
- <p>
- Most likely the repository you're trying to clone is empty, and the error
- message is git's friendly way of telling you that. See below (or by clicking
- "more info" next to repositorys "push url") for info on how t push to it.
- </p>
-
- <hr />
-
- <h3>How do I point my local Git repository at Gitorious?</h3>
- <p>
- Easiest way is to put something like the following in your <code>.git/config</code>
- file of the repository you wish to push:
- <pre>
- [remote "origin"]
- url = git@gitorious.org:<em>project</em>/<em>repository.git</em>
- fetch = +refs/heads/*:refs/remotes/origin/*
- [branch "master"]
- remote = origin
- merge = refs/heads/master
- </pre>
- and then <code>git push origin master</code> to push the code to Gitorious.
- </p>
- <p>
- You can also just run "<code>git push git@gitorious.org:tumbline/mainline.git</code>", or
- you can setup a remote by doing the following (add --fetch to the add call to
- get the config from above):
- <pre>
- git remote add origin git@gitorious.org:<em>project</em>/<em>repository.git</em>
- # to push the master branch to the origin remote we added above:
- git push origin master
- # after that you can just do:
- git push
- </pre>
- </p>
-
- <hr />
-
- <h3>Why is my email displayed?</h3>
- <p>
- The email you used to signup with Gitorious is displayed to other users, so that they
- can contact you about your projects if they need to. We do however take light
- measures against crawlers by not displaying your email in completely plain text. <br />
- But just to be clear: we won't sell or use any information you give to
- gitorious.org against you or anyone else for financial and/or personal gains.
- </p>
-
- <hr />
-
- <h3>Why do I need to upload my public SSH key?</h3>
- <p>
- When you push to a Git repository, your public key is how we authenticate
- you and if have the permissions required to do a commit to a given repository
- </p>
-</div>
-
<% content_for :sidebar do -%>
<ul class="links">
<li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li>
- <li><a href="#faq">FAQ</a></li>
+ <li><%= link_to "FAQ", faq_path -%></li>
</ul>
<% end -%>
\ No newline at end of file |
| |   |
| 1 | <h1>FAQ</h1> |
| 2 | |
| 3 | <h3>I get "fatal: no matching remote head" when trying to clone a repository</h3> |
| 4 | <p> |
| 5 | Most likely the repository you're trying to clone is empty, and the error |
| 6 | message is git's friendly way of telling you that. See below (or by clicking |
| 7 | "more info" next to repositorys "push url") for info on how t push to it. |
| 8 | </p> |
| 9 | |
| 10 | <hr /> |
| 11 | |
| 12 | <h3>How do I point my local Git repository at Gitorious?</h3> |
| 13 | <p> |
| 14 | Easiest way is to put something like the following in your <code>.git/config</code> |
| 15 | file of the repository you wish to push: |
| 16 | <pre> |
| 17 | [remote "origin"] |
| 18 | url = git@gitorious.org:<em>project</em>/<em>repository.git</em> |
| 19 | fetch = +refs/heads/*:refs/remotes/origin/* |
| 20 | [branch "master"] |
| 21 | remote = origin |
| 22 | merge = refs/heads/master |
| 23 | </pre> |
| 24 | and then <code>git push origin master</code> to push the code to Gitorious. |
| 25 | </p> |
| 26 | <p> |
| 27 | You can also just run "<code>git push git@gitorious.org:tumbline/mainline.git</code>", or |
| 28 | you can setup a remote by doing the following (add --fetch to the add call to |
| 29 | get the config from above): |
| 30 | <pre> |
| 31 | git remote add origin git@gitorious.org:<em>project</em>/<em>repository.git</em> |
| 32 | # to push the master branch to the origin remote we added above: |
| 33 | git push origin master |
| 34 | # after that you can just do: |
| 35 | git push |
| 36 | </pre> |
| 37 | </p> |
| 38 | |
| 39 | <hr /> |
| 40 | |
| 41 | <h3>Why is my email displayed?</h3> |
| 42 | <p> |
| 43 | The email you used to signup with Gitorious is displayed to other users, so that they |
| 44 | can contact you about your projects if they need to. We do however take light |
| 45 | measures against crawlers by not displaying your email in completely plain text. <br /> |
| 46 | But just to be clear: we won't sell or use any information you give to |
| 47 | gitorious.org against you or anyone else for financial and/or personal gains. |
| 48 | </p> |
| 49 | |
| 50 | <hr /> |
| 51 | |
| 52 | <h3>Why do I need to upload my public SSH key?</h3> |
| 53 | <p> |
| 54 | When you push to a Git repository, your public key is how we authenticate |
| 55 | you and if have the permissions required to do a commit to a given repository |
| 56 | </p> |
| 57 | |
| 58 | <hr /> |
| 59 | |
| 60 | <h3>What version of Git is Gitorious running?</h3> |
| 61 | <p> |
| 62 | <code>git version 1.5.3.7</code> |
| 63 | </p> |
| 64 | |
| 65 | <% content_for :sidebar do -%> |
| 66 | <ul class="links"> |
| 67 | <li><%= link_to "About", about_path(:anchor => "about") -%></li> |
| 68 | <li><%= link_to "Contact", about_path(:anchor => "contact") -%></li> |
| 69 | <li><%= link_to "FAQ", faq_path -%></li> |
| 70 | </ul> |
| 71 | <% end -%> |
| toggle raw diff |
--- /dev/null
+++ b/app/views/site/faq.html.erb
@@ -0,0 +1,71 @@
+<h1>FAQ</h1>
+
+<h3>I get "fatal: no matching remote head" when trying to clone a repository</h3>
+<p>
+ Most likely the repository you're trying to clone is empty, and the error
+ message is git's friendly way of telling you that. See below (or by clicking
+ "more info" next to repositorys "push url") for info on how t push to it.
+</p>
+
+<hr />
+
+<h3>How do I point my local Git repository at Gitorious?</h3>
+<p>
+ Easiest way is to put something like the following in your <code>.git/config</code>
+ file of the repository you wish to push:
+<pre>
+[remote "origin"]
+ url = git@gitorious.org:<em>project</em>/<em>repository.git</em>
+ fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+ remote = origin
+ merge = refs/heads/master
+</pre>
+ and then <code>git push origin master</code> to push the code to Gitorious.
+</p>
+<p>
+ You can also just run "<code>git push git@gitorious.org:tumbline/mainline.git</code>", or
+ you can setup a remote by doing the following (add --fetch to the add call to
+ get the config from above):
+ <pre>
+ git remote add origin git@gitorious.org:<em>project</em>/<em>repository.git</em>
+ # to push the master branch to the origin remote we added above:
+ git push origin master
+ # after that you can just do:
+ git push
+ </pre>
+</p>
+
+<hr />
+
+<h3>Why is my email displayed?</h3>
+<p>
+ The email you used to signup with Gitorious is displayed to other users, so that they
+ can contact you about your projects if they need to. We do however take light
+ measures against crawlers by not displaying your email in completely plain text. <br />
+ But just to be clear: we won't sell or use any information you give to
+ gitorious.org against you or anyone else for financial and/or personal gains.
+</p>
+
+<hr />
+
+<h3>Why do I need to upload my public SSH key?</h3>
+<p>
+ When you push to a Git repository, your public key is how we authenticate
+ you and if have the permissions required to do a commit to a given repository
+</p>
+
+<hr />
+
+<h3>What version of Git is Gitorious running?</h3>
+<p>
+ <code>git version 1.5.3.7</code>
+</p>
+
+<% content_for :sidebar do -%>
+ <ul class="links">
+ <li><%= link_to "About", about_path(:anchor => "about") -%></li>
+ <li><%= link_to "Contact", about_path(:anchor => "contact") -%></li>
+ <li><%= link_to "FAQ", faq_path -%></li>
+ </ul>
+<% end -%>
\ No newline at end of file |
| |   |
| 65 | 65 | |
| 66 | 66 | map.dashboard "dashboard", :controller => "site", :action => "dashboard" |
| 67 | 67 | map.about "about", :controller => "site", :action => "about" |
| 68 | map.faq "about/faq", :controller => "site", :action => "faq" |
| 68 | 69 | |
| 69 | 70 | # Install the default route as the lowest priority. |
| 70 | 71 | map.connect ':controller/:action/:id.:format' |
| toggle raw diff |
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -65,6 +65,7 @@ ActionController::Routing::Routes.draw do |map|
map.dashboard "dashboard", :controller => "site", :action => "dashboard"
map.about "about", :controller => "site", :action => "about"
+ map.faq "about/faq", :controller => "site", :action => "faq"
# Install the default route as the lowest priority.
map.connect ':controller/:action/:id.:format' |