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
4fe5179c
Commit
4fe5179c
authored
8 years ago
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
satisfy rubocop
parent
df7eef37
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
app/helpers/merge_requests_helper.rb
app/helpers/merge_requests_helper.rb
+3
-4
app/models/remote_mirror.rb
app/models/remote_mirror.rb
+1
-1
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+2
-2
spec/requests/api/ldap_group_links_spec.rb
spec/requests/api/ldap_group_links_spec.rb
+1
-1
No files found.
app/helpers/merge_requests_helper.rb
View file @
4fe5179c
...
@@ -93,12 +93,11 @@ module MergeRequestsHelper
...
@@ -93,12 +93,11 @@ module MergeRequestsHelper
more_approvals
=
merge_request
.
approvals_left
-
merge_request
.
approvers_left
.
count
more_approvals
=
merge_request
.
approvals_left
-
merge_request
.
approvers_left
.
count
approvers_names
=
merge_request
.
approvers_left
.
map
(
&
:name
)
approvers_names
=
merge_request
.
approvers_left
.
map
(
&
:name
)
case
true
if
more_approvals
>
0
when
more_approvals
>
0
str
<<
" (from
#{
render_items_list
(
approvers_names
+
[
"
#{
more_approvals
}
more"
])
}
)"
str
<<
" (from
#{
render_items_list
(
approvers_names
+
[
"
#{
more_approvals
}
more"
])
}
)"
when
more_approvals
<
0
elsif
more_approvals
<
0
str
<<
" (from
#{
render_items_list
(
approvers_names
,
"or"
)
}
)"
str
<<
" (from
#{
render_items_list
(
approvers_names
,
"or"
)
}
)"
els
e
els
if
str
<<
" (from
#{
render_items_list
(
approvers_names
)
}
)"
str
<<
" (from
#{
render_items_list
(
approvers_names
)
}
)"
end
end
end
end
...
...
This diff is collapsed.
Click to expand it.
app/models/remote_mirror.rb
View file @
4fe5179c
...
@@ -119,7 +119,7 @@ class RemoteMirror < ActiveRecord::Base
...
@@ -119,7 +119,7 @@ class RemoteMirror < ActiveRecord::Base
result
=
URI
.
parse
(
url
)
result
=
URI
.
parse
(
url
)
result
.
password
=
'*****'
if
result
.
password
result
.
password
=
'*****'
if
result
.
password
result
.
user
=
'*****'
if
result
.
user
&&
result
.
user
!=
"git"
#tokens or other data may be saved as user
result
.
user
=
'*****'
if
result
.
user
&&
result
.
user
!=
"git"
#
tokens or other data may be saved as user
result
.
to_s
result
.
to_s
end
end
...
...
This diff is collapsed.
Click to expand it.
config/initializers/1_settings.rb
View file @
4fe5179c
...
@@ -419,8 +419,8 @@ Settings.satellites['path'] = File.expand_path(Settings.satellites['path'] || "t
...
@@ -419,8 +419,8 @@ Settings.satellites['path'] = File.expand_path(Settings.satellites['path'] || "t
#
#
Settings
[
'kerberos'
]
||=
Settingslogic
.
new
({})
Settings
[
'kerberos'
]
||=
Settingslogic
.
new
({})
Settings
.
kerberos
[
'enabled'
]
=
false
if
Settings
.
kerberos
[
'enabled'
].
nil?
Settings
.
kerberos
[
'enabled'
]
=
false
if
Settings
.
kerberos
[
'enabled'
].
nil?
Settings
.
kerberos
[
'keytab'
]
=
nil
if
Settings
.
kerberos
[
'keytab'
].
blank?
#nil means use default keytab
Settings
.
kerberos
[
'keytab'
]
=
nil
if
Settings
.
kerberos
[
'keytab'
].
blank?
#
nil means use default keytab
Settings
.
kerberos
[
'service_principal_name'
]
=
nil
if
Settings
.
kerberos
[
'service_principal_name'
].
blank?
#nil means any SPN in keytab
Settings
.
kerberos
[
'service_principal_name'
]
=
nil
if
Settings
.
kerberos
[
'service_principal_name'
].
blank?
#
nil means any SPN in keytab
Settings
.
kerberos
[
'use_dedicated_port'
]
=
false
if
Settings
.
kerberos
[
'use_dedicated_port'
].
nil?
Settings
.
kerberos
[
'use_dedicated_port'
]
=
false
if
Settings
.
kerberos
[
'use_dedicated_port'
].
nil?
Settings
.
kerberos
[
'https'
]
=
Settings
.
gitlab
.
https
if
Settings
.
kerberos
[
'https'
].
nil?
Settings
.
kerberos
[
'https'
]
=
Settings
.
gitlab
.
https
if
Settings
.
kerberos
[
'https'
].
nil?
Settings
.
kerberos
[
'port'
]
||=
Settings
.
kerberos
.
https
?
8443
:
8088
Settings
.
kerberos
[
'port'
]
||=
Settings
.
kerberos
.
https
?
8443
:
8088
...
...
This diff is collapsed.
Click to expand it.
spec/requests/api/ldap_group_links_spec.rb
View file @
4fe5179c
...
@@ -51,7 +51,7 @@ describe API::API, api: true do
...
@@ -51,7 +51,7 @@ describe API::API, api: true do
expect
(
json_response
[
'provider'
]).
to
eq
(
'ldap3'
)
expect
(
json_response
[
'provider'
]).
to
eq
(
'ldap3'
)
end
end
#TODO: Correct and activate this test once issue #329 is fixed
#
TODO: Correct and activate this test once issue #329 is fixed
xit
"should return ok and add ldap group link even if no provider specified"
do
xit
"should return ok and add ldap group link even if no provider specified"
do
expect
do
expect
do
post
api
(
"/groups/
#{
group_with_ldap_links
.
id
}
/ldap_group_links"
,
owner
),
post
api
(
"/groups/
#{
group_with_ldap_links
.
id
}
/ldap_group_links"
,
owner
),
...
...
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