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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
8686917b
Commit
8686917b
authored
Aug 30, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use prepended where we're prepending
parent
d5d1dcce
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
23 additions
and
17 deletions
+23
-17
ee/app/controllers/ee/groups/group_members_controller.rb
ee/app/controllers/ee/groups/group_members_controller.rb
+1
-1
ee/app/mailers/ee/notify.rb
ee/app/mailers/ee/notify.rb
+5
-7
ee/app/models/concerns/ee/protected_branch.rb
ee/app/models/concerns/ee/protected_branch.rb
+1
-1
ee/app/models/concerns/ee/protected_ref_access.rb
ee/app/models/concerns/ee/protected_ref_access.rb
+1
-1
ee/app/models/ee/ci/build.rb
ee/app/models/ee/ci/build.rb
+9
-1
ee/app/models/ee/ci/pipeline.rb
ee/app/models/ee/ci/pipeline.rb
+1
-1
ee/app/models/ee/merge_request.rb
ee/app/models/ee/merge_request.rb
+1
-1
ee/app/models/ee/project_import_data.rb
ee/app/models/ee/project_import_data.rb
+1
-1
ee/app/models/ee/repository.rb
ee/app/models/ee/repository.rb
+1
-1
ee/app/models/ee/user.rb
ee/app/models/ee/user.rb
+1
-1
ee/lib/ee/api/boards_responses.rb
ee/lib/ee/api/boards_responses.rb
+1
-1
No files found.
ee/app/controllers/ee/groups/group_members_controller.rb
View file @
8686917b
...
...
@@ -12,7 +12,7 @@ module EE
end
end
inclu
ded
do
prepen
ded
do
before_action
:authorize_update_group_member!
,
only:
[
:update
,
:override
]
end
...
...
ee/app/mailers/ee/notify.rb
View file @
8686917b
...
...
@@ -3,14 +3,12 @@ module EE
extend
ActiveSupport
::
Concern
extend
::
Gitlab
::
Utils
::
Override
included
do
include
::
Emails
::
AdminNotification
include
::
Emails
::
CsvExport
include
::
Emails
::
ServiceDesk
include
::
Emails
::
Epics
include
::
Emails
::
AdminNotification
include
::
Emails
::
CsvExport
include
::
Emails
::
ServiceDesk
include
::
Emails
::
Epics
attr_reader
:group
end
attr_reader
:group
private
...
...
ee/app/models/concerns/ee/protected_branch.rb
View file @
8686917b
...
...
@@ -2,7 +2,7 @@ module EE
module
ProtectedBranch
extend
ActiveSupport
::
Concern
inclu
ded
do
prepen
ded
do
protected_ref_access_levels
:unprotect
end
...
...
ee/app/models/concerns/ee/protected_ref_access.rb
View file @
8686917b
...
...
@@ -10,7 +10,7 @@ module EE
extend
ActiveSupport
::
Concern
extend
::
Gitlab
::
Utils
::
Override
inclu
ded
do
prepen
ded
do
belongs_to
:user
belongs_to
:group
...
...
ee/app/models/ee/ci/build.rb
View file @
8686917b
...
...
@@ -19,7 +19,15 @@ module EE
CONTAINER_SCANNING_FILE
=
'gl-container-scanning-report.json'
.
freeze
DAST_FILE
=
'gl-dast-report.json'
.
freeze
included
do
prepended
do
scope
:code_quality
,
->
{
where
(
name:
%w[codeclimate codequality code_quality]
)
}
scope
:performance
,
->
{
where
(
name:
%w[performance deploy]
)
}
scope
:sast
,
->
{
where
(
name:
'sast'
)
}
scope
:dependency_scanning
,
->
{
where
(
name:
'dependency_scanning'
)
}
scope
:license_management
,
->
{
where
(
name:
'license_management'
)
}
scope
:sast_container
,
->
{
where
(
name:
%w[sast:container container_scanning]
)
}
scope
:dast
,
->
{
where
(
name:
'dast'
)
}
after_save
:stick_build_if_status_changed
end
...
...
ee/app/models/ee/ci/pipeline.rb
View file @
8686917b
...
...
@@ -8,7 +8,7 @@ module EE
size_limit_exceeded:
21
}.
freeze
inclu
ded
do
prepen
ded
do
has_one
:chat_data
,
class_name:
'Ci::PipelineChatData'
scope
:with_security_reports
,
->
{
...
...
ee/app/models/ee/merge_request.rb
View file @
8686917b
...
...
@@ -4,7 +4,7 @@ module EE
include
::
Approvable
inclu
ded
do
prepen
ded
do
has_many
:approvals
,
dependent: :delete_all
# rubocop:disable Cop/ActiveRecordDependent
has_many
:approved_by_users
,
through: :approvals
,
source: :user
has_many
:approvers
,
as: :target
,
dependent: :delete_all
# rubocop:disable Cop/ActiveRecordDependent
...
...
ee/app/models/ee/project_import_data.rb
View file @
8686917b
...
...
@@ -17,7 +17,7 @@ module EE
extend
ActiveSupport
::
Concern
inclu
ded
do
prepen
ded
do
validates
:auth_method
,
inclusion:
{
in:
%w[password ssh_public_key]
},
allow_blank:
true
# We should generate a key even if there's no SSH URL present
...
...
ee/app/models/ee/repository.rb
View file @
8686917b
...
...
@@ -9,7 +9,7 @@ module EE
MIRROR_REMOTE
=
"upstream"
.
freeze
inclu
ded
do
prepen
ded
do
delegate
:checksum
,
to: :raw_repository
end
...
...
ee/app/models/ee/user.rb
View file @
8686917b
...
...
@@ -11,7 +11,7 @@ module EE
DEFAULT_ROADMAP_LAYOUT
=
'months'
.
freeze
inclu
ded
do
prepen
ded
do
EMAIL_OPT_IN_SOURCE_ID_GITLAB_COM
=
1
# We aren't using the `auditor?` method for the `if` condition here
...
...
ee/lib/ee/api/boards_responses.rb
View file @
8686917b
...
...
@@ -3,7 +3,7 @@ module EE
module
BoardsResponses
extend
ActiveSupport
::
Concern
inclu
ded
do
prepen
ded
do
helpers
do
def
create_board
forbidden!
unless
board_parent
.
multiple_issue_boards_available?
...
...
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