summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-21 17:29:35 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:31:56 -0600
commit3dadf306ddc81183e74b048bc4119796852ed7ea (patch)
treef01d5e7eb9c5550bc34a42d9e88479cd3fef578d /app/models
parent547063b3ac096dff25309b6e0846b0d5f417c128 (diff)
downloadgitlab-ce-3dadf306ddc81183e74b048bc4119796852ed7ea.tar.gz
Enable Style/DotPosition
Diffstat (limited to 'app/models')
-rw-r--r--app/models/ci/build.rb18
-rw-r--r--app/models/ci/pipeline.rb34
-rw-r--r--app/models/ci/runner.rb4
-rw-r--r--app/models/ci/stage.rb6
-rw-r--r--app/models/commit_status.rb10
-rw-r--r--app/models/concerns/milestoneish.rb4
-rw-r--r--app/models/concerns/presentable.rb6
-rw-r--r--app/models/concerns/subscribable.rb8
-rw-r--r--app/models/generic_commit_status.rb6
-rw-r--r--app/models/global_milestone.rb4
-rw-r--r--app/models/group.rb6
-rw-r--r--app/models/label.rb6
-rw-r--r--app/models/lfs_object.rb6
-rw-r--r--app/models/member.rb6
-rw-r--r--app/models/merge_request.rb6
-rw-r--r--app/models/merge_request_diff.rb4
-rw-r--r--app/models/namespace.rb6
-rw-r--r--app/models/network/commit.rb4
-rw-r--r--app/models/network/graph.rb12
19 files changed, 78 insertions, 78 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index e018f8e7c4e..9a45ef06750 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -63,9 +63,9 @@ module Ci
end
def retry(build, current_user)
- Ci::RetryBuildService
- .new(build.project, current_user)
- .execute(build)
+ Ci::RetryBuildService.
+ new(build.project, current_user).
+ execute(build)
end
end
@@ -96,9 +96,9 @@ module Ci
end
def detailed_status(current_user)
- Gitlab::Ci::Status::Build::Factory
- .new(self, current_user)
- .fabricate!
+ Gitlab::Ci::Status::Build::Factory.
+ new(self, current_user).
+ fabricate!
end
def manual?
@@ -220,9 +220,9 @@ module Ci
end
def merge_request
- merge_requests = MergeRequest.includes(:merge_request_diff)
- .where(source_branch: ref, source_project_id: pipeline.gl_project_id)
- .reorder(iid: :asc)
+ merge_requests = MergeRequest.includes(:merge_request_diff).
+ where(source_branch: ref, source_project_id: pipeline.gl_project_id).
+ reorder(iid: :asc)
merge_requests.find do |merge_request|
merge_request.commits_sha.include?(pipeline.sha)
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 6e89b18aee5..ae4759ed2a0 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -89,9 +89,9 @@ module Ci
# ref can't be HEAD or SHA, can only be branch/tag name
scope :latest, ->(ref = nil) do
- max_id = unscope(:select)
- .select("max(#{quoted_table_name}.id)")
- .group(:ref, :sha)
+ max_id = unscope(:select).
+ select("max(#{quoted_table_name}.id)").
+ group(:ref, :sha)
if ref
where(ref: ref, id: max_id.where(ref: ref))
@@ -133,16 +133,16 @@ module Ci
def stages
# TODO, this needs refactoring, see gitlab-ce#26481.
- stages_query = statuses
- .group('stage').select(:stage).order('max(stage_idx)')
+ stages_query = statuses.
+ group('stage').select(:stage).order('max(stage_idx)')
status_sql = statuses.latest.where('stage=sg.stage').status_sql
- warnings_sql = statuses.latest.select('COUNT(*) > 0')
- .where('stage=sg.stage').failed_but_allowed.to_sql
+ warnings_sql = statuses.latest.select('COUNT(*) > 0').
+ where('stage=sg.stage').failed_but_allowed.to_sql
- stages_with_statuses = CommitStatus.from(stages_query, :sg)
- .pluck('sg.stage', status_sql, "(#{warnings_sql})")
+ stages_with_statuses = CommitStatus.from(stages_query, :sg).
+ pluck('sg.stage', status_sql, "(#{warnings_sql})")
stages_with_statuses.map do |stage|
Ci::Stage.new(self, Hash[%i[name status warnings].zip(stage)])
@@ -222,8 +222,8 @@ module Ci
end
def retry_failed(current_user)
- Ci::RetryPipelineService.new(project, current_user)
- .execute(self)
+ Ci::RetryPipelineService.new(project, current_user).
+ execute(self)
end
def mark_as_processable_after_stage(stage_idx)
@@ -355,15 +355,15 @@ module Ci
# Merge requests for which the current pipeline is running against
# the merge request's latest commit.
def merge_requests
- @merge_requests ||= project.merge_requests
- .where(source_branch: self.ref)
- .select { |merge_request| merge_request.head_pipeline.try(:id) == self.id }
+ @merge_requests ||= project.merge_requests.
+ where(source_branch: self.ref).
+ select { |merge_request| merge_request.head_pipeline.try(:id) == self.id }
end
def detailed_status(current_user)
- Gitlab::Ci::Status::Pipeline::Factory
- .new(self, current_user)
- .fabricate!
+ Gitlab::Ci::Status::Pipeline::Factory.
+ new(self, current_user).
+ fabricate!
end
private
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 07a086b0aca..9cda008a549 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -23,8 +23,8 @@ module Ci
scope :ordered, ->() { order(id: :desc) }
scope :owned_or_shared, ->(project_id) do
- joins('LEFT JOIN ci_runner_projects ON ci_runner_projects.runner_id = ci_runners.id')
- .where("ci_runner_projects.gl_project_id = :project_id OR ci_runners.is_shared = true", project_id: project_id)
+ joins('LEFT JOIN ci_runner_projects ON ci_runner_projects.runner_id = ci_runners.id').
+ where("ci_runner_projects.gl_project_id = :project_id OR ci_runners.is_shared = true", project_id: project_id)
end
scope :assignable_for, ->(project) do
diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb
index ca74c91b062..0751ab1b7d8 100644
--- a/app/models/ci/stage.rb
+++ b/app/models/ci/stage.rb
@@ -28,9 +28,9 @@ module Ci
end
def detailed_status(current_user)
- Gitlab::Ci::Status::Stage::Factory
- .new(self, current_user)
- .fabricate!
+ Gitlab::Ci::Status::Stage::Factory.
+ new(self, current_user).
+ fabricate!
end
def statuses
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 99a6326309d..d31a6d81ebd 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -96,8 +96,8 @@ class CommitStatus < ActiveRecord::Base
after_transition any => :failed do |commit_status|
commit_status.run_after_commit do
- MergeRequests::AddTodoWhenBuildFailsService
- .new(pipeline.project, nil).execute(self)
+ MergeRequests::AddTodoWhenBuildFailsService.
+ new(pipeline.project, nil).execute(self)
end
end
end
@@ -133,9 +133,9 @@ class CommitStatus < ActiveRecord::Base
end
def detailed_status(current_user)
- Gitlab::Ci::Status::Factory
- .new(self, current_user)
- .fabricate!
+ Gitlab::Ci::Status::Factory.
+ new(self, current_user).
+ fabricate!
end
def sortable_name
diff --git a/app/models/concerns/milestoneish.rb b/app/models/concerns/milestoneish.rb
index f449229864d..870a6fbaa90 100644
--- a/app/models/concerns/milestoneish.rb
+++ b/app/models/concerns/milestoneish.rb
@@ -39,8 +39,8 @@ module Milestoneish
def issues_visible_to_user(user)
memoize_per_user(user, :issues_visible_to_user) do
- IssuesFinder.new(user, issues_finder_params)
- .execute.where(milestone_id: milestoneish_ids)
+ IssuesFinder.new(user, issues_finder_params).
+ execute.where(milestone_id: milestoneish_ids)
end
end
diff --git a/app/models/concerns/presentable.rb b/app/models/concerns/presentable.rb
index 7b33b837004..d0f84831d71 100644
--- a/app/models/concerns/presentable.rb
+++ b/app/models/concerns/presentable.rb
@@ -1,7 +1,7 @@
module Presentable
def present(**attributes)
- Gitlab::View::Presenter::Factory
- .new(self, attributes)
- .fabricate!
+ Gitlab::View::Presenter::Factory.
+ new(self, attributes).
+ fabricate!
end
end
diff --git a/app/models/concerns/subscribable.rb b/app/models/concerns/subscribable.rb
index 83daa9b1a64..e4f5818d0e3 100644
--- a/app/models/concerns/subscribable.rb
+++ b/app/models/concerns/subscribable.rb
@@ -42,15 +42,15 @@ module Subscribable
def subscribe(user, project = nil)
unsubscribe_from_other_levels(user, project)
- find_or_initialize_subscription(user, project)
- .update(subscribed: true)
+ find_or_initialize_subscription(user, project).
+ update(subscribed: true)
end
def unsubscribe(user, project = nil)
unsubscribe_from_other_levels(user, project)
- find_or_initialize_subscription(user, project)
- .update(subscribed: false)
+ find_or_initialize_subscription(user, project).
+ update(subscribed: false)
end
private
diff --git a/app/models/generic_commit_status.rb b/app/models/generic_commit_status.rb
index 8867ba0d2ff..36b8568871b 100644
--- a/app/models/generic_commit_status.rb
+++ b/app/models/generic_commit_status.rb
@@ -18,8 +18,8 @@ class GenericCommitStatus < CommitStatus
end
def detailed_status(current_user)
- Gitlab::Ci::Status::External::Factory
- .new(self, current_user)
- .fabricate!
+ Gitlab::Ci::Status::External::Factory.
+ new(self, current_user).
+ fabricate!
end
end
diff --git a/app/models/global_milestone.rb b/app/models/global_milestone.rb
index b991d78e27f..84deb67ba9b 100644
--- a/app/models/global_milestone.rb
+++ b/app/models/global_milestone.rb
@@ -76,8 +76,8 @@ class GlobalMilestone
end
def labels
- @labels ||= GlobalLabel.build_collection(milestones.includes(:labels).map(&:labels).flatten)
- .sort_by!(&:title)
+ @labels ||= GlobalLabel.build_collection(milestones.includes(:labels).map(&:labels).flatten).
+ sort_by!(&:title)
end
def due_date
diff --git a/app/models/group.rb b/app/models/group.rb
index 240a17f1dc1..1835ce118a1 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -71,9 +71,9 @@ class Group < Namespace
def select_for_project_authorization
if current_scope.joins_values.include?(:shared_projects)
- joins('INNER JOIN namespaces project_namespace ON project_namespace.id = projects.namespace_id')
- .where('project_namespace.share_with_group_lock = ?', false)
- .select("members.user_id, projects.id AS project_id, LEAST(project_group_links.group_access, members.access_level) AS access_level")
+ joins('INNER JOIN namespaces project_namespace ON project_namespace.id = projects.namespace_id').
+ where('project_namespace.share_with_group_lock = ?', false).
+ select("members.user_id, projects.id AS project_id, LEAST(project_group_links.group_access, members.access_level) AS access_level")
else
super
end
diff --git a/app/models/label.rb b/app/models/label.rb
index 5b6b9a7a736..8d76e422c67 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -34,9 +34,9 @@ class Label < ActiveRecord::Base
scope :with_title, ->(title) { where(title: title) }
def self.prioritized(project)
- joins(:priorities)
- .where(label_priorities: { project_id: project })
- .reorder('label_priorities.priority ASC, labels.title ASC')
+ joins(:priorities).
+ where(label_priorities: { project_id: project }).
+ reorder('label_priorities.priority ASC, labels.title ASC')
end
def self.unprioritized(project)
diff --git a/app/models/lfs_object.rb b/app/models/lfs_object.rb
index 7712d5783e0..ee9ac282e39 100644
--- a/app/models/lfs_object.rb
+++ b/app/models/lfs_object.rb
@@ -19,8 +19,8 @@ class LfsObject < ActiveRecord::Base
end
def self.destroy_unreferenced
- joins("LEFT JOIN lfs_objects_projects ON lfs_objects_projects.lfs_object_id = #{table_name}.id")
- .where(lfs_objects_projects: { id: nil })
- .destroy_all
+ joins("LEFT JOIN lfs_objects_projects ON lfs_objects_projects.lfs_object_id = #{table_name}.id").
+ where(lfs_objects_projects: { id: nil }).
+ destroy_all
end
end
diff --git a/app/models/member.rb b/app/models/member.rb
index d07f270b757..0f6b75b0b93 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -39,9 +39,9 @@ class Member < ActiveRecord::Base
is_external_invite = arel_table[:user_id].eq(nil).and(arel_table[:invite_token].not_eq(nil))
user_is_active = User.arel_table[:state].eq(:active)
- includes(:user).references(:users)
- .where(is_external_invite.or(user_is_active))
- .where(requested_at: nil)
+ includes(:user).references(:users).
+ where(is_external_invite.or(user_is_active)).
+ where(requested_at: nil)
end
scope :invite, -> { where.not(invite_token: nil) }
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 204d2b153ad..a0b8a63d6ab 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -813,9 +813,9 @@ class MergeRequest < ActiveRecord::Base
def all_pipelines
return Ci::Pipeline.none unless source_project
- @all_pipelines ||= source_project.pipelines
- .where(sha: all_commits_sha, ref: source_branch)
- .order(id: :desc)
+ @all_pipelines ||= source_project.pipelines.
+ where(sha: all_commits_sha, ref: source_branch).
+ order(id: :desc)
end
# Note that this could also return SHA from now dangling commits
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 70bad2a4396..e1f172b24bf 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -169,8 +169,8 @@ class MergeRequestDiff < ActiveRecord::Base
# When compare merge request versions we want diff A..B instead of A...B
# so we handle cases when user does squash and rebase of the commits between versions.
# For this reason we set straight to true by default.
- CompareService.new(project, head_commit_sha)
- .execute(project, sha, straight: straight)
+ CompareService.new(project, head_commit_sha).
+ execute(project, sha, straight: straight)
end
def commits_count
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index bd0336c984a..e207ac3db4e 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -48,9 +48,9 @@ class Namespace < ActiveRecord::Base
scope :root, -> { where('type IS NULL') }
scope :with_statistics, -> do
- joins('LEFT JOIN project_statistics ps ON ps.namespace_id = namespaces.id')
- .group('namespaces.id')
- .select(
+ joins('LEFT JOIN project_statistics ps ON ps.namespace_id = namespaces.id').
+ group('namespaces.id').
+ select(
'namespaces.*',
'COALESCE(SUM(ps.storage_size), 0) AS storage_size',
'COALESCE(SUM(ps.repository_size), 0) AS repository_size',
diff --git a/app/models/network/commit.rb b/app/models/network/commit.rb
index 8417f200e36..a48e872ad84 100644
--- a/app/models/network/commit.rb
+++ b/app/models/network/commit.rb
@@ -28,8 +28,8 @@ module Network
if map.include?(p.id)
map[p.id]
end
- end
- .compact
+ end.
+ compact
end
end
end
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index b524ca50ee8..b16ecc424dd 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -23,12 +23,12 @@ module Network
def collect_notes
h = Hash.new(0)
- @project
- .notes
- .where('noteable_type = ?', 'Commit')
- .group('notes.commit_id')
- .select('notes.commit_id, count(notes.id) as note_count')
- .each do |item|
+ @project.
+ notes.
+ where('noteable_type = ?', 'Commit').
+ group('notes.commit_id').
+ select('notes.commit_id, count(notes.id) as note_count').
+ each do |item|
h[item.commit_id] = item.note_count.to_i
end