diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-10-31 15:00:30 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-10-31 15:00:30 +0000 |
| commit | 1ff00cb2dd168d98b0d4f4995216ed909dae9349 (patch) | |
| tree | e25fe417a3a01e0bd73145475869a73e25c8a062 /lib/gitlab/github_import/milestone_formatter.rb | |
| parent | decf0fefe17a574782d47504920b9a2cfc7b14dc (diff) | |
| parent | 490776517c394ced2780159fa3800e2accc27601 (diff) | |
| download | gitlab-ce-1ff00cb2dd168d98b0d4f4995216ed909dae9349.tar.gz | |
Merge branch 'master' into 'add-retry-limit-project-webhook'add-retry-limit-project-webhook
# Conflicts:
# app/workers/project_web_hook_worker.rb
Diffstat (limited to 'lib/gitlab/github_import/milestone_formatter.rb')
| -rw-r--r-- | lib/gitlab/github_import/milestone_formatter.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/github_import/milestone_formatter.rb b/lib/gitlab/github_import/milestone_formatter.rb index b2fa524cf5b..401dd962521 100644 --- a/lib/gitlab/github_import/milestone_formatter.rb +++ b/lib/gitlab/github_import/milestone_formatter.rb @@ -14,8 +14,12 @@ module Gitlab } end - def klass - Milestone + def project_association + :milestones + end + + def find_condition + { iid: raw_data.number } end private |