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
824846cf
Commit
824846cf
authored
May 11, 2016
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Codestyle changes to make sure we have space around operators (EE)
parent
a0a4bb51
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
10 additions
and
10 deletions
+10
-10
app/workers/concerns/geo_dynamic_backoff.rb
app/workers/concerns/geo_dynamic_backoff.rb
+2
-2
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-1
lib/api/groups.rb
lib/api/groups.rb
+1
-1
lib/gitlab/ldap/person.rb
lib/gitlab/ldap/person.rb
+2
-2
spec/models/concerns/elastic/issue_spec.rb
spec/models/concerns/elastic/issue_spec.rb
+1
-1
spec/models/concerns/elastic/merge_request_spec.rb
spec/models/concerns/elastic/merge_request_spec.rb
+1
-1
spec/models/concerns/elastic/milestone_spec.rb
spec/models/concerns/elastic/milestone_spec.rb
+1
-1
spec/models/concerns/elastic/note_spec.rb
spec/models/concerns/elastic/note_spec.rb
+1
-1
No files found.
app/workers/concerns/geo_dynamic_backoff.rb
View file @
824846cf
...
...
@@ -19,8 +19,8 @@ module GeoDynamicBackoff
def
geometric_backoff_strategy
(
count
)
# This strategy is based on the original one from sidekiq
count
=
count
-
30
# we must start counting after 30
(
count
**
4
)
+
15
+
(
rand
(
30
)
*
(
count
+
1
))
count
=
count
-
30
# we must start counting after 30
(
count
**
4
)
+
15
+
(
rand
(
30
)
*
(
count
+
1
))
end
end
config/initializers/1_settings.rb
View file @
824846cf
...
...
@@ -293,8 +293,8 @@ Settings.artifacts['max_size'] ||= 100 # in megabytes
Settings
[
'pages'
]
||=
Settingslogic
.
new
({})
Settings
.
pages
[
'enabled'
]
=
false
if
Settings
.
pages
[
'enabled'
].
nil?
Settings
.
pages
[
'path'
]
=
File
.
expand_path
(
Settings
.
pages
[
'path'
]
||
File
.
join
(
Settings
.
shared
[
'path'
],
"pages"
),
Rails
.
root
)
Settings
.
pages
[
'host'
]
||=
"example.com"
Settings
.
pages
[
'https'
]
=
false
if
Settings
.
pages
[
'https'
].
nil?
Settings
.
pages
[
'host'
]
||=
"example.com"
Settings
.
pages
[
'port'
]
||=
Settings
.
pages
.
https
?
443
:
80
Settings
.
pages
[
'protocol'
]
||=
Settings
.
pages
.
https
?
"https"
:
"http"
Settings
.
pages
[
'url'
]
||=
Settings
.
send
(
:build_pages_url
)
...
...
lib/api/groups.rb
View file @
824846cf
...
...
@@ -40,7 +40,7 @@ module API
if
@group
.
save
# NOTE: add backwards compatibility for single ldap link
ldap_attrs
=
attributes_for_keys
[
:ldap_cn
,
:ldap_access
]
ldap_attrs
=
attributes_for_keys
[
:ldap_cn
,
:ldap_access
]
if
ldap_attrs
.
present?
@group
.
ldap_group_links
.
create
({
cn:
ldap_attrs
[
:ldap_cn
],
...
...
lib/gitlab/ldap/person.rb
View file @
824846cf
...
...
@@ -66,11 +66,11 @@ module Gitlab
def
windows_domain_name
# The following is only meaningful for Active Directory
require
'net/ldap/dn'
dn_components
=
[]
dn_components
=
[]
Net
::
LDAP
::
DN
.
new
(
dn
).
each_pair
{
|
name
,
value
|
dn_components
<<
{
name:
name
,
value:
value
}
}
dn_components
.
reverse
.
take_while
{
|
rdn
|
rdn
[
:name
].
upcase
==
'DC'
}
.
# Domain Component
take_while
{
|
rdn
|
rdn
[
:name
].
upcase
==
'DC'
}
.
# Domain Component
map
{
|
rdn
|
rdn
[
:value
]
}.
reverse
.
join
(
'.'
)
...
...
spec/models/concerns/elastic/issue_spec.rb
View file @
824846cf
...
...
@@ -32,7 +32,7 @@ describe "Issue", elastic: true do
project
=
create
:empty_project
issue
=
create
:issue
,
project:
project
expected_hash
=
issue
.
attributes
.
extract!
(
'id'
,
'iid'
,
'title'
,
'description'
,
'created_at'
,
expected_hash
=
issue
.
attributes
.
extract!
(
'id'
,
'iid'
,
'title'
,
'description'
,
'created_at'
,
'updated_at'
,
'state'
,
'project_id'
,
'author_id'
,
'assignee_id'
,
'confidential'
)
...
...
spec/models/concerns/elastic/merge_request_spec.rb
View file @
824846cf
...
...
@@ -31,7 +31,7 @@ describe "MergeRequest", elastic: true do
it
"returns json with all needed elements"
do
merge_request
=
create
:merge_request
expected_hash
=
merge_request
.
attributes
.
extract!
(
expected_hash
=
merge_request
.
attributes
.
extract!
(
'id'
,
'iid'
,
'target_branch'
,
...
...
spec/models/concerns/elastic/milestone_spec.rb
View file @
824846cf
...
...
@@ -31,7 +31,7 @@ describe "Milestone", elastic: true do
it
"returns json with all needed elements"
do
milestone
=
create
:milestone
expected_hash
=
milestone
.
attributes
.
extract!
(
expected_hash
=
milestone
.
attributes
.
extract!
(
'id'
,
'title'
,
'description'
,
...
...
spec/models/concerns/elastic/note_spec.rb
View file @
824846cf
...
...
@@ -30,7 +30,7 @@ describe "Note", elastic: true do
it
"returns json with all needed elements"
do
note
=
create
:note
expected_hash
=
note
.
attributes
.
extract!
(
expected_hash
=
note
.
attributes
.
extract!
(
'id'
,
'note'
,
'project_id'
,
...
...
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