Download as
Browse Code »

Commit f2040c29511eda5c7e074c58c8fb918895e0d8c9

Authored by Dmitriy Zaporozhets
2 parents 0d3ba71b 72e82151
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

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
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
@@ -131,7 +131,7 @@ gem "gitlab-flowdock-git-hook", "~> 0.4.2" @@ -131,7 +131,7 @@ gem "gitlab-flowdock-git-hook", "~> 0.4.2"
131 gem "gemnasium-gitlab-service", "~> 0.2" 131 gem "gemnasium-gitlab-service", "~> 0.2"
132 132
133 # Slack integration 133 # Slack integration
134 -gem "slack-notifier", "~> 0.2.0" 134 +gem "slack-notifier", "~> 0.3.2"
135 135
136 # d3 136 # d3
137 gem "d3_rails", "~> 3.1.4" 137 gem "d3_rails", "~> 3.1.4"
@@ -232,4 +232,4 @@ end @@ -232,4 +232,4 @@ end
232 232
233 group :production do 233 group :production do
234 gem "gitlab_meta", '6.0' 234 gem "gitlab_meta", '6.0'
235 -end 235 -end
  236 +end
236 \ No newline at end of file 237 \ No newline at end of file
@@ -462,7 +462,7 @@ GEM @@ -462,7 +462,7 @@ GEM
462 rack-protection (~> 1.4) 462 rack-protection (~> 1.4)
463 tilt (~> 1.3, >= 1.3.4) 463 tilt (~> 1.3, >= 1.3.4)
464 six (0.2.0) 464 six (0.2.0)
465 - slack-notifier (0.2.0) 465 + slack-notifier (0.3.2)
466 slim (2.0.2) 466 slim (2.0.2)
467 temple (~> 0.6.6) 467 temple (~> 0.6.6)
468 tilt (>= 1.3.3, < 2.1) 468 tilt (>= 1.3.3, < 2.1)
@@ -662,4 +662,4 @@ DEPENDENCIES @@ -662,4 +662,4 @@ DEPENDENCIES
662 unicorn (~> 4.6.3) 662 unicorn (~> 4.6.3)
663 unicorn-worker-killer 663 unicorn-worker-killer
664 version_sorter 664 version_sorter
665 - webmock 665 - webmock
  666 + webmock
666 \ No newline at end of file 667 \ No newline at end of file