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: tjgrathwell/docs
...
head fork: tjgrathwell/docs
Checking mergeability… Don't worry, you can still create the pull request.
  • 7 commits
  • 6 files changed
  • 0 commit comments
  • 4 contributors
Commits on Jun 11, 2012
@tjgrathwell Changed the 'git commit' expected output to mention Gemfile instead o…
…f README


Rails generates a README.rdoc instead of README; I bet it will always generate a Gemfile. Well, until it doesn't.
60ac2b5
Commits on Jun 13, 2012
@jbx72487 jbx72487 corrected tip to "period after the word add in the FIRST line", not "…
…third"
9c5e859
@jbx72487 jbx72487 Updated Steps and Explanation to be consistent with each other 90b333c
@nuclearsandwich nuclearsandwich Merge pull request #62 from jbx72487/patch-2. beda345
@nuclearsandwich nuclearsandwich Use 1.9 hash syntax everywhere for consistency with Rails.
Since a new Rails project will generate 1.9 hashes we've opted to stick
with the 1.9 as the preferred hash syntax for Railsbridge.
1a994d4
@alexch alexch I didn't think we were using these mediawiki pages any more, but at t…
…he last installfest I saw this page on someone's screen, and noticed this error. So I fixed it.
63dbf4a
Commits on Jun 21, 2012
@tjgrathwell Default Heroku stack is now cedar, so less --stack cedaring is required. 1b5e1fe
View
14 sites/curriculum/allow_people_to_vote.step
@@ -45,16 +45,18 @@ end
explanation {
- message "First we added this line to `app/views/topics/index.html.erb`"
+ message "First we added these two lines to `app/views/topics/index.html.erb`"
source_code :erb, <<-HTML
- <td><%= button_to '+1', votes_path(:topic_id => topic.id), :method => :post %></td>
+ <td><%= pluralize(topic.votes.length, "vote") %></td>
+ <td><%= button_to '+1', votes_path(topic_id: topic.id), method: :post %></td>
HTML
message <<-MARKDOWN
- * `button_to '+1'` creates an html button with the value '+1'
- * `votes_path(:topic_id => topic.id)` creates the right url for the action we want to invoke. In this case, we want to create a vote for the current topic.
- * `votes_path(:topic_id => 42)` would output `/votes?topic_id=42`
- * `:method => :post` ensures we do the create action of CRUD, not the read action.
+ * `pluralize(topic.votes.length, "vote")' displays the number of votes the topic has, plus the word 'vote' or 'votes' accordingly.
+ * `button_to '+1'` creates an html button with the value '+1'.
+ * `votes_path(topic_id: topic.id)` creates the right url for the action we want to invoke. In this case, we want to create a vote for the current topic.
+ * `votes_path(topic_id: 42)` would output `/votes?topic_id=42`
+ * `method: :post` ensures we do the create action of CRUD, not the read action.
The changes we made to votes controller are a bit more complicated so let's work through them line by line.
View
2  sites/curriculum/commit_and_push_to_heroku.step
@@ -15,7 +15,7 @@ git push heroku master
heroku run rake db:migrate
SHELL
- tip "there is a period after the word add in the third line"
+ tip "there is a period after the word add in the first line"
end
step "Check that it worked" do
View
4 sites/curriculum/deploy_to_heroku.step
@@ -6,8 +6,8 @@ end
steps do
step "Create a heroku application" do
- console "heroku create --stack cedar"
- message "`heroku create` registers a new application on heroku's system. The default 'stack' is currently Bamboo, which is a little old, so `--stack cedar` specifies that we'll use the newer Cedar stack."
+ console "heroku create"
+ message "`heroku create` registers a new application on heroku's system."
end
step "Edit the Gemfile" do
View
7 sites/installfest/create_and_deploy_a_rails_app.step
@@ -100,7 +100,7 @@ With Git, there are usually many ways to do very similar things.
end
console "git commit -m \"initial commit\""
- result "a lot of lines like create mode 100644 README"
+ result "a lot of lines like create mode 100644 Gemfile"
console "git log"
result "(Your git name and \"initial commit\" message.)"
@@ -112,13 +112,14 @@ step "Deploy your app to Heroku" do
message "The very first time you use `heroku` you must enter your Heroku email address and password."
- console "heroku create --stack cedar"
+ console "heroku create"
result <<-OUTPUT
Enter your Heroku credentials.
Email: myemail@example.com
Password:
Uploading ssh public key /Users/smei/.ssh/id_rsa.pub
-Created http://floating-winter-18.heroku.com/ | git@heroku.com:floating-winter-18.git
+Creating floating-winter-18... done, stack is cedar
+http://floating-winter-18.heroku.com/ | git@heroku.com:floating-winter-18.git
Git remote heroku added
OUTPUT
View
2  sites/installfest/get_a_sticker.step
@@ -199,7 +199,7 @@ GIT_COMMIT
message "The name of your heroku app will be different. That is fine."
- console "heroku create --stack cedar"
+ console "heroku create"
result <<-HEROKU_CREATE
Creating evening-wind-5284... done, stack is cedar
http://evening-wind-5284.heroku.com/ | git@heroku.com:evening-wind-5284.git
View
3  sites/workshop/command_prompt.mw
@@ -2,7 +2,8 @@ There are several ways of opening a terminal window. You'll be using it often,
== Opening a terminal ==
=== Windows 7 ===
-* Click the Windows Icon. In the "Search programs and files" field, type: <tt>cmd <enter></tt>
+* Click the Windows Icon. In the "Search programs and files" field, type: <tt>cmd</tt> and press the [enter] key
+
[[File:Win7 search programs.jpg]]
== Creating a terminal shortcut icon on the Taskbar ==

No commit comments for this range

Something went wrong with that request. Please try again.