summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-09-28 11:00:30 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-09-28 11:09:55 +0200
commit3c2d6b4870afa9cae25007a2ccf90ebf92c37d42 (patch)
tree475015e2404da84793d1bdadc226fcd1bed28c11
parentba66e0cc9cc26df686ed47d926a3edcde497baa1 (diff)
downloadgitlab-ce-3c2d6b4870afa9cae25007a2ccf90ebf92c37d42.tar.gz
Add a class that represents a git push operation
-rw-r--r--app/services/merge_requests/base_service.rb6
-rw-r--r--lib/gitlab/git/push.rb25
2 files changed, 28 insertions, 3 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index aa5d8406d0f..28c3219b37b 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -57,10 +57,10 @@ module MergeRequests
# Returns all origin and fork merge requests from `@project` satisfying passed arguments.
# rubocop: disable CodeReuse/ActiveRecord
def merge_requests_for(source_branch, mr_states: [:opened])
- MergeRequest
+ @project.source_of_merge_requests
.with_state(mr_states)
- .where(source_branch: source_branch, source_project_id: @project.id)
- .preload(:source_project) # we don't need a #includes since we're just preloading for the #select
+ .where(source_branch: source_branch)
+ .preload(:source_project) # we don't need #includes since we're just preloading for the #select
.select(&:source_project)
end
# rubocop: enable CodeReuse/ActiveRecord
diff --git a/lib/gitlab/git/push.rb b/lib/gitlab/git/push.rb
new file mode 100644
index 00000000000..d4fe3c623c1
--- /dev/null
+++ b/lib/gitlab/git/push.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Gitlab
+ module Git
+ class Push
+ def initialize(project, oldrev, newrev, ref)
+ @project, @oldrev, @newrev = project, oldrev, newrev
+ @repository = project.repository
+ @branch_name = Gitlab::Git.ref_name(ref)
+ end
+
+ def branch_added?
+ Gitlab::Git.blank_ref?(@oldrev)
+ end
+
+ def branch_removed?
+ Gitlab::Git.blank_ref?(@newrev)
+ end
+
+ def force_push?
+ Gitlab::Checks::ForcePush.force_push?(@project, @oldrev, @newrev)
+ end
+ end
+ end
+end