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
Tatuya Kamada
gitlab-ce
Commits
5c7f9d69
Commit
5c7f9d69
authored
Feb 22, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix code for cops
parent
02494f7c
Changes
44
Hide whitespace changes
Inline
Side-by-side
Showing
44 changed files
with
245 additions
and
213 deletions
+245
-213
app/controllers/concerns/creates_commit.rb
app/controllers/concerns/creates_commit.rb
+8
-7
app/controllers/projects/git_http_client_controller.rb
app/controllers/projects/git_http_client_controller.rb
+6
-5
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+9
-8
app/controllers/sessions_controller.rb
app/controllers/sessions_controller.rb
+6
-5
app/finders/notes_finder.rb
app/finders/notes_finder.rb
+6
-5
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+6
-5
app/helpers/blob_helper.rb
app/helpers/blob_helper.rb
+11
-10
app/helpers/submodule_helper.rb
app/helpers/submodule_helper.rb
+1
-1
app/mailers/repository_check_mailer.rb
app/mailers/repository_check_mailer.rb
+6
-5
app/models/commit.rb
app/models/commit.rb
+6
-5
app/models/concerns/case_sensitivity.rb
app/models/concerns/case_sensitivity.rb
+6
-5
app/models/concerns/sortable.rb
app/models/concerns/sortable.rb
+6
-5
app/models/network/graph.rb
app/models/network/graph.rb
+6
-5
app/models/project.rb
app/models/project.rb
+8
-7
app/models/project_services/pushover_service.rb
app/models/project_services/pushover_service.rb
+8
-7
app/services/system_note_service.rb
app/services/system_note_service.rb
+7
-6
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+23
-21
lib/api/api_guard.rb
lib/api/api_guard.rb
+1
-1
lib/api/award_emoji.rb
lib/api/award_emoji.rb
+1
-1
lib/banzai/filter/abstract_reference_filter.rb
lib/banzai/filter/abstract_reference_filter.rb
+6
-5
lib/banzai/filter/gollum_tags_filter.rb
lib/banzai/filter/gollum_tags_filter.rb
+6
-5
lib/banzai/filter/issue_reference_filter.rb
lib/banzai/filter/issue_reference_filter.rb
+6
-5
lib/gitlab/award_emoji.rb
lib/gitlab/award_emoji.rb
+6
-5
lib/gitlab/ci/config/entry/global.rb
lib/gitlab/ci/config/entry/global.rb
+1
-1
lib/gitlab/ci/config/entry/jobs.rb
lib/gitlab/ci/config/entry/jobs.rb
+1
-1
lib/gitlab/conflict/file.rb
lib/gitlab/conflict/file.rb
+6
-5
lib/gitlab/diff/position.rb
lib/gitlab/diff/position.rb
+10
-9
lib/gitlab/email/reply_parser.rb
lib/gitlab/email/reply_parser.rb
+6
-5
lib/gitlab/metrics/instrumentation.rb
lib/gitlab/metrics/instrumentation.rb
+6
-5
lib/gitlab/saml/user.rb
lib/gitlab/saml/user.rb
+6
-5
lib/gitlab/search_results.rb
lib/gitlab/search_results.rb
+12
-10
lib/gitlab/shell.rb
lib/gitlab/shell.rb
+1
-1
lib/gitlab/sherlock/query.rb
lib/gitlab/sherlock/query.rb
+6
-5
spec/features/issuables/issuable_list_spec.rb
spec/features/issuables/issuable_list_spec.rb
+6
-5
spec/helpers/issues_helper_spec.rb
spec/helpers/issues_helper_spec.rb
+1
-1
spec/lib/gitlab/ci/config/entry/global_spec.rb
spec/lib/gitlab/ci/config/entry/global_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/job_spec.rb
spec/lib/gitlab/ci/config/entry/job_spec.rb
+5
-5
spec/lib/gitlab/ci/status/build/factory_spec.rb
spec/lib/gitlab/ci/status/build/factory_spec.rb
+1
-1
spec/lib/gitlab/incoming_email_spec.rb
spec/lib/gitlab/incoming_email_spec.rb
+2
-2
spec/lib/gitlab/o_auth/user_spec.rb
spec/lib/gitlab/o_auth/user_spec.rb
+2
-2
spec/lib/gitlab/saml/user_spec.rb
spec/lib/gitlab/saml/user_spec.rb
+3
-3
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+1
-1
spec/support/issuables_list_metadata_shared_examples.rb
spec/support/issuables_list_metadata_shared_examples.rb
+6
-5
spec/support/login_helpers.rb
spec/support/login_helpers.rb
+6
-5
No files found.
app/controllers/concerns/creates_commit.rb
View file @
5c7f9d69
...
...
@@ -101,13 +101,14 @@ module CreatesCommit
# TODO: We should really clean this up
def
set_commit_variables
@mr_source_project
=
if
can?
(
current_user
,
:push_code
,
@project
)
# Edit file in this project
@project
else
# Merge request from fork to this project
current_user
.
fork_of
(
@project
)
end
@mr_source_project
=
if
can?
(
current_user
,
:push_code
,
@project
)
# Edit file in this project
@project
else
# Merge request from fork to this project
current_user
.
fork_of
(
@project
)
end
# Merge request to this project
@mr_target_project
=
@project
...
...
app/controllers/projects/git_http_client_controller.rb
View file @
5c7f9d69
...
...
@@ -76,11 +76,12 @@ class Projects::GitHttpClientController < Projects::ApplicationController
return
@project
if
defined?
(
@project
)
project_id
,
_
=
project_id_with_suffix
@project
=
if
project_id
.
blank?
nil
else
Project
.
find_by_full_path
(
"
#{
params
[
:namespace_id
]
}
/
#{
project_id
}
"
)
end
@project
=
if
project_id
.
blank?
nil
else
Project
.
find_by_full_path
(
"
#{
params
[
:namespace_id
]
}
/
#{
project_id
}
"
)
end
end
# This method returns two values so that we can parse
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
5c7f9d69
...
...
@@ -381,14 +381,15 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def
merge_widget_refresh
@status
=
if
merge_request
.
merge_when_build_succeeds
:merge_when_build_succeeds
else
# Only MRs that can be merged end in this action
# MR can be already picked up for merge / merged already or can be waiting for worker to be picked up
# in last case it does not have any special status. Possible error is handled inside widget js function
:success
end
@status
=
if
merge_request
.
merge_when_build_succeeds
:merge_when_build_succeeds
else
# Only MRs that can be merged end in this action
# MR can be already picked up for merge / merged already or can be waiting for worker to be picked up
# in last case it does not have any special status. Possible error is handled inside widget js function
:success
end
render
'merge'
end
...
...
app/controllers/sessions_controller.rb
View file @
5c7f9d69
...
...
@@ -15,11 +15,12 @@ class SessionsController < Devise::SessionsController
def
new
set_minimum_password_length
@ldap_servers
=
if
Gitlab
.
config
.
ldap
.
enabled
Gitlab
::
LDAP
::
Config
.
servers
else
[]
end
@ldap_servers
=
if
Gitlab
.
config
.
ldap
.
enabled
Gitlab
::
LDAP
::
Config
.
servers
else
[]
end
super
end
...
...
app/finders/notes_finder.rb
View file @
5c7f9d69
...
...
@@ -28,11 +28,12 @@ class NotesFinder
private
def
init_collection
@notes
=
if
@params
[
:target_id
]
on_target
(
@params
[
:target_type
],
@params
[
:target_id
])
else
notes_of_any_type
end
@notes
=
if
@params
[
:target_id
]
on_target
(
@params
[
:target_type
],
@params
[
:target_id
])
else
notes_of_any_type
end
end
def
notes_of_any_type
...
...
app/helpers/application_helper.rb
View file @
5c7f9d69
...
...
@@ -69,11 +69,12 @@ module ApplicationHelper
end
def
avatar_icon
(
user_or_email
=
nil
,
size
=
nil
,
scale
=
2
)
user
=
if
user_or_email
.
is_a?
(
User
)
user_or_email
else
User
.
find_by_any_email
(
user_or_email
.
try
(
:downcase
))
end
user
=
if
user_or_email
.
is_a?
(
User
)
user_or_email
else
User
.
find_by_any_email
(
user_or_email
.
try
(
:downcase
))
end
if
user
user
.
avatar_url
(
size
)
||
default_avatar
...
...
app/helpers/blob_helper.rb
View file @
5c7f9d69
...
...
@@ -153,16 +153,17 @@ module BlobHelper
# Because we are opionated we set the cache headers ourselves.
response
.
cache_control
[
:public
]
=
@project
.
public?
response
.
cache_control
[
:max_age
]
=
if
@ref
&&
@commit
&&
@ref
==
@commit
.
id
# This is a link to a commit by its commit SHA. That means that the blob
# is immutable. The only reason to invalidate the cache is if the commit
# was deleted or if the user lost access to the repository.
Blob
::
CACHE_TIME_IMMUTABLE
else
# A branch or tag points at this blob. That means that the expected blob
# value may change over time.
Blob
::
CACHE_TIME
end
response
.
cache_control
[
:max_age
]
=
if
@ref
&&
@commit
&&
@ref
==
@commit
.
id
# This is a link to a commit by its commit SHA. That means that the blob
# is immutable. The only reason to invalidate the cache is if the commit
# was deleted or if the user lost access to the repository.
Blob
::
CACHE_TIME_IMMUTABLE
else
# A branch or tag points at this blob. That means that the expected blob
# value may change over time.
Blob
::
CACHE_TIME
end
response
.
etag
=
@blob
.
id
!
stale
...
...
app/helpers/submodule_helper.rb
View file @
5c7f9d69
...
...
@@ -38,7 +38,7 @@ module SubmoduleHelper
def
self_url?
(
url
,
namespace
,
project
)
return
true
if
url
==
[
Gitlab
.
config
.
gitlab
.
url
,
'/'
,
namespace
,
'/'
,
project
,
'.git'
].
join
(
''
)
project
,
'.git'
].
join
(
''
)
url
==
gitlab_shell
.
url_to_repo
([
namespace
,
'/'
,
project
].
join
(
''
))
end
...
...
app/mailers/repository_check_mailer.rb
View file @
5c7f9d69
class
RepositoryCheckMailer
<
BaseMailer
def
notify
(
failed_count
)
@message
=
if
failed_count
==
1
"One project failed its last repository check"
else
"
#{
failed_count
}
projects failed their last repository check"
end
@message
=
if
failed_count
==
1
"One project failed its last repository check"
else
"
#{
failed_count
}
projects failed their last repository check"
end
mail
(
to:
User
.
admins
.
pluck
(
:email
),
...
...
app/models/commit.rb
View file @
5c7f9d69
...
...
@@ -122,11 +122,12 @@ class Commit
def
full_title
return
@full_title
if
@full_title
@full_title
=
if
safe_message
.
blank?
no_commit_message
else
safe_message
.
split
(
"
\n
"
,
2
).
first
end
@full_title
=
if
safe_message
.
blank?
no_commit_message
else
safe_message
.
split
(
"
\n
"
,
2
).
first
end
end
# Returns the commits description
...
...
app/models/concerns/case_sensitivity.rb
View file @
5c7f9d69
...
...
@@ -13,11 +13,12 @@ module CaseSensitivity
params
.
each
do
|
key
,
value
|
column
=
ActiveRecord
::
Base
.
connection
.
quote_table_name
(
key
)
condition
=
if
cast_lower
"LOWER(
#{
column
}
) = LOWER(:value)"
else
"
#{
column
}
= :value"
end
condition
=
if
cast_lower
"LOWER(
#{
column
}
) = LOWER(:value)"
else
"
#{
column
}
= :value"
end
criteria
=
criteria
.
where
(
condition
,
value:
value
)
end
...
...
app/models/concerns/sortable.rb
View file @
5c7f9d69
...
...
@@ -46,11 +46,12 @@ module Sortable
where
(
"label_links.target_id =
#{
target_column
}
"
).
reorder
(
nil
)
query
=
if
target_type_column
query
.
where
(
"label_links.target_type =
#{
target_type_column
}
"
)
else
query
.
where
(
label_links:
{
target_type:
target_type
})
end
query
=
if
target_type_column
query
.
where
(
"label_links.target_type =
#{
target_type_column
}
"
)
else
query
.
where
(
label_links:
{
target_type:
target_type
})
end
query
=
query
.
where
.
not
(
title:
excluded_labels
)
if
excluded_labels
.
present?
...
...
app/models/network/graph.rb
View file @
5c7f9d69
...
...
@@ -188,11 +188,12 @@ module Network
end
# and mark it as reserved
min_time
=
if
parent_time
.
nil?
leaves
.
first
.
time
else
parent_time
+
1
end
min_time
=
if
parent_time
.
nil?
leaves
.
first
.
time
else
parent_time
+
1
end
max_time
=
leaves
.
last
.
time
leaves
.
last
.
parents
(
@map
).
each
do
|
parent
|
...
...
app/models/project.rb
View file @
5c7f9d69
...
...
@@ -453,13 +453,14 @@ class Project < ActiveRecord::Base
end
def
add_import_job
job_id
=
if
forked?
RepositoryForkWorker
.
perform_async
(
id
,
forked_from_project
.
repository_storage_path
,
forked_from_project
.
path_with_namespace
,
self
.
namespace
.
full_path
)
else
RepositoryImportWorker
.
perform_async
(
self
.
id
)
end
job_id
=
if
forked?
RepositoryForkWorker
.
perform_async
(
id
,
forked_from_project
.
repository_storage_path
,
forked_from_project
.
path_with_namespace
,
self
.
namespace
.
full_path
)
else
RepositoryImportWorker
.
perform_async
(
self
.
id
)
end
if
job_id
Rails
.
logger
.
info
"Import job started for
#{
path_with_namespace
}
with job ID
#{
job_id
}
"
...
...
app/models/project_services/pushover_service.rb
View file @
5c7f9d69
...
...
@@ -72,13 +72,14 @@ class PushoverService < Service
before
=
data
[
:before
]
after
=
data
[
:after
]
message
=
if
Gitlab
::
Git
.
blank_ref?
(
before
)
"
#{
data
[
:user_name
]
}
pushed new branch
\"
#{
ref
}
\"
."
elsif
Gitlab
::
Git
.
blank_ref?
(
after
)
"
#{
data
[
:user_name
]
}
deleted branch
\"
#{
ref
}
\"
."
else
"
#{
data
[
:user_name
]
}
push to branch
\"
#{
ref
}
\"
."
end
message
=
if
Gitlab
::
Git
.
blank_ref?
(
before
)
"
#{
data
[
:user_name
]
}
pushed new branch
\"
#{
ref
}
\"
."
elsif
Gitlab
::
Git
.
blank_ref?
(
after
)
"
#{
data
[
:user_name
]
}
deleted branch
\"
#{
ref
}
\"
."
else
"
#{
data
[
:user_name
]
}
push to branch
\"
#{
ref
}
\"
."
end
if
data
[
:total_commits_count
]
>
0
message
<<
"
\n
Total commits count:
#{
data
[
:total_commits_count
]
}
"
...
...
app/services/system_note_service.rb
View file @
5c7f9d69
...
...
@@ -408,12 +408,13 @@ module SystemNoteService
# Initial scope should be system notes of this noteable type
notes
=
Note
.
system
.
where
(
noteable_type:
noteable
.
class
)
notes
=
if
noteable
.
is_a?
(
Commit
)
# Commits have non-integer IDs, so they're stored in `commit_id`
notes
.
where
(
commit_id:
noteable
.
id
)
else
notes
.
where
(
noteable_id:
noteable
.
id
)
end
notes
=
if
noteable
.
is_a?
(
Commit
)
# Commits have non-integer IDs, so they're stored in `commit_id`
notes
.
where
(
commit_id:
noteable
.
id
)
else
notes
.
where
(
noteable_id:
noteable
.
id
)
end
notes_for_mentioner
(
mentioner
,
noteable
,
notes
).
exists?
end
...
...
config/initializers/1_settings.rb
View file @
5c7f9d69
...
...
@@ -14,16 +14,17 @@ class Settings < Settingslogic
end
def
build_gitlab_ci_url
custom_port
=
if
on_standard_port?
(
gitlab
)
nil
else
":
#{
gitlab
.
port
}
"
end
custom_port
=
if
on_standard_port?
(
gitlab
)
nil
else
":
#{
gitlab
.
port
}
"
end
[
gitlab
.
protocol
,
"://"
,
gitlab
.
host
,
custom_port
,
gitlab
.
relative_url_root
"://"
,
gitlab
.
host
,
custom_port
,
gitlab
.
relative_url_root
].
join
(
''
)
end
...
...
@@ -81,9 +82,9 @@ class Settings < Settingslogic
def
base_url
(
config
)
custom_port
=
on_standard_port?
(
config
)
?
nil
:
":
#{
config
.
port
}
"
[
config
.
protocol
,
"://"
,
config
.
host
,
custom_port
"://"
,
config
.
host
,
custom_port
]
end
...
...
@@ -160,15 +161,16 @@ if github_settings
github_settings
[
"args"
]
||=
Settingslogic
.
new
({})
github_settings
[
"args"
][
"client_options"
]
=
if
github_settings
[
"url"
].
include?
(
github_default_url
)
OmniAuth
::
Strategies
::
GitHub
.
default_options
[
:client_options
]
else
{
"site"
=>
File
.
join
(
github_settings
[
"url"
],
"api/v3"
),
"authorize_url"
=>
File
.
join
(
github_settings
[
"url"
],
"login/oauth/authorize"
),
"token_url"
=>
File
.
join
(
github_settings
[
"url"
],
"login/oauth/access_token"
)
}
end
github_settings
[
"args"
][
"client_options"
]
=
if
github_settings
[
"url"
].
include?
(
github_default_url
)
OmniAuth
::
Strategies
::
GitHub
.
default_options
[
:client_options
]
else
{
"site"
=>
File
.
join
(
github_settings
[
"url"
],
"api/v3"
),
"authorize_url"
=>
File
.
join
(
github_settings
[
"url"
],
"login/oauth/authorize"
),
"token_url"
=>
File
.
join
(
github_settings
[
"url"
],
"login/oauth/access_token"
)
}
end
end
Settings
[
'shared'
]
||=
Settingslogic
.
new
({})
...
...
lib/api/api_guard.rb
View file @
5c7f9d69
...
...
@@ -115,7 +115,7 @@ module API
def
install_error_responders
(
base
)
error_classes
=
[
MissingTokenError
,
TokenNotFoundError
,
ExpiredError
,
RevokedError
,
InsufficientScopeError
]
ExpiredError
,
RevokedError
,
InsufficientScopeError
]
base
.
send
:rescue_from
,
*
error_classes
,
oauth2_bearer_token_error_handler
end
...
...
lib/api/award_emoji.rb
View file @
5c7f9d69
...
...
@@ -16,7 +16,7 @@ module API
end
[
":id/
#{
awardable_string
}
/:
#{
awardable_id_string
}
/award_emoji"
,
":id/
#{
awardable_string
}
/:
#{
awardable_id_string
}
/notes/:note_id/award_emoji"
":id/
#{
awardable_string
}
/:
#{
awardable_id_string
}
/notes/:note_id/award_emoji"
].
each
do
|
endpoint
|
desc
'Get a list of project +awardable+ award emoji'
do
...
...
lib/banzai/filter/abstract_reference_filter.rb
View file @
5c7f9d69
...
...
@@ -160,11 +160,12 @@ module Banzai
data
=
data_attributes_for
(
link_content
||
match
,
project
,
object
,
link:
!!
link_content
)
url
=
if
matches
.
names
.
include?
(
"url"
)
&&
matches
[
:url
]
matches
[
:url
]
else
url_for_object_cached
(
object
,
project
)
end
url
=
if
matches
.
names
.
include?
(
"url"
)
&&
matches
[
:url
]
matches
[
:url
]
else
url_for_object_cached
(
object
,
project
)
end
content
=
link_content
||
object_link_text
(
object
,
matches
)
...
...
lib/banzai/filter/gollum_tags_filter.rb
View file @
5c7f9d69
...
...
@@ -149,11 +149,12 @@ module Banzai
name
,
reference
=
*
parts
.
compact
.
map
(
&
:strip
)
end
href
=
if
url?
(
reference
)
reference
else
::
File
.
join
(
project_wiki_base_path
,
reference
)
end
href
=
if
url?
(
reference
)
reference
else
::
File
.
join
(
project_wiki_base_path
,
reference
)
end
content_tag
(
:a
,
name
||
reference
,
href:
href
,
class:
'gfm'
)
end
...
...
lib/banzai/filter/issue_reference_filter.rb
View file @
5c7f9d69
...
...
@@ -39,11 +39,12 @@ module Banzai
projects_per_reference
.
each
do
|
path
,
project
|
issue_ids
=
references_per_project
[
path
]
issues
=
if
project
.
default_issues_tracker?
project
.
issues
.
where
(
iid:
issue_ids
.
to_a
)
else
issue_ids
.
map
{
|
id
|
ExternalIssue
.
new
(
id
,
project
)
}
end
issues
=
if
project
.
default_issues_tracker?
project
.
issues
.
where
(
iid:
issue_ids
.
to_a
)
else
issue_ids
.
map
{
|
id
|
ExternalIssue
.
new
(
id
,
project
)
}
end
issues
.
each
do
|
issue
|
hash
[
project
][
issue
.
iid
.
to_i
]
=
issue
...
...
lib/gitlab/award_emoji.rb
View file @
5c7f9d69
...
...
@@ -69,11 +69,12 @@ module Gitlab
end
JSON
.
parse
(
File
.
read
(
path
)).
map
do
|
hash
|
fname
=
if
digest
"
#{
hash
[
'unicode'
]
}
-
#{
hash
[
'digest'
]
}
"
else
hash
[
'unicode'
]
end
fname
=
if
digest
"
#{
hash
[
'unicode'
]
}
-
#{
hash
[
'digest'
]
}
"
else
hash
[
'unicode'
]
end
{
name:
hash
[
'name'
],
path:
File
.
join
(
base
,
prefix
,
"
#{
fname
}
.png"
)
}
end
...
...
lib/gitlab/ci/config/entry/global.rb
View file @
5c7f9d69
...
...
@@ -49,7 +49,7 @@ module Gitlab
factory
=
Entry
::
Factory
.
new
(
Entry
::
Jobs
).
value
(
@config
.
except
(
*
self
.
class
.
nodes
.
keys
)).
with
(
key: :jobs
,
parent:
self
,
description:
'Jobs definition for this pipeline'
)
description:
'Jobs definition for this pipeline'
)
@entries
[
:jobs
]
=
factory
.
create!
end
...
...
lib/gitlab/ci/config/entry/jobs.rb
View file @
5c7f9d69
...
...
@@ -35,7 +35,7 @@ module Gitlab
value
(
config
||
{}).
metadata
(
name:
name
).
with
(
key:
name
,
parent:
self
,
description:
"
#{
name
}
job definition."
)
description:
"
#{
name
}
job definition."
)
@entries
[
name
]
=
factory
.
create!
end
...
...
lib/gitlab/conflict/file.rb
View file @
5c7f9d69
...
...
@@ -91,11 +91,12 @@ module Gitlab
our_highlight
=
Gitlab
::
Highlight
.
highlight
(
our_path
,
our_file
,
repository:
repository
).
lines
lines
.
each
do
|
line
|
line
.
rich_text
=
if
line
.
type
==
'old'
their_highlight
[
line
.
old_line
-
1
].
try
(
:html_safe
)
else
our_highlight
[
line
.
new_line
-
1
].
try
(
:html_safe
)
end
line
.
rich_text
=
if
line
.
type
==
'old'
their_highlight
[
line
.
old_line
-
1
].
try
(
:html_safe
)
else
our_highlight
[
line
.
new_line
-
1
].
try
(
:html_safe
)
end
end
end
...
...
lib/gitlab/diff/position.rb
View file @
5c7f9d69
...
...
@@ -140,15 +140,16 @@ module Gitlab
def
find_diff_file
(
repository
)
# We're at the initial commit, so just get that as we can't compare to anything.
compare
=
if
Gitlab
::
Git
.
blank_ref?
(
start_sha
)
Gitlab
::
Git
::
Commit
.
find
(
repository
.
raw_repository
,
head_sha
)
else
Gitlab
::
Git
::
Compare
.
new
(
repository
.
raw_repository
,
start_sha
,
head_sha
)
end
compare
=
if
Gitlab
::
Git
.
blank_ref?
(
start_sha
)
Gitlab
::
Git
::
Commit
.
find
(
repository
.
raw_repository
,
head_sha
)
else
Gitlab
::
Git
::
Compare
.
new
(
repository
.
raw_repository
,
start_sha
,
head_sha
)
end
diff
=
compare
.
diffs
(
paths:
paths
).
first
...
...
lib/gitlab/email/reply_parser.rb
View file @
5c7f9d69
...
...
@@ -31,11 +31,12 @@ module Gitlab
private
def
select_body
(
message
)
part
=
if
message
.
multipart?
message
.
text_part
||
message
.
html_part
||
message
else
message
end
part
=
if
message
.
multipart?
message
.
text_part
||
message
.
html_part
||
message
else
message
end
decoded
=
fix_charset
(
part
)
...
...
lib/gitlab/metrics/instrumentation.rb
View file @
5c7f9d69
...
...
@@ -143,11 +143,12 @@ module Gitlab
# signature this would break things. As a result we'll make sure the
# generated method _only_ accepts regular arguments if the underlying
# method also accepts them.
args_signature
=
if
method
.
arity
==
0
''
else
'*args'
end
args_signature
=
if
method
.
arity
==
0
''
else
'*args'
end
proxy_module
.
class_eval
<<-
EOF
,
__FILE__
,
__LINE__
+
1
def
#{
name
}
(
#{
args_signature
}
)
...
...
lib/gitlab/saml/user.rb
View file @
5c7f9d69
...
...
@@ -28,11 +28,12 @@ module Gitlab
if
external_users_enabled?
&&
@user
# Check if there is overlap between the user's groups and the external groups
# setting then set user as external or internal.
@user
.
external
=
if
(
auth_hash
.
groups
&
Gitlab
::
Saml
::
Config
.
external_groups
).
empty?
false
else
true
end
@user
.
external
=
if
(
auth_hash
.
groups
&
Gitlab
::
Saml
::
Config
.
external_groups
).
empty?
false
else
true
end
end
@user
...
...
lib/gitlab/search_results.rb
View file @
5c7f9d69
...
...
@@ -56,11 +56,12 @@ module Gitlab
def
issues
issues
=
IssuesFinder
.
new
(
current_user
).
execute
.
where
(
project_id:
project_ids_relation
)
issues
=
if
query
=~
/#(\d+)\z/
issues
.
where
(
iid:
$1
)
else
issues
.
full_search
(
query
)
end
issues
=
if
query
=~
/#(\d+)\z/
issues
.
where
(
iid:
$1
)
else
issues
.
full_search
(
query
)
end
issues
.
order
(
'updated_at DESC'
)
end
...
...
@@ -73,11 +74,12 @@ module Gitlab
def
merge_requests
merge_requests
=
MergeRequestsFinder
.
new
(
current_user
).
execute
.
in_projects
(
project_ids_relation
)
merge_requests
=
if
query
=~
/[#!](\d+)\z/
merge_requests
.
where
(
iid:
$1
)
else
merge_requests
.
full_search
(
query
)
end
merge_requests
=
if
query
=~
/[#!](\d+)\z/
merge_requests
.
where
(
iid:
$1
)
else
merge_requests
.
full_search
(
query
)
end
merge_requests
.
order
(
'updated_at DESC'
)
end
...
...
lib/gitlab/shell.rb
View file @
5c7f9d69
...
...
@@ -83,7 +83,7 @@ module Gitlab
# Timeout should be less than 900 ideally, to prevent the memory killer
# to silently kill the process without knowing we are timing out here.
output
,
status
=
Popen
.
popen
([
gitlab_shell_projects_path
,
'import-project'
,
storage
,
"
#{
name
}
.git"
,
url
,
'800'
])
storage
,
"
#{
name
}
.git"
,
url
,
'800'
])
raise
Error
,
output
unless
status
.
zero?
true
end
...
...
lib/gitlab/sherlock/query.rb
View file @
5c7f9d69
...
...
@@ -94,11 +94,12 @@ module Gitlab
private
def
raw_explain
(
query
)
explain
=
if
Gitlab
::
Database
.
postgresql?
"EXPLAIN ANALYZE
#{
query
}
;"
else
"EXPLAIN
#{
query
}
;"
end
explain
=
if
Gitlab
::
Database
.
postgresql?
"EXPLAIN ANALYZE
#{
query
}
;"
else
"EXPLAIN
#{
query
}
;"
end
ActiveRecord
::
Base
.
connection
.
execute
(
explain
)
end
...
...
spec/features/issuables/issuable_list_spec.rb
View file @
5c7f9d69
...
...
@@ -47,11 +47,12 @@ describe 'issuable list', feature: true do
def
create_issuables
(
issuable_type
)
3
.
times
do
issuable
=
if
issuable_type
==
:issue
create
(
:issue
,
project:
project
,
author:
user
)
else
create
(
:merge_request
,
title:
FFaker
::
Lorem
.
sentence
,
source_project:
project
,
source_branch:
FFaker
::
Name
.
name
)
end
issuable
=
if
issuable_type
==
:issue
create
(
:issue
,
project:
project
,
author:
user
)
else
create
(
:merge_request
,
title:
FFaker
::
Lorem
.
sentence
,
source_project:
project
,
source_branch:
FFaker
::
Name
.
name
)
end
2
.
times
do
create
(
:note_on_issue
,
noteable:
issuable
,
project:
project
,
note:
'Test note'
)
...
...
spec/helpers/issues_helper_spec.rb
View file @
5c7f9d69
...
...
@@ -56,7 +56,7 @@ describe IssuesHelper do
subject
{
merge_requests_sentence
(
merge_requests
)}
let
(
:merge_requests
)
do
[
build
(
:merge_request
,
iid:
1
),
build
(
:merge_request
,
iid:
2
),
build
(
:merge_request
,
iid:
3
)]
build
(
:merge_request
,
iid:
3
)]
end
it
{
is_expected
.
to
eq
(
"!1, !2, or !3"
)
}
...
...
spec/lib/gitlab/ci/config/entry/global_spec.rb
View file @
5c7f9d69
...
...
@@ -12,8 +12,8 @@ describe Gitlab::Ci::Config::Entry::Global do
it
'contains the expected node names'
do
expect
(
described_class
.
nodes
.
keys
).
to
match_array
(
%i[before_script image services
after_script variables stages
types cache]
)
after_script variables stages
types cache]
)
end
end
end
...
...
spec/lib/gitlab/ci/config/entry/job_spec.rb
View file @
5c7f9d69
...
...
@@ -140,11 +140,11 @@ describe Gitlab::Ci::Config::Entry::Job do
it
'returns correct value'
do
expect
(
entry
.
value
).
to
eq
(
name: :rspec
,
before_script:
%w[ls pwd]
,
script:
%w[rspec]
,
commands:
"ls
\n
pwd
\n
rspec"
,
stage:
'test'
,
after_script:
%w[cleanup]
)
before_script:
%w[ls pwd]
,
script:
%w[rspec]
,
commands:
"ls
\n
pwd
\n
rspec"
,
stage:
'test'
,
after_script:
%w[cleanup]
)
end
end
end
...
...
spec/lib/gitlab/ci/status/build/factory_spec.rb
View file @
5c7f9d69
...
...
@@ -69,7 +69,7 @@ describe Gitlab::Ci::Status::Build::Factory do
it
'matches correct extended statuses'
do
expect
(
factory
.
extended_statuses
).
to
eq
[
Gitlab
::
Ci
::
Status
::
Build
::
Retryable
,
Gitlab
::
Ci
::
Status
::
Build
::
FailedAllowed
]
Gitlab
::
Ci
::
Status
::
Build
::
FailedAllowed
]
end
it
'fabricates a failed but allowed build status'
do
...
...
spec/lib/gitlab/incoming_email_spec.rb
View file @
5c7f9d69
...
...
@@ -101,8 +101,8 @@ describe Gitlab::IncomingEmail, lib: true do
it
'returns reply key'
do
expect
(
described_class
.
scan_fallback_references
(
references
)).
to
eq
(
%w[issue_1@localhost
reply-59d8df8370b7e95c5a49fbf86aeb2c93@localhost
exchange@microsoft.com]
)
reply-59d8df8370b7e95c5a49fbf86aeb2c93@localhost
exchange@microsoft.com]
)
end
end
end
spec/lib/gitlab/o_auth/user_spec.rb
View file @
5c7f9d69
...
...
@@ -152,7 +152,7 @@ describe Gitlab::OAuth::User, lib: true do
identities_as_hash
=
gl_user
.
identities
.
map
{
|
id
|
{
provider:
id
.
provider
,
extern_uid:
id
.
extern_uid
}
}
expect
(
identities_as_hash
).
to
match_array
(
[{
provider:
'ldapmain'
,
extern_uid:
'uid=user1,ou=People,dc=example'
},
{
provider:
'twitter'
,
extern_uid:
uid
}
{
provider:
'twitter'
,
extern_uid:
uid
}
])
end
end
...
...
@@ -171,7 +171,7 @@ describe Gitlab::OAuth::User, lib: true do
identities_as_hash
=
gl_user
.
identities
.
map
{
|
id
|
{
provider:
id
.
provider
,
extern_uid:
id
.
extern_uid
}
}
expect
(
identities_as_hash
).
to
match_array
(
[{
provider:
'ldapmain'
,
extern_uid:
'uid=user1,ou=People,dc=example'
},
{
provider:
'twitter'
,
extern_uid:
uid
}
{
provider:
'twitter'
,
extern_uid:
uid
}
])
end
end
...
...
spec/lib/gitlab/saml/user_spec.rb
View file @
5c7f9d69
...
...
@@ -158,7 +158,7 @@ describe Gitlab::Saml::User, lib: true do
expect
(
gl_user
.
identities
.
length
).
to
eql
2
identities_as_hash
=
gl_user
.
identities
.
map
{
|
id
|
{
provider:
id
.
provider
,
extern_uid:
id
.
extern_uid
}
}
expect
(
identities_as_hash
).
to
match_array
([{
provider:
'ldapmain'
,
extern_uid:
'uid=user1,ou=People,dc=example'
},
{
provider:
'saml'
,
extern_uid:
uid
}
{
provider:
'saml'
,
extern_uid:
uid
}
])
end
end
...
...
@@ -181,7 +181,7 @@ describe Gitlab::Saml::User, lib: true do
expect
(
gl_user
.
identities
.
length
).
to
eql
2
identities_as_hash
=
gl_user
.
identities
.
map
{
|
id
|
{
provider:
id
.
provider
,
extern_uid:
id
.
extern_uid
}
}
expect
(
identities_as_hash
).
to
match_array
([{
provider:
'ldapmain'
,
extern_uid:
'uid=user1,ou=People,dc=example'
},
{
provider:
'saml'
,
extern_uid:
uid
}
{
provider:
'saml'
,
extern_uid:
uid
}
])
end
...
...
@@ -207,7 +207,7 @@ describe Gitlab::Saml::User, lib: true do
expect
(
local_gl_user
.
identities
.
length
).
to
eql
2
identities_as_hash
=
local_gl_user
.
identities
.
map
{
|
id
|
{
provider:
id
.
provider
,
extern_uid:
id
.
extern_uid
}
}
expect
(
identities_as_hash
).
to
match_array
([{
provider:
'ldapmain'
,
extern_uid:
'uid=user1,ou=People,dc=example'
},
{
provider:
'saml'
,
extern_uid:
'uid=user1,ou=People,dc=example'
}
{
provider:
'saml'
,
extern_uid:
'uid=user1,ou=People,dc=example'
}
])
end
end
...
...
spec/models/ci/build_spec.rb
View file @
5c7f9d69
...
...
@@ -1263,7 +1263,7 @@ describe Ci::Build, :models do
context
'when build has user'
do
let
(
:user_variables
)
do
[{
key:
'GITLAB_USER_ID'
,
value:
user
.
id
.
to_s
,
public:
true
},
{
key:
'GITLAB_USER_EMAIL'
,
value:
user
.
email
,
public:
true
}]
{
key:
'GITLAB_USER_EMAIL'
,
value:
user
.
email
,
public:
true
}]
end
before
do
...
...
spec/support/issuables_list_metadata_shared_examples.rb
View file @
5c7f9d69
...
...
@@ -3,11 +3,12 @@ shared_examples 'issuables list meta-data' do |issuable_type, action = nil|
@issuable_ids
=
[]
2
.
times
do
issuable
=
if
issuable_type
==
:issue
create
(
issuable_type
,
project:
project
)
else
create
(
issuable_type
,
title:
FFaker
::
Lorem
.
sentence
,
source_project:
project
,
source_branch:
FFaker
::
Name
.
name
)
end
issuable
=
if
issuable_type
==
:issue
create
(
issuable_type
,
project:
project
)
else
create
(
issuable_type
,
title:
FFaker
::
Lorem
.
sentence
,
source_project:
project
,
source_branch:
FFaker
::
Name
.
name
)
end
@issuable_ids
<<
issuable
.
id
...
...
spec/support/login_helpers.rb
View file @
5c7f9d69
...
...
@@ -15,11 +15,12 @@ module LoginHelpers
# user = create(:user)
# login_as(user)
def
login_as
(
user_or_role
)
@user
=
if
user_or_role
.
kind_of?
(
User
)
user_or_role
else
create
(
user_or_role
)
end
@user
=
if
user_or_role
.
kind_of?
(
User
)
user_or_role
else
create
(
user_or_role
)
end
login_with
(
@user
)
end
...
...
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