diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-04 08:00:51 -0700 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-04 08:00:51 -0700 |
commit | 83c727c550b1d07a8b9fd6313a258ca6c32a7d2e (patch) | |
tree | 3b956bb99b2a4d7f59decb4bb39a00a83ace946b /Gemfile.lock | |
parent | dc00562fa25fbe69273f58b414fa35ddf4e44c12 (diff) | |
parent | e8b6974af3ca2835c5ef54cbffb1535ebd50aeca (diff) | |
download | gitlab-ce-83c727c550b1d07a8b9fd6313a258ca6c32a7d2e.tar.gz |
Merge pull request #5216 from bladealslayer/feature/flowdock_integration
Added Flowdock integration support via a service.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c66036295aa..ce3aeb7994b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -156,6 +156,9 @@ GEM pygments.rb (>= 0.2.13) github-markdown (0.5.3) github-markup (0.7.5) + gitlab-flowdock-git-hook (0.4.2.2) + gitlab-grit (>= 2.4.1) + multi_json gitlab-gollum-lib (1.0.1) github-markdown (~> 0.5.3) github-markup (>= 0.7.5, < 1.0.0) @@ -571,6 +574,7 @@ DEPENDENCIES gemoji (~> 1.2.1) github-linguist github-markup (~> 0.7.4) + gitlab-flowdock-git-hook (~> 0.4.2) gitlab-gollum-lib (~> 1.0.1) gitlab-grack (~> 1.0.1) gitlab-pygments.rb (~> 0.3.2) |