Merge branch 'master' into 'master'

Issue 155: Slack-notifier update to fix 500 errors

Slack-notifier 0.2.0 is broken for Rails 1.9.3

This update bumps the Gemfile/Gemfile.lock to use 0.3.2 version of the gem file to correct the issue.

slack-notifier changelog addressing the issue

https://github.com/stevenosloan/slack-notifier/blob/master/changelog.md

Issue 155 about the error

https://gitlab.com/gitlab-org/gitlab-ce/issues/155

Gemfile

@@ -131,7 +131,7 @@ gem "gitlab-flowdock-git-hook", "~> 0.4.2"
 gem "gemnasium-gitlab-service", "~> 0.2"
 
 # Slack integration
-gem "slack-notifier", "~> 0.2.0"
+gem "slack-notifier", "~> 0.3.2"
 
 # d3
 gem "d3_rails", "~> 3.1.4"
@@ -232,4 +232,4 @@ end
 
 group :production do
   gem "gitlab_meta", '6.0'
-end
+end
\ No newline at end of file

Gemfile.lock

@@ -462,7 +462,7 @@ GEM
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     six (0.2.0)
-    slack-notifier (0.2.0)
+    slack-notifier (0.3.2)
     slim (2.0.2)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
@@ -662,4 +662,4 @@ DEPENDENCIES
   unicorn (~> 4.6.3)
   unicorn-worker-killer
   version_sorter
-  webmock
+  webmock
\ No newline at end of file