Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
b3ff48c9
Commit
b3ff48c9
authored
7 years ago
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move up delegate calls
parent
0a5b670a
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
25 additions
and
29 deletions
+25
-29
app/models/ci/build.rb
app/models/ci/build.rb
+2
-2
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+2
-2
app/models/commit_status.rb
app/models/commit_status.rb
+1
-2
app/models/concerns/issuable.rb
app/models/concerns/issuable.rb
+11
-11
app/models/member.rb
app/models/member.rb
+2
-2
app/models/project.rb
app/models/project.rb
+2
-4
app/models/project_wiki.rb
app/models/project_wiki.rb
+3
-4
lib/gitlab/git/commit.rb
lib/gitlab/git/commit.rb
+2
-2
No files found.
app/models/ci/build.rb
View file @
b3ff48c9
...
...
@@ -22,6 +22,8 @@ module Ci
serialize
:options
serialize
:yaml_variables
,
Gitlab
::
Serializer
::
Ci
::
Variables
delegate
:name
,
to: :project
,
prefix:
true
validates
:coverage
,
numericality:
true
,
allow_blank:
true
validates
:ref
,
presence:
true
...
...
@@ -233,8 +235,6 @@ module Ci
gl_project_id
end
delegate
:name
,
to: :project
,
prefix:
true
def
repo_url
auth
=
"gitlab-ci-token:
#{
ensure_token!
}
@"
project
.
http_url_to_repo
.
sub
(
/^https?:\/\//
)
do
|
prefix
|
...
...
This diff is collapsed.
Click to expand it.
app/models/ci/pipeline.rb
View file @
b3ff48c9
...
...
@@ -14,6 +14,8 @@ module Ci
has_many
:builds
,
foreign_key: :commit_id
has_many
:trigger_requests
,
dependent: :destroy
,
foreign_key: :commit_id
delegate
:id
,
to: :project
,
prefix:
true
validates
:sha
,
presence:
{
unless: :importing?
}
validates
:ref
,
presence:
{
unless: :importing?
}
validates
:status
,
presence:
{
unless: :importing?
}
...
...
@@ -153,8 +155,6 @@ module Ci
builds
.
latest
.
with_artifacts_not_expired
.
includes
(
project:
[
:namespace
])
end
delegate
:id
,
to: :project
,
prefix:
true
# For now the only user who participates is the user who triggered
def
participants
(
_current_user
=
nil
)
Array
(
user
)
...
...
This diff is collapsed.
Click to expand it.
app/models/commit_status.rb
View file @
b3ff48c9
...
...
@@ -10,6 +10,7 @@ class CommitStatus < ActiveRecord::Base
belongs_to
:user
delegate
:commit
,
to: :pipeline
delegate
:sha
,
:short_sha
,
to: :pipeline
validates
:pipeline
,
presence:
true
,
unless: :importing?
...
...
@@ -102,8 +103,6 @@ class CommitStatus < ActiveRecord::Base
end
end
delegate
:sha
,
:short_sha
,
to: :pipeline
def
before_sha
pipeline
.
before_sha
||
Gitlab
::
Git
::
BLANK_SHA
end
...
...
This diff is collapsed.
Click to expand it.
app/models/concerns/issuable.rb
View file @
b3ff48c9
...
...
@@ -46,6 +46,17 @@ module Issuable
has_one
:metrics
delegate
:name
,
:email
,
to: :author
,
prefix:
true
delegate
:name
,
:email
,
to: :assignee
,
allow_nil:
true
,
prefix:
true
validates
:author
,
presence:
true
validates
:title
,
presence:
true
,
length:
{
maximum:
255
}
...
...
@@ -72,17 +83,6 @@ module Issuable
scope
:references_project
,
->
{
references
(
:project
)
}
scope
:non_archived
,
->
{
join_project
.
where
(
projects:
{
archived:
false
})
}
delegate
:name
,
:email
,
to: :author
,
prefix:
true
delegate
:name
,
:email
,
to: :assignee
,
allow_nil:
true
,
prefix:
true
attr_mentionable
:title
,
pipeline: :single_line
attr_mentionable
:description
...
...
This diff is collapsed.
Click to expand it.
app/models/member.rb
View file @
b3ff48c9
...
...
@@ -10,6 +10,8 @@ class Member < ActiveRecord::Base
belongs_to
:user
belongs_to
:source
,
polymorphic:
true
delegate
:name
,
:username
,
:email
,
to: :user
,
prefix:
true
validates
:user
,
presence:
true
,
unless: :invite?
validates
:source
,
presence:
true
validates
:user_id
,
uniqueness:
{
scope:
[
:source_type
,
:source_id
],
...
...
@@ -73,8 +75,6 @@ class Member < ActiveRecord::Base
after_destroy
:post_destroy_hook
,
unless: :pending?
after_commit
:refresh_member_authorized_projects
delegate
:name
,
:username
,
:email
,
to: :user
,
prefix:
true
default_value_for
:notification_level
,
NotificationSetting
.
levels
[
:global
]
class
<<
self
...
...
This diff is collapsed.
Click to expand it.
app/models/project.rb
View file @
b3ff48c9
...
...
@@ -172,9 +172,11 @@ class Project < ActiveRecord::Base
accepts_nested_attributes_for
:project_feature
delegate
:name
,
to: :owner
,
allow_nil:
true
,
prefix:
true
delegate
:count
,
to: :forks
,
prefix:
true
delegate
:members
,
to: :team
,
prefix:
true
delegate
:add_user
,
to: :team
delegate
:add_guest
,
:add_reporter
,
:add_developer
,
:add_master
,
to: :team
delegate
:empty_repo?
,
to: :repository
# Validations
validates
:creator
,
presence:
true
,
on: :create
...
...
@@ -838,8 +840,6 @@ class Project < ActiveRecord::Base
false
end
delegate
:empty_repo?
,
to: :repository
def
repo
repository
.
raw
end
...
...
@@ -1027,8 +1027,6 @@ class Project < ActiveRecord::Base
forked?
&&
project
==
forked_from_project
end
delegate
:count
,
to: :forks
,
prefix:
true
def
origin_merge_requests
merge_requests
.
where
(
source_project_id:
self
.
id
)
end
...
...
This diff is collapsed.
Click to expand it.
app/models/project_wiki.rb
View file @
b3ff48c9
...
...
@@ -19,6 +19,9 @@ class ProjectWiki
@user
=
user
end
delegate
:empty?
,
to: :pages
delegate
:repository_storage_path
,
to: :project
def
path
@project
.
path
+
'.wiki'
end
...
...
@@ -60,8 +63,6 @@ class ProjectWiki
!!
repository
.
exists?
end
delegate
:empty?
,
to: :pages
# Returns an Array of Gitlab WikiPage instances or an
# empty Array if this Wiki has no pages.
def
pages
...
...
@@ -158,8 +159,6 @@ class ProjectWiki
}
end
delegate
:repository_storage_path
,
to: :project
private
def
init_repo
(
path_with_namespace
)
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/git/commit.rb
View file @
b3ff48c9
...
...
@@ -14,6 +14,8 @@ module Gitlab
attr_accessor
*
SERIALIZE_KEYS
# rubocop:disable Lint/AmbiguousOperator
delegate
:tree
,
to: :raw_commit
def
==
(
other
)
return
false
unless
other
.
is_a?
(
Gitlab
::
Git
::
Commit
)
...
...
@@ -218,8 +220,6 @@ module Gitlab
raw_commit
.
parents
.
map
{
|
c
|
Gitlab
::
Git
::
Commit
.
new
(
c
)
}
end
delegate
:tree
,
to: :raw_commit
def
stats
Gitlab
::
Git
::
CommitStats
.
new
(
self
)
end
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment