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
05d26e21
Commit
05d26e21
authored
Jul 05, 2016
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix rubocop
parent
9a7ada02
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
0 additions
and
9 deletions
+0
-9
app/helpers/issues_helper.rb
app/helpers/issues_helper.rb
+0
-1
app/models/event.rb
app/models/event.rb
+0
-1
app/models/project_wiki.rb
app/models/project_wiki.rb
+0
-1
app/workers/geo_bulk_notify_worker.rb
app/workers/geo_bulk_notify_worker.rb
+0
-1
config/initializers/elastic_client_setup.rb
config/initializers/elastic_client_setup.rb
+0
-1
lib/gitlab/git_access.rb
lib/gitlab/git_access.rb
+0
-1
lib/gitlab/ldap/adapter.rb
lib/gitlab/ldap/adapter.rb
+0
-1
spec/requests/api/merge_requests_spec.rb
spec/requests/api/merge_requests_spec.rb
+0
-1
spec/requests/api/project_git_hook_spec.rb
spec/requests/api/project_git_hook_spec.rb
+0
-1
No files found.
app/helpers/issues_helper.rb
View file @
05d26e21
...
@@ -183,7 +183,6 @@ module IssuesHelper
...
@@ -183,7 +183,6 @@ module IssuesHelper
options_from_collection_for_select
(
options
,
'name'
,
'title'
,
params
[
:due_date
])
options_from_collection_for_select
(
options
,
'name'
,
'title'
,
params
[
:due_date
])
end
end
def
issues_weight_options
(
selected
=
nil
,
edit:
false
)
def
issues_weight_options
(
selected
=
nil
,
edit:
false
)
weights
=
edit
?
edit_weights
:
issue_weights
weights
=
edit
?
edit_weights
:
issue_weights
...
...
app/models/event.rb
View file @
05d26e21
...
@@ -44,7 +44,6 @@ class Event < ActiveRecord::Base
...
@@ -44,7 +44,6 @@ class Event < ActiveRecord::Base
scope
:closed
,
->
{
where
(
action:
CLOSED
)
}
scope
:closed
,
->
{
where
(
action:
CLOSED
)
}
scope
:merged
,
->
{
where
(
action:
MERGED
)
}
scope
:merged
,
->
{
where
(
action:
MERGED
)
}
class
<<
self
class
<<
self
def
reset_event_cache_for
(
target
)
def
reset_event_cache_for
(
target
)
Event
.
where
(
target_id:
target
.
id
,
target_type:
target
.
class
.
to_s
).
Event
.
where
(
target_id:
target
.
id
,
target_type:
target
.
class
.
to_s
).
...
...
app/models/project_wiki.rb
View file @
05d26e21
...
@@ -16,7 +16,6 @@ class ProjectWiki
...
@@ -16,7 +16,6 @@ class ProjectWiki
attr_reader
:error_message
attr_reader
:error_message
attr_reader
:project
attr_reader
:project
def
initialize
(
project
,
user
=
nil
)
def
initialize
(
project
,
user
=
nil
)
@project
=
project
@project
=
project
@user
=
user
@user
=
user
...
...
app/workers/geo_bulk_notify_worker.rb
View file @
05d26e21
...
@@ -3,7 +3,6 @@ class GeoBulkNotifyWorker
...
@@ -3,7 +3,6 @@ class GeoBulkNotifyWorker
sidekiq_options
queue: :default
sidekiq_options
queue: :default
def
perform
def
perform
Geo
::
NotifyNodesService
.
new
.
execute
Geo
::
NotifyNodesService
.
new
.
execute
end
end
...
...
config/initializers/elastic_client_setup.rb
View file @
05d26e21
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
require
'gitlab/current_settings'
require
'gitlab/current_settings'
module
Elasticsearch
module
Elasticsearch
module
Model
module
Model
module
Client
module
Client
...
...
lib/gitlab/git_access.rb
View file @
05d26e21
...
@@ -224,7 +224,6 @@ module Gitlab
...
@@ -224,7 +224,6 @@ module Gitlab
end
end
end
end
build_status_object
(
true
)
build_status_object
(
true
)
end
end
...
...
lib/gitlab/ldap/adapter.rb
View file @
05d26e21
...
@@ -102,7 +102,6 @@ module Gitlab
...
@@ -102,7 +102,6 @@ module Gitlab
).
map
(
&
:dn
)
).
map
(
&
:dn
)
end
end
def
ldap_search
(
*
args
)
def
ldap_search
(
*
args
)
# Net::LDAP's `time` argument doesn't work. Use Ruby `Timeout` instead.
# Net::LDAP's `time` argument doesn't work. Use Ruby `Timeout` instead.
Timeout
.
timeout
(
config
.
timeout
)
do
Timeout
.
timeout
(
config
.
timeout
)
do
...
...
spec/requests/api/merge_requests_spec.rb
View file @
05d26e21
...
@@ -366,7 +366,6 @@ describe API::API, api: true do
...
@@ -366,7 +366,6 @@ describe API::API, api: true do
approvals_before_merge:
approvals_before_merge
approvals_before_merge:
approvals_before_merge
end
end
context
'when the target project has approvals_before_merge set to zero'
do
context
'when the target project has approvals_before_merge set to zero'
do
before
do
before
do
project
.
update_attributes
(
approvals_before_merge:
0
)
project
.
update_attributes
(
approvals_before_merge:
0
)
...
...
spec/requests/api/project_git_hook_spec.rb
View file @
05d26e21
...
@@ -34,7 +34,6 @@ describe API::API, 'ProjectGitHook', api: true do
...
@@ -34,7 +34,6 @@ describe API::API, 'ProjectGitHook', api: true do
end
end
end
end
describe
"POST /projects/:id/git_hook"
do
describe
"POST /projects/:id/git_hook"
do
context
"authorized user"
do
context
"authorized user"
do
it
"should add git hook to project"
do
it
"should add git hook to project"
do
...
...
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