Merge branch 'master' into feature-125

lighthouse-labs · Jan 22, 2015 · 6f0016e · 6f0016e
2 parents 8f37b8d + 4cc8193
commit 6f0016e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/assistance.rb b/app/models/assistance.rb
@@ -43,7 +43,7 @@ def send_notes_to_slack
     options = {
       :username => self.assistor.github_username,
       :icon_url => self.assistor.avatar_url,
-      :channel => 'web-instructors'
+      :channel => ENV['SLACK_CHANNEL']
     }
 
     poster = Slack::Poster.new("lighthouse", ENV["SLACK_TOKEN"], options)

diff --git a/app/views/setup/show.html.slim b/app/views/setup/show.html.slim
@@ -4,6 +4,6 @@ p Congratulations on joining Lighthouse Labs.
 
 p Before starting to write code, we have some more preparatory activities for you to complete.
 
-p The setup work below can be done from home, prior to day1 of the bootcamp, giving you more time on your first day to focus on other activities. But at the very latest, you will need them done before day2, which is when we start running needing our dev environment in order to run Ruby.
+/ p The setup work below can be done from home, prior to day1 of the bootcamp, giving you more time on your first day to focus on other activities. But at the very latest, you will need them done before day2, which is when we start running needing our dev environment in order to run Ruby.
 
 = render partial: 'activities/activity', collection: @activities