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
6cd84aed
Commit
6cd84aed
authored
Oct 15, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
satisfy rubocop
parent
c0577a31
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
6 deletions
+3
-6
app/controllers/admin/licenses_controller.rb
app/controllers/admin/licenses_controller.rb
+0
-1
app/models/project_services/jira_service.rb
app/models/project_services/jira_service.rb
+0
-2
app/services/ldap_group_reset_service.rb
app/services/ldap_group_reset_service.rb
+1
-1
features/steps/project/team_management.rb
features/steps/project/team_management.rb
+1
-1
spec/models/project_services/jenkins_service_spec.rb
spec/models/project_services/jenkins_service_spec.rb
+1
-1
No files found.
app/controllers/admin/licenses_controller.rb
View file @
6cd84aed
...
...
@@ -37,7 +37,6 @@ class Admin::LicensesController < Admin::ApplicationController
def
destroy
license
.
destroy
message
=
"The license was removed. "
if
License
.
current
flash
[
:notice
]
=
"The license was removed. GitLab has fallen back on the previous license."
else
...
...
app/models/project_services/jira_service.rb
View file @
6cd84aed
...
...
@@ -168,9 +168,7 @@ class JiraService < IssueTrackerService
user_url
=
data
[
:user
][
:url
]
entity_name
=
data
[
:entity
][
:name
]
entity_url
=
data
[
:entity
][
:url
]
entity_iid
=
data
[
:entity
][
:iid
]
project_name
=
data
[
:project
][
:name
]
project_url
=
data
[
:project
][
:url
]
message
=
{
body:
"[
#{
user_name
}
|
#{
user_url
}
] mentioned this issue in [a
#{
entity_name
}
of
#{
project_name
}
|
#{
entity_url
}
]."
...
...
app/services/ldap_group_reset_service.rb
View file @
6cd84aed
...
...
@@ -5,7 +5,7 @@ class LdapGroupResetService
# set Gitlab::Access::Guest to later on upgrade the access of a user
# trigger the lowest access possible for all LDAP connected users
a
=
group
.
members
.
with_ldap_dn
.
map
do
|
member
|
group
.
members
.
with_ldap_dn
.
map
do
|
member
|
# don't unauthorize the current user
next
if
current_user
==
member
.
user
member
.
update_attribute
:access_level
,
Gitlab
::
Access
::
GUEST
...
...
features/steps/project/team_management.rb
View file @
6cd84aed
...
...
@@ -131,7 +131,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
step
'I share project with group "OpenSource"'
do
project
=
Project
.
find_by
(
name:
'Shop'
)
os_group
=
create
(
:group
,
name:
'OpenSource'
)
os_project
=
create
(
:project
,
group:
os_group
)
create
(
:project
,
group:
os_group
)
@os_user1
=
create
(
:user
)
@os_user2
=
create
(
:user
)
os_group
.
add_owner
(
@os_user1
)
...
...
spec/models/project_services/jenkins_service_spec.rb
View file @
6cd84aed
...
...
@@ -27,7 +27,7 @@ describe JenkinsService do
describe
'commits methods'
do
def
status_body_for_icon
(
state
)
body
=
<<
eos
<<
eos
<h1 class="build-caption page-headline"><img style="width: 48px; height: 48px; " alt="Success" class="icon-
#{
state
}
icon-xlg" src="/static/855d7c3c/images/48x48/
#{
state
}
" tooltip="Success" title="Success">
Build #188
(Oct 15, 2014 9:45:21 PM)
...
...
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