summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-22 16:50:15 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:33:05 -0600
commit1fe7501b49f896b74102c4b970310aa9ae34da85 (patch)
treece271afb0fbaaa14291c1dc9009cd7815ee25463 /app/models
parentbdbc7d967a0c3d95d5e4ea19a2a5be41268d3540 (diff)
downloadgitlab-ce-1fe7501b49f896b74102c4b970310aa9ae34da85.tar.gz
Revert "Prefer leading style for Style/DotPosition"
This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/award_emoji.rb6
-rw-r--r--app/models/ci/build.rb22
-rw-r--r--app/models/ci/pipeline.rb44
-rw-r--r--app/models/ci/runner.rb8
-rw-r--r--app/models/ci/stage.rb6
-rw-r--r--app/models/commit_status.rb10
-rw-r--r--app/models/concerns/issuable.rb6
-rw-r--r--app/models/concerns/mentionable.rb4
-rw-r--r--app/models/concerns/milestoneish.rb4
-rw-r--r--app/models/concerns/presentable.rb6
-rw-r--r--app/models/concerns/routable.rb8
-rw-r--r--app/models/concerns/sortable.rb12
-rw-r--r--app/models/concerns/subscribable.rb26
-rw-r--r--app/models/deployment.rb22
-rw-r--r--app/models/environment.rb6
-rw-r--r--app/models/event.rb6
-rw-r--r--app/models/generic_commit_status.rb6
-rw-r--r--app/models/global_milestone.rb4
-rw-r--r--app/models/group.rb10
-rw-r--r--app/models/issue_collection.rb6
-rw-r--r--app/models/label.rb18
-rw-r--r--app/models/lfs_object.rb6
-rw-r--r--app/models/member.rb12
-rw-r--r--app/models/merge_request.rb18
-rw-r--r--app/models/merge_request_diff.rb4
-rw-r--r--app/models/merge_requests_closing_issues.rb6
-rw-r--r--app/models/milestone.rb14
-rw-r--r--app/models/namespace.rb14
-rw-r--r--app/models/network/commit.rb4
-rw-r--r--app/models/network/graph.rb12
-rw-r--r--app/models/note.rb10
-rw-r--r--app/models/project.rb22
-rw-r--r--app/models/project_services/kubernetes_service.rb6
-rw-r--r--app/models/project_services/mattermost_slash_commands_service.rb4
-rw-r--r--app/models/project_team.rb8
-rw-r--r--app/models/repository.rb12
-rw-r--r--app/models/todo.rb6
-rw-r--r--app/models/user.rb56
-rw-r--r--app/models/wiki_page.rb10
39 files changed, 232 insertions, 232 deletions
diff --git a/app/models/award_emoji.rb b/app/models/award_emoji.rb
index 2eedbf3ffde..6937ad3bdd9 100644
--- a/app/models/award_emoji.rb
+++ b/app/models/award_emoji.rb
@@ -18,9 +18,9 @@ class AwardEmoji < ActiveRecord::Base
class << self
def votes_for_collection(ids, type)
- select('name', 'awardable_id', 'COUNT(*) as count')
- .where('name IN (?) AND awardable_type = ? AND awardable_id IN (?)', [DOWNVOTE_NAME, UPVOTE_NAME], type, ids)
- .group('name', 'awardable_id')
+ select('name', 'awardable_id', 'COUNT(*) as count').
+ where('name IN (?) AND awardable_type = ? AND awardable_id IN (?)', [DOWNVOTE_NAME, UPVOTE_NAME], type, ids).
+ group('name', 'awardable_id')
end
end
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 3a17d5c8dbe..2689078c771 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -65,9 +65,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
@@ -98,9 +98,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?
@@ -222,9 +222,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)
@@ -276,8 +276,8 @@ module Ci
def raw_trace(last_lines: nil)
if File.exist?(trace_file_path)
- Gitlab::Ci::TraceReader.new(trace_file_path)
- .read(last_lines: last_lines)
+ Gitlab::Ci::TraceReader.new(trace_file_path).
+ read(last_lines: last_lines)
else
# backward compatibility
read_attribute :trace
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 632178de887..04d43ca3c5c 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -91,9 +91,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))
@@ -128,23 +128,23 @@ module Ci
end
def stages_name
- statuses.order(:stage_idx).distinct
- .pluck(:stage, :stage_idx).map(&:first)
+ statuses.order(:stage_idx).distinct.
+ pluck(:stage, :stage_idx).map(&:first)
end
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)])
@@ -220,8 +220,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)
@@ -253,9 +253,9 @@ module Ci
def config_builds_attributes
return [] unless config_processor
- config_processor
- .builds_for_ref(ref, tag?, trigger_requests.first)
- .sort_by { |build| build[:stage_idx] }
+ config_processor.
+ builds_for_ref(ref, tag?, trigger_requests.first).
+ sort_by { |build| build[:stage_idx] }
end
def has_warnings?
@@ -353,15 +353,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 9cf6164e8dd..a120112e882 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -23,15 +23,15 @@ 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
# FIXME: That `to_sql` is needed to workaround a weird Rails bug.
# Without that, placeholders would miss one and couldn't match.
- where(locked: false)
- .where.not("id IN (#{project.runners.select(:id).to_sql})").specific
+ where(locked: false).
+ where.not("id IN (#{project.runners.select(:id).to_sql})").specific
end
validate :tag_constraints
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 fc750a3e5e9..1349beafb76 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -97,8 +97,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
@@ -132,9 +132,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/issuable.rb b/app/models/concerns/issuable.rb
index fcb335e48d1..37c727b5d9f 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -162,9 +162,9 @@ module Issuable
highest_priority = highest_label_priority(params).to_sql
- select("#{table_name}.*, (#{highest_priority}) AS highest_priority")
- .group(arel_table[:id])
- .reorder(Gitlab::Database.nulls_last_order('highest_priority', 'ASC'))
+ select("#{table_name}.*, (#{highest_priority}) AS highest_priority").
+ group(arel_table[:id]).
+ reorder(Gitlab::Database.nulls_last_order('highest_priority', 'ASC'))
end
def with_label(title, sort = nil)
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index a8ce36e51fc..7e56e371b27 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -48,8 +48,8 @@ module Mentionable
if extractor
@extractor = extractor
else
- @extractor ||= Gitlab::ReferenceExtractor
- .new(project, current_user)
+ @extractor ||= Gitlab::ReferenceExtractor.
+ new(project, current_user)
@extractor.reset_memoized_values
end
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/routable.rb b/app/models/concerns/routable.rb
index c2373de32c5..9f6d215ceb3 100644
--- a/app/models/concerns/routable.rb
+++ b/app/models/concerns/routable.rb
@@ -75,11 +75,11 @@ module Routable
#
# Returns an ActiveRecord::Relation.
def member_descendants(user_id)
- joins(:route)
- .joins("INNER JOIN routes r2 ON routes.path LIKE CONCAT(r2.path, '/%')
+ joins(:route).
+ joins("INNER JOIN routes r2 ON routes.path LIKE CONCAT(r2.path, '/%')
INNER JOIN members ON members.source_id = r2.source_id
- AND members.source_type = r2.source_type")
- .where('members.user_id = ?', user_id)
+ AND members.source_type = r2.source_type").
+ where('members.user_id = ?', user_id)
end
end
diff --git a/app/models/concerns/sortable.rb b/app/models/concerns/sortable.rb
index a155a064032..b9a2d812edd 100644
--- a/app/models/concerns/sortable.rb
+++ b/app/models/concerns/sortable.rb
@@ -39,12 +39,12 @@ module Sortable
private
def highest_label_priority(target_type_column: nil, target_type: nil, target_column:, project_column:, excluded_labels: [])
- query = Label.select(LabelPriority.arel_table[:priority].minimum)
- .left_join_priorities
- .joins(:label_links)
- .where("label_priorities.project_id = #{project_column}")
- .where("label_links.target_id = #{target_column}")
- .reorder(nil)
+ query = Label.select(LabelPriority.arel_table[:priority].minimum).
+ left_join_priorities.
+ joins(:label_links).
+ where("label_priorities.project_id = #{project_column}").
+ where("label_links.target_id = #{target_column}").
+ reorder(nil)
query =
if target_type_column
diff --git a/app/models/concerns/subscribable.rb b/app/models/concerns/subscribable.rb
index f60a0f8f438..e4f5818d0e3 100644
--- a/app/models/concerns/subscribable.rb
+++ b/app/models/concerns/subscribable.rb
@@ -27,30 +27,30 @@ module Subscribable
end
def subscribers(project)
- subscriptions_available(project)
- .where(subscribed: true)
- .map(&:user)
+ subscriptions_available(project).
+ where(subscribed: true).
+ map(&:user)
end
def toggle_subscription(user, project = nil)
unsubscribe_from_other_levels(user, project)
- find_or_initialize_subscription(user, project)
- .update(subscribed: !subscribed?(user, project))
+ find_or_initialize_subscription(user, project).
+ update(subscribed: !subscribed?(user, project))
end
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
@@ -69,14 +69,14 @@ module Subscribable
end
def find_or_initialize_subscription(user, project)
- subscriptions
- .find_or_initialize_by(user_id: user.id, project_id: project.try(:id))
+ subscriptions.
+ find_or_initialize_by(user_id: user.id, project_id: project.try(:id))
end
def subscriptions_available(project)
t = Subscription.arel_table
- subscriptions
- .where(t[:project_id].eq(nil).or(t[:project_id].eq(project.try(:id))))
+ subscriptions.
+ where(t[:project_id].eq(nil).or(t[:project_id].eq(project.try(:id))))
end
end
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 43f7460bd5d..afad001d50f 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -53,10 +53,10 @@ class Deployment < ActiveRecord::Base
def update_merge_request_metrics!
return unless environment.update_merge_request_metrics?
- merge_requests = project.merge_requests
- .joins(:metrics)
- .where(target_branch: self.ref, merge_request_metrics: { first_deployed_to_production_at: nil })
- .where("merge_request_metrics.merged_at <= ?", self.created_at)
+ merge_requests = project.merge_requests.
+ joins(:metrics).
+ where(target_branch: self.ref, merge_request_metrics: { first_deployed_to_production_at: nil }).
+ where("merge_request_metrics.merged_at <= ?", self.created_at)
if previous_deployment
merge_requests = merge_requests.where("merge_request_metrics.merged_at >= ?", previous_deployment.created_at)
@@ -71,17 +71,17 @@ class Deployment < ActiveRecord::Base
merge_requests.map(&:id)
end
- MergeRequest::Metrics
- .where(merge_request_id: merge_request_ids, first_deployed_to_production_at: nil)
- .update_all(first_deployed_to_production_at: self.created_at)
+ MergeRequest::Metrics.
+ where(merge_request_id: merge_request_ids, first_deployed_to_production_at: nil).
+ update_all(first_deployed_to_production_at: self.created_at)
end
def previous_deployment
@previous_deployment ||=
- project.deployments.joins(:environment)
- .where(environments: { name: self.environment.name }, ref: self.ref)
- .where.not(id: self.id)
- .take
+ project.deployments.joins(:environment).
+ where(environments: { name: self.environment.name }, ref: self.ref).
+ where.not(id: self.id).
+ take
end
def stop_action
diff --git a/app/models/environment.rb b/app/models/environment.rb
index f917f52f832..1a21b5e52b5 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -40,9 +40,9 @@ class Environment < ActiveRecord::Base
scope :stopped, -> { with_state(:stopped) }
scope :order_by_last_deployed_at, -> do
max_deployment_id_sql =
- Deployment.select(Deployment.arel_table[:id].maximum)
- .where(Deployment.arel_table[:environment_id].eq(arel_table[:id]))
- .to_sql
+ Deployment.select(Deployment.arel_table[:id].maximum).
+ where(Deployment.arel_table[:environment_id].eq(arel_table[:id])).
+ to_sql
order(Gitlab::Database.nulls_first_order("(#{max_deployment_id_sql})", 'ASC'))
end
diff --git a/app/models/event.rb b/app/models/event.rb
index b8918fcda21..4b8eac9accf 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -343,9 +343,9 @@ class Event < ActiveRecord::Base
# At this point it's possible for multiple threads/processes to try to
# update the project. Only one query should actually perform the update,
# hence we add the extra WHERE clause for last_activity_at.
- Project.unscoped.where(id: project_id)
- .where('last_activity_at <= ?', RESET_PROJECT_ACTIVITY_INTERVAL.ago)
- .update_all(last_activity_at: created_at)
+ Project.unscoped.where(id: project_id).
+ where('last_activity_at <= ?', RESET_PROJECT_ACTIVITY_INTERVAL.ago).
+ update_all(last_activity_at: created_at)
end
def authored_by?(user)
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 5ef3f9513fc..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
@@ -197,8 +197,8 @@ class Group < Namespace
end
def refresh_members_authorized_projects
- UserProjectAccessChangedService.new(user_ids_for_project_authorizations)
- .execute
+ UserProjectAccessChangedService.new(user_ids_for_project_authorizations).
+ execute
end
def user_ids_for_project_authorizations
diff --git a/app/models/issue_collection.rb b/app/models/issue_collection.rb
index 49f011c113f..f0b7d9914c8 100644
--- a/app/models/issue_collection.rb
+++ b/app/models/issue_collection.rb
@@ -17,9 +17,9 @@ class IssueCollection
# Given all the issue projects we get a list of projects that the current
# user has at least reporter access to.
- projects_with_reporter_access = user
- .projects_with_reporter_access_limited_to(project_ids)
- .pluck(:id)
+ projects_with_reporter_access = user.
+ projects_with_reporter_access_limited_to(project_ids).
+ pluck(:id)
collection.select do |issue|
if projects_with_reporter_access.include?(issue.project_id)
diff --git a/app/models/label.rb b/app/models/label.rb
index e97e53301cc..27429e60e4a 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -34,18 +34,18 @@ 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)
labels = Label.arel_table
priorities = LabelPriority.arel_table
- label_priorities = labels.join(priorities, Arel::Nodes::OuterJoin)
- .on(labels[:id].eq(priorities[:label_id]).and(priorities[:project_id].eq(project.id)))
- .join_sources
+ label_priorities = labels.join(priorities, Arel::Nodes::OuterJoin).
+ on(labels[:id].eq(priorities[:label_id]).and(priorities[:project_id].eq(project.id))).
+ join_sources
joins(label_priorities).where(priorities[:priority].eq(nil))
end
@@ -54,9 +54,9 @@ class Label < ActiveRecord::Base
labels = Label.arel_table
priorities = LabelPriority.arel_table
- label_priorities = labels.join(priorities, Arel::Nodes::OuterJoin)
- .on(labels[:id].eq(priorities[:label_id]))
- .join_sources
+ label_priorities = labels.join(priorities, Arel::Nodes::OuterJoin).
+ on(labels[:id].eq(priorities[:label_id])).
+ join_sources
joins(label_priorities)
end
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 f198fbe9056..abe9aee3edf 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -41,9 +41,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) }
@@ -99,9 +99,9 @@ class Member < ActiveRecord::Base
users = User.arel_table
members = Member.arel_table
- member_users = members.join(users, Arel::Nodes::OuterJoin)
- .on(members[:user_id].eq(users[:id]))
- .join_sources
+ member_users = members.join(users, Arel::Nodes::OuterJoin).
+ on(members[:user_id].eq(users[:id])).
+ join_sources
joins(member_users)
end
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index c4520c16a43..ea784f77015 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -475,10 +475,10 @@ class MergeRequest < ActiveRecord::Base
end
def discussions
- @discussions ||= self.related_notes
- .inc_relations_for_view
- .fresh
- .discussions
+ @discussions ||= self.related_notes.
+ inc_relations_for_view.
+ fresh.
+ discussions
end
def diff_discussions
@@ -564,8 +564,8 @@ class MergeRequest < ActiveRecord::Base
messages = [title, description]
messages.concat(commits.map(&:safe_message)) if merge_request_diff
- Gitlab::ClosingIssueExtractor.new(project, current_user)
- .closed_by_message(messages.join("\n"))
+ Gitlab::ClosingIssueExtractor.new(project, current_user).
+ closed_by_message(messages.join("\n"))
else
[]
end
@@ -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 baee00b8fcd..53d08488788 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/merge_requests_closing_issues.rb b/app/models/merge_requests_closing_issues.rb
index 7f7c114803d..daafb137be4 100644
--- a/app/models/merge_requests_closing_issues.rb
+++ b/app/models/merge_requests_closing_issues.rb
@@ -7,9 +7,9 @@ class MergeRequestsClosingIssues < ActiveRecord::Base
class << self
def count_for_collection(ids)
- group(:issue_id)
- .where(issue_id: ids)
- .pluck('issue_id', 'COUNT(*) as count')
+ group(:issue_id).
+ where(issue_id: ids).
+ pluck('issue_id', 'COUNT(*) as count')
end
end
end
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 30e5dfd096e..7331000a9f2 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -98,11 +98,11 @@ class Milestone < ActiveRecord::Base
if Gitlab::Database.postgresql?
rel.order(:project_id, :due_date).select('DISTINCT ON (project_id) id')
else
- rel
- .group(:project_id)
- .having('due_date = MIN(due_date)')
- .pluck(:id, :project_id, :due_date)
- .map(&:first)
+ rel.
+ group(:project_id).
+ having('due_date = MIN(due_date)').
+ pluck(:id, :project_id, :due_date).
+ map(&:first)
end
end
@@ -177,8 +177,8 @@ class Milestone < ActiveRecord::Base
conditions = 'WHEN id = ? THEN ? ' * ids.length
- issues.where(id: ids)
- .update_all(["position = CASE #{conditions} ELSE position END", *pairs])
+ issues.where(id: ids).
+ update_all(["position = CASE #{conditions} ELSE position END", *pairs])
end
private
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 9334b7d9e61..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',
@@ -251,10 +251,10 @@ class Namespace < ActiveRecord::Base
end
def refresh_access_of_projects_invited_groups
- Group
- .joins(project_group_links: :project)
- .where(projects: { namespace_id: id })
- .find_each(&:refresh_members_authorized_projects)
+ Group.
+ joins(project_group_links: :project).
+ where(projects: { namespace_id: id }).
+ find_each(&:refresh_members_authorized_projects)
end
def remove_exports!
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 0bbc9451ffd..2a7fa7d0607 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
diff --git a/app/models/note.rb b/app/models/note.rb
index c6406f644e0..d6d5396afa5 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -105,14 +105,14 @@ class Note < ActiveRecord::Base
def grouped_diff_discussions
active_notes = diff_notes.fresh.select(&:active?)
- Discussion.for_diff_notes(active_notes)
- .map { |d| [d.line_code, d] }.to_h
+ Discussion.for_diff_notes(active_notes).
+ map { |d| [d.line_code, d] }.to_h
end
def count_for_collection(ids, type)
- user.select('noteable_id', 'COUNT(*) as count')
- .group(:noteable_id)
- .where(noteable_type: type, noteable_id: ids)
+ user.select('noteable_id', 'COUNT(*) as count').
+ group(:noteable_id).
+ where(noteable_type: type, noteable_id: ids)
end
end
diff --git a/app/models/project.rb b/app/models/project.rb
index 698e742de48..301ff71cc01 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -235,8 +235,8 @@ class Project < ActiveRecord::Base
scope :inside_path, ->(path) do
# We need routes alias rs for JOIN so it does not conflict with
# includes(:route) which we use in ProjectsFinder.
- joins("INNER JOIN routes rs ON rs.source_id = projects.id AND rs.source_type = 'Project'")
- .where('rs.path LIKE ?', "#{path}/%")
+ joins("INNER JOIN routes rs ON rs.source_id = projects.id AND rs.source_type = 'Project'").
+ where('rs.path LIKE ?', "#{path}/%")
end
# "enabled" here means "not disabled". It includes private features!
@@ -313,9 +313,9 @@ class Project < ActiveRecord::Base
pattern = "%#{query}%"
projects = select(:id).where(
- ptable[:path].matches(pattern)
- .or(ptable[:name].matches(pattern))
- .or(ptable[:description].matches(pattern))
+ ptable[:path].matches(pattern).
+ or(ptable[:name].matches(pattern)).
+ or(ptable[:description].matches(pattern))
)
# We explicitly remove any eager loading clauses as they're:
@@ -324,10 +324,10 @@ class Project < ActiveRecord::Base
# 2. Combined with .joins(:namespace) lead to all columns from the
# projects & namespaces tables being selected, leading to a SQL error
# due to the columns of all UNION'd queries no longer being the same.
- namespaces = select(:id)
- .except(:includes)
- .joins(:namespace)
- .where(ntable[:name].matches(pattern))
+ namespaces = select(:id).
+ except(:includes).
+ joins(:namespace).
+ where(ntable[:name].matches(pattern))
union = Gitlab::SQL::Union.new([projects, namespaces])
@@ -369,8 +369,8 @@ class Project < ActiveRecord::Base
end
def trending
- joins('INNER JOIN trending_projects ON projects.id = trending_projects.project_id')
- .reorder('trending_projects.id ASC')
+ joins('INNER JOIN trending_projects ON projects.id = trending_projects.project_id').
+ reorder('trending_projects.id ASC')
end
def cached_count
diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb
index 02e802bad6d..9819e723fe8 100644
--- a/app/models/project_services/kubernetes_service.rb
+++ b/app/models/project_services/kubernetes_service.rb
@@ -105,9 +105,9 @@ class KubernetesService < DeploymentService
def terminals(environment)
with_reactive_cache do |data|
pods = data.fetch(:pods, nil)
- filter_pods(pods, app: environment.slug)
- .flat_map { |pod| terminals_for_pod(api_url, namespace, pod) }
- .each { |terminal| add_terminal_auth(terminal, terminal_auth) }
+ filter_pods(pods, app: environment.slug).
+ flat_map { |pod| terminals_for_pod(api_url, namespace, pod) }.
+ each { |terminal| add_terminal_auth(terminal, terminal_auth) }
end
end
diff --git a/app/models/project_services/mattermost_slash_commands_service.rb b/app/models/project_services/mattermost_slash_commands_service.rb
index 26376fd87ff..56f42d63b2d 100644
--- a/app/models/project_services/mattermost_slash_commands_service.rb
+++ b/app/models/project_services/mattermost_slash_commands_service.rb
@@ -20,8 +20,8 @@ class MattermostSlashCommandsService < ChatSlashCommandsService
end
def configure(user, params)
- token = Mattermost::Command.new(user)
- .create(command(params))
+ token = Mattermost::Command.new(user).
+ create(command(params))
update(active: true, token: token) if token
rescue Mattermost::Error => e
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index 67cc06642f1..8a53e974b6f 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -169,10 +169,10 @@ class ProjectTeam
# Lookup only the IDs we need
user_ids = user_ids - access.keys
- users_access = project.project_authorizations
- .where(user: user_ids)
- .group(:user_id)
- .maximum(:access_level)
+ users_access = project.project_authorizations.
+ where(user: user_ids).
+ group(:user_id).
+ maximum(:access_level)
access.merge!(users_access)
access
diff --git a/app/models/repository.rb b/app/models/repository.rb
index d1dd900d597..cd2568ad445 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -249,11 +249,11 @@ class Repository
cache.fetch(:"diverging_commit_counts_#{branch.name}") do
# Rugged seems to throw a `ReferenceError` when given branch_names rather
# than SHA-1 hashes
- number_commits_behind = raw_repository
- .count_commits_between(branch.dereferenced_target.sha, root_ref_hash)
+ number_commits_behind = raw_repository.
+ count_commits_between(branch.dereferenced_target.sha, root_ref_hash)
- number_commits_ahead = raw_repository
- .count_commits_between(root_ref_hash, branch.dereferenced_target.sha)
+ number_commits_ahead = raw_repository.
+ count_commits_between(root_ref_hash, branch.dereferenced_target.sha)
{ behind: number_commits_behind, ahead: number_commits_ahead }
end
@@ -755,8 +755,8 @@ class Repository
check_tree_entry_for_dir(branch_name, path)
if start_branch_name
- start_project.repository
- .check_tree_entry_for_dir(start_branch_name, path)
+ start_project.repository.
+ check_tree_entry_for_dir(start_branch_name, path)
end
commit_file(
diff --git a/app/models/todo.rb b/app/models/todo.rb
index 32bb9bf2045..47789a21133 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -64,9 +64,9 @@ class Todo < ActiveRecord::Base
highest_priority = highest_label_priority(params).to_sql
- select("#{table_name}.*, (#{highest_priority}) AS highest_priority")
- .order(Gitlab::Database.nulls_last_order('highest_priority', 'ASC'))
- .order('todos.created_at')
+ select("#{table_name}.*, (#{highest_priority}) AS highest_priority").
+ order(Gitlab::Database.nulls_last_order('highest_priority', 'ASC')).
+ order('todos.created_at')
end
end
diff --git a/app/models/user.rb b/app/models/user.rb
index 801c84dc011..fada0e567f0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -197,13 +197,13 @@ class User < ActiveRecord::Base
scope :order_oldest_sign_in, -> { reorder(Gitlab::Database.nulls_last_order('last_sign_in_at', 'ASC')) }
def self.with_two_factor
- joins("LEFT OUTER JOIN u2f_registrations AS u2f ON u2f.user_id = users.id")
- .where("u2f.id IS NOT NULL OR otp_required_for_login = ?", true).distinct(arel_table[:id])
+ joins("LEFT OUTER JOIN u2f_registrations AS u2f ON u2f.user_id = users.id").
+ where("u2f.id IS NOT NULL OR otp_required_for_login = ?", true).distinct(arel_table[:id])
end
def self.without_two_factor
- joins("LEFT OUTER JOIN u2f_registrations AS u2f ON u2f.user_id = users.id")
- .where("u2f.id IS NULL AND otp_required_for_login = ?", false)
+ joins("LEFT OUTER JOIN u2f_registrations AS u2f ON u2f.user_id = users.id").
+ where("u2f.id IS NULL AND otp_required_for_login = ?", false)
end
#
@@ -274,9 +274,9 @@ class User < ActiveRecord::Base
pattern = "%#{query}%"
where(
- table[:name].matches(pattern)
- .or(table[:email].matches(pattern))
- .or(table[:username].matches(pattern))
+ table[:name].matches(pattern).
+ or(table[:email].matches(pattern)).
+ or(table[:username].matches(pattern))
)
end
@@ -291,10 +291,10 @@ class User < ActiveRecord::Base
matched_by_emails_user_ids = email_table.project(email_table[:user_id]).where(email_table[:email].matches(pattern))
where(
- table[:name].matches(pattern)
- .or(table[:email].matches(pattern))
- .or(table[:username].matches(pattern))
- .or(table[:id].in(matched_by_emails_user_ids))
+ table[:name].matches(pattern).
+ or(table[:email].matches(pattern)).
+ or(table[:username].matches(pattern)).
+ or(table[:id].in(matched_by_emails_user_ids))
)
end
@@ -447,8 +447,8 @@ class User < ActiveRecord::Base
# Returns the groups a user has access to
def authorized_groups
- union = Gitlab::SQL::Union
- .new([groups.select(:id), authorized_projects.select(:namespace_id)])
+ union = Gitlab::SQL::Union.
+ new([groups.select(:id), authorized_projects.select(:namespace_id)])
Group.where("namespaces.id IN (#{union.to_sql})")
end
@@ -458,8 +458,8 @@ class User < ActiveRecord::Base
end
def nested_projects
- Project.joins(:namespace).where('namespaces.parent_id IS NOT NULL')
- .member_descendants(id)
+ Project.joins(:namespace).where('namespaces.parent_id IS NOT NULL').
+ member_descendants(id)
end
def refresh_authorized_projects
@@ -579,9 +579,9 @@ class User < ActiveRecord::Base
next unless project
if project.repository.branch_exists?(event.branch_name)
- merge_requests = MergeRequest.where("created_at >= ?", event.created_at)
- .where(source_project_id: project.id,
- source_branch: event.branch_name)
+ merge_requests = MergeRequest.where("created_at >= ?", event.created_at).
+ where(source_project_id: project.id,
+ source_branch: event.branch_name)
merge_requests.empty?
end
end
@@ -793,8 +793,8 @@ class User < ActiveRecord::Base
def toggle_star(project)
UsersStarProject.transaction do
- user_star_project = users_star_projects
- .where(project: project, user: self).lock(true).first
+ user_star_project = users_star_projects.
+ where(project: project, user: self).lock(true).first
if user_star_project
user_star_project.destroy
@@ -830,11 +830,11 @@ class User < ActiveRecord::Base
# ms on a database with a similar size to GitLab.com's database. On the other
# hand, using a subquery means we can get the exact same data in about 40 ms.
def contributed_projects
- events = Event.select(:project_id)
- .contributions.where(author_id: self)
- .where("created_at > ?", Time.now - 1.year)
- .uniq
- .reorder(nil)
+ events = Event.select(:project_id).
+ contributions.where(author_id: self).
+ where("created_at > ?", Time.now - 1.year).
+ uniq.
+ reorder(nil)
Project.where(id: events)
end
@@ -845,9 +845,9 @@ class User < ActiveRecord::Base
def ci_authorized_runners
@ci_authorized_runners ||= begin
- runner_ids = Ci::RunnerProject
- .where("ci_runner_projects.gl_project_id IN (#{ci_projects_union.to_sql})")
- .select(:runner_id)
+ runner_ids = Ci::RunnerProject.
+ where("ci_runner_projects.gl_project_id IN (#{ci_projects_union.to_sql})").
+ select(:runner_id)
Ci::Runner.specific.where(id: runner_ids)
end
end
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 0fa9d77a771..2caebb496db 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -22,16 +22,16 @@ class WikiPage
def self.group_by_directory(pages)
return [] if pages.blank?
- pages.sort_by { |page| [page.directory, page.slug] }
- .group_by(&:directory)
- .map do |dir, pages|
+ pages.sort_by { |page| [page.directory, page.slug] }.
+ group_by(&:directory).
+ map do |dir, pages|
if dir.present?
WikiDirectory.new(dir, pages)
else
pages
end
- end
- .flatten
+ end.
+ flatten
end
def self.unhyphenize(name)