diff options
author | Rémy Coutable <remy@rymai.me> | 2018-10-17 16:17:20 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-10-17 16:17:20 +0300 |
commit | 1696a3e8c36a0336e62ec990fd8b4e0517e4c93c (patch) | |
tree | 7aa2ebfb39874599ab25cf87f8a26b37f5a62e7a /app | |
parent | 071b39a22c8a3efc4e3a0531c71e1e8161b78f47 (diff) | |
parent | c5bff77ea4a6170a3dc1966254feac0ca1836eaa (diff) |
Merge branch '44361-remove-gitlab-grit' into 'master'
Remove gitlab-grit as a transitive dependency of GitLab
Closes #44361
See merge request gitlab-org/gitlab-ce!22373
Diffstat (limited to 'app')
-rw-r--r-- | app/models/project_services/flowdock_service.rb | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/app/models/project_services/flowdock_service.rb b/app/models/project_services/flowdock_service.rb index 2545df06f6b..76624263aab 100644 --- a/app/models/project_services/flowdock_service.rb +++ b/app/models/project_services/flowdock_service.rb @@ -1,53 +1,5 @@ # frozen_string_literal: true -require "flowdock-git-hook" - -# Flow dock depends on Grit to compute the number of commits between two given -# commits. To make this depend on Gitaly, a monkey patch is applied -module Flowdock - class Git - # pass down a Repository all the way down - def repo - @options[:repo] - end - - def config - {} - end - - def messages - Git::Builder.new(repo: repo, - ref: @ref, - before: @from, - after: @to, - commit_url: @commit_url, - branch_url: @branch_url, - diff_url: @diff_url, - repo_url: @repo_url, - repo_name: @repo_name, - permanent_refs: @permanent_refs, - tags: tags - ).to_hashes - end - - class Builder - def commits - @repo.commits_between(@before, @after).map do |commit| - { - url: @opts[:commit_url] ? @opts[:commit_url] % [commit.sha] : nil, - id: commit.sha, - message: commit.message, - author: { - name: commit.author_name, - email: commit.author_email - } - } - end - end - end - end -end - class FlowdockService < Service prop_accessor :token validates :token, presence: true, if: :activated? |