diff options
| author | Boyan Tabakov <boyan.tabakov@futurice.com> | 2013-10-03 17:29:13 +0400 |
|---|---|---|
| committer | Boyan Tabakov <boyan.tabakov@futurice.com> | 2013-10-03 17:36:43 +0400 |
| commit | e8b6974af3ca2835c5ef54cbffb1535ebd50aeca (patch) | |
| tree | d9328415bf12c43abefb35c7d8a7c45d8758b9fc /Gemfile.lock | |
| parent | d8562cc9a141917e5b0adc1f33f2ec8da8ab10d4 (diff) | |
Use gitlab-flowdock-git-hook patched for dependency on gitlab-grit, instead of grit.
Make sure the flowdock-git-hook is loaded. Seems it is not autoloader, due to the gem/lib name mismatch.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 319e19167d4..345fd7e1f71 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -135,9 +135,6 @@ GEM faraday (>= 0.7.4, < 0.9) ffaker (1.18.0) ffi (1.9.0) - flowdock-git-hook (0.4.2) - grit (>= 2.4.1) - multi_json fog (1.3.1) builder excon (~> 0.13.0) @@ -164,6 +161,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) @@ -208,10 +208,6 @@ GEM grape-entity (0.3.0) activesupport multi_json (>= 1.3.2) - grit (2.5.0) - diff-lcs (~> 1.1) - mime-types (~> 1.15) - posix-spawn (~> 0.3.6) growl (1.0.3) guard (1.8.1) formatador (>= 0.2.4) @@ -575,13 +571,13 @@ DEPENDENCIES enumerize factory_girl_rails ffaker - flowdock-git-hook (~> 0.4.2) fog (~> 1.3.1) font-awesome-rails foreman 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) |