diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-08 09:33:48 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-08 09:33:48 +0000 |
| commit | d4892e41449905a98f33e25edcb52aac5d2093be (patch) | |
| tree | ad6fd1c1fffed4b2bd15a5fdc7854ba1ff7539a5 | |
| parent | cb00c15532347b41a7827038b234147d80c8b7fe (diff) | |
| parent | 511fb3ff2ac08537675ea44af0e340921368fc82 (diff) | |
| download | gitlab-ce-d4892e41449905a98f33e25edcb52aac5d2093be.tar.gz | |
Merge branch 'rs-update-slack-notifier' into 'master'
Update slack-notifier to ~> 1.2.0
Closes #2826
See merge request !1533
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -163,7 +163,7 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.1" gem "gemnasium-gitlab-service", "~> 0.2" # Slack integration -gem "slack-notifier", "~> 1.0.0" +gem "slack-notifier", "~> 1.2.0" # Asana integration gem 'asana', '~> 0.0.6' diff --git a/Gemfile.lock b/Gemfile.lock index 1976fb808aa..f716c0254ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -672,7 +672,7 @@ GEM rack-protection (~> 1.4) tilt (>= 1.3, < 3) six (0.2.0) - slack-notifier (1.0.0) + slack-notifier (1.2.1) slim (2.0.3) temple (~> 0.6.6) tilt (>= 1.3.3, < 2.1) @@ -918,7 +918,7 @@ DEPENDENCIES simplecov (~> 0.10.0) sinatra (~> 1.4.4) six (~> 0.2.0) - slack-notifier (~> 1.0.0) + slack-notifier (~> 1.2.0) slim (~> 2.0.2) spinach-rails (~> 0.2.1) spring (~> 1.3.6) |