diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ability.rb | 4 | ||||
| -rw-r--r-- | app/models/commit.rb | 2 | ||||
| -rw-r--r-- | app/models/concerns/mentionable.rb | 10 | ||||
| -rw-r--r-- | app/models/members/project_member.rb | 2 | ||||
| -rw-r--r-- | app/models/namespace.rb | 2 | ||||
| -rw-r--r-- | app/models/network/graph.rb | 2 | ||||
| -rw-r--r-- | app/models/project.rb | 4 | ||||
| -rw-r--r-- | app/models/project_services/gitlab_ci_service.rb | 4 | ||||
| -rw-r--r-- | app/models/project_team.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 14 |
10 files changed, 23 insertions, 23 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index 716a23a4284..e155abc1449 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -184,7 +184,7 @@ class Ability ] end - def group_abilities user, group + def group_abilities(user, group) rules = [] if user.admin? || group.users.include?(user) || ProjectsFinder.new.execute(user, group: group).any? @@ -209,7 +209,7 @@ class Ability rules.flatten end - def namespace_abilities user, namespace + def namespace_abilities(user, namespace) rules = [] # Only namespace owner and administrators can manage it diff --git a/app/models/commit.rb b/app/models/commit.rb index c8b2e0475ff..7f586ebe781 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -90,7 +90,7 @@ class Commit # Discover issues should be closed when this commit is pushed to a project's # default branch. - def closes_issues project + def closes_issues(project) Gitlab::ClosingIssueExtractor.closed_by_message_in_project(safe_message, project) end diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb index 81414959f3b..71dd2f8c697 100644 --- a/app/models/concerns/mentionable.rb +++ b/app/models/concerns/mentionable.rb @@ -10,7 +10,7 @@ module Mentionable module ClassMethods # Indicate which attributes of the Mentionable to search for GFM references. - def attr_mentionable *attrs + def attr_mentionable(*attrs) mentionable_attrs.concat(attrs.map(&:to_s)) end @@ -38,7 +38,7 @@ module Mentionable # Determine whether or not a cross-reference Note has already been created between this Mentionable and # the specified target. - def has_mentioned? target + def has_mentioned?(target) Note.cross_reference_exists?(target, local_reference) end @@ -64,7 +64,7 @@ module Mentionable end # Extract GFM references to other Mentionables from this Mentionable. Always excludes its #local_reference. - def references p = project, text = mentionable_text + def references(p = project, text = mentionable_text) return [] if text.blank? ext = Gitlab::ReferenceExtractor.new ext.analyze(text) @@ -72,7 +72,7 @@ module Mentionable end # Create a cross-reference Note for each GFM reference to another Mentionable found in +mentionable_text+. - def create_cross_references! p = project, a = author, without = [] + def create_cross_references!(p = project, a = author, without = []) refs = references(p) - without refs.each do |ref| Note.create_cross_reference_note(ref, local_reference, a, p) @@ -81,7 +81,7 @@ module Mentionable # If the mentionable_text field is about to change, locate any *added* references and create cross references for # them. Invoke from an observer's #before_save implementation. - def notice_added_references p = project, a = author + def notice_added_references(p = project, a = author) ch = changed_attributes original, mentionable_changed = "", false self.class.mentionable_attrs.each do |attr| diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb index f14900ad3e6..71525f91961 100644 --- a/app/models/members/project_member.rb +++ b/app/models/members/project_member.rb @@ -77,7 +77,7 @@ class ProjectMember < Member false end - def truncate_team project + def truncate_team(project) truncate_teams [project.id] end diff --git a/app/models/namespace.rb b/app/models/namespace.rb index b19b72906e7..c0c6de0ee7d 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -38,7 +38,7 @@ class Namespace < ActiveRecord::Base scope :root, -> { where('type IS NULL') } - def self.search query + def self.search(query) where("name LIKE :query OR path LIKE :query", query: "%#{query}%") end diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb index 9c95470beb1..43979b5e807 100644 --- a/app/models/network/graph.rb +++ b/app/models/network/graph.rb @@ -6,7 +6,7 @@ module Network @max_count ||= 650 end - def initialize project, ref, commit, filter_ref + def initialize(project, ref, commit, filter_ref) @project = project @ref = ref @commit = commit diff --git a/app/models/project.rb b/app/models/project.rb index f9278f19dad..0e940bca2c9 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -331,7 +331,7 @@ class Project < ActiveRecord::Base path end - def items_for entity + def items_for(entity) case entity when 'issue' then issues @@ -504,7 +504,7 @@ class Project < ActiveRecord::Base end # Check if current branch name is marked as protected in the system - def protected_branch? branch_name + def protected_branch?(branch_name) protected_branches_names.include?(branch_name) end diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb index 4a19ca2f655..001b11c5966 100644 --- a/app/models/project_services/gitlab_ci_service.rb +++ b/app/models/project_services/gitlab_ci_service.rb @@ -27,7 +27,7 @@ class GitlabCiService < CiService hook.save end - def commit_status_path sha + def commit_status_path(sha) project_url + "/builds/#{sha}/status.json?token=#{token}" end @@ -54,7 +54,7 @@ class GitlabCiService < CiService end end - def build_page sha + def build_page(sha) project_url + "/builds/#{sha}" end diff --git a/app/models/project_team.rb b/app/models/project_team.rb index e2af10c6899..e065554d3b8 100644 --- a/app/models/project_team.rb +++ b/app/models/project_team.rb @@ -11,7 +11,7 @@ class ProjectTeam # @team << [@user, :master] # @team << [@users, :master] # - def << args + def <<(args) users = args.first if users.respond_to?(:each) diff --git a/app/models/user.rb b/app/models/user.rb index ed3eba4cdf0..c90f2462426 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -203,7 +203,7 @@ class User < ActiveRecord::Base User.where(name: name).first end - def filter filter_name + def filter(filter_name) case filter_name when "admins"; self.admins when "blocked"; self.blocked @@ -213,7 +213,7 @@ class User < ActiveRecord::Base end end - def search query + def search(query) where("lower(name) LIKE :query OR lower(email) LIKE :query OR lower(username) LIKE :query", query: "%#{query.downcase}%") end @@ -332,7 +332,7 @@ class User < ActiveRecord::Base several_namespaces? || admin end - def can? action, subject + def can?(action, subject) abilities.allowed?(self, action, subject) end @@ -353,7 +353,7 @@ class User < ActiveRecord::Base (personal_projects.count.to_f / projects_limit) * 100 end - def recent_push project_id = nil + def recent_push(project_id = nil) # Get push events not earlier than 2 hours ago events = recent_events.code_push.where("created_at > ?", Time.now - 2.hours) events = events.where(project_id: project_id) if project_id @@ -382,11 +382,11 @@ class User < ActiveRecord::Base project.team_member_by_id(self.id) end - def already_forked? project + def already_forked?(project) !!fork_of(project) end - def fork_of project + def fork_of(project) links = ForkedProjectLink.where(forked_from_project_id: project, forked_to_project_id: personal_projects) if links.any? @@ -512,7 +512,7 @@ class User < ActiveRecord::Base NotificationService.new end - def log_info message + def log_info(message) Gitlab::AppLogger.info message end |