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
3185b87c
Commit
3185b87c
authored
Feb 23, 2018
by
James Edwards-Jones
Committed by
James Edwards-Jones
Mar 15, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed unused `Service#disabled_title` methods
parent
7834f63c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
19 deletions
+0
-19
app/models/project_services/jira_service.rb
app/models/project_services/jira_service.rb
+0
-5
app/models/project_services/pipelines_email_service.rb
app/models/project_services/pipelines_email_service.rb
+0
-4
app/models/service.rb
app/models/service.rb
+0
-5
app/views/projects/services/_form.html.haml
app/views/projects/services/_form.html.haml
+0
-5
No files found.
app/models/project_services/jira_service.rb
View file @
3185b87c
...
@@ -159,11 +159,6 @@ class JiraService < IssueTrackerService
...
@@ -159,11 +159,6 @@ class JiraService < IssueTrackerService
add_comment
(
data
,
jira_issue
)
add_comment
(
data
,
jira_issue
)
end
end
# reason why service cannot be tested
def
disabled_title
"Please fill in Password and Username."
end
def
test
(
_
)
def
test
(
_
)
result
=
test_settings
result
=
test_settings
success
=
result
.
present?
success
=
result
.
present?
...
...
app/models/project_services/pipelines_email_service.rb
View file @
3185b87c
...
@@ -39,10 +39,6 @@ class PipelinesEmailService < Service
...
@@ -39,10 +39,6 @@ class PipelinesEmailService < Service
project
.
pipelines
.
any?
project
.
pipelines
.
any?
end
end
def
disabled_title
'Please setup a pipeline on your repository.'
end
def
test_data
(
project
,
user
)
def
test_data
(
project
,
user
)
data
=
Gitlab
::
DataBuilder
::
Pipeline
.
build
(
project
.
pipelines
.
last
)
data
=
Gitlab
::
DataBuilder
::
Pipeline
.
build
(
project
.
pipelines
.
last
)
data
[
:user
]
=
user
.
hook_attrs
data
[
:user
]
=
user
.
hook_attrs
...
...
app/models/service.rb
View file @
3185b87c
...
@@ -151,11 +151,6 @@ class Service < ActiveRecord::Base
...
@@ -151,11 +151,6 @@ class Service < ActiveRecord::Base
true
true
end
end
# reason why service cannot be tested
def
disabled_title
"Please setup a project repository."
end
# Provide convenient accessor methods
# Provide convenient accessor methods
# for each serialized property.
# for each serialized property.
# Also keep track of updated properties in a similar way as ActiveModel::Dirty
# Also keep track of updated properties in a similar way as ActiveModel::Dirty
...
...
app/views/projects/services/_form.html.haml
View file @
3185b87c
...
@@ -12,11 +12,6 @@
...
@@ -12,11 +12,6 @@
.footer-block.row-content-block
.footer-block.row-content-block
=
service_save_button
(
@service
)
=
service_save_button
(
@service
)
-
if
@service
.
valid?
&&
@service
.
activated?
-
unless
@service
.
can_test?
-
disabled_class
=
'disabled'
-
disabled_title
=
@service
.
disabled_title
=
link_to
'Cancel'
,
project_settings_integrations_path
(
@project
),
class:
'btn btn-cancel'
=
link_to
'Cancel'
,
project_settings_integrations_path
(
@project
),
class:
'btn btn-cancel'
-
if
lookup_context
.
template_exists?
(
'show'
,
"projects/services/
#{
@service
.
to_param
}
"
,
true
)
-
if
lookup_context
.
template_exists?
(
'show'
,
"projects/services/
#{
@service
.
to_param
}
"
,
true
)
...
...
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