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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
b3f944a3
Commit
b3f944a3
authored
Feb 11, 2015
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Annotate services. Add a link to service template.
parent
6b4ddf2c
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
55 additions
and
51 deletions
+55
-51
app/models/project_services/asana_service.rb
app/models/project_services/asana_service.rb
+9
-8
app/models/project_services/assembla_service.rb
app/models/project_services/assembla_service.rb
+2
-1
app/models/project_services/bamboo_service.rb
app/models/project_services/bamboo_service.rb
+2
-1
app/models/project_services/buildbox_service.rb
app/models/project_services/buildbox_service.rb
+2
-2
app/models/project_services/campfire_service.rb
app/models/project_services/campfire_service.rb
+2
-1
app/models/project_services/ci_service.rb
app/models/project_services/ci_service.rb
+2
-1
app/models/project_services/custom_issue_tracker_service.rb
app/models/project_services/custom_issue_tracker_service.rb
+2
-1
app/models/project_services/emails_on_push_service.rb
app/models/project_services/emails_on_push_service.rb
+2
-1
app/models/project_services/flowdock_service.rb
app/models/project_services/flowdock_service.rb
+2
-1
app/models/project_services/gemnasium_service.rb
app/models/project_services/gemnasium_service.rb
+2
-1
app/models/project_services/gitlab_ci_service.rb
app/models/project_services/gitlab_ci_service.rb
+2
-1
app/models/project_services/gitlab_issue_tracker_service.rb
app/models/project_services/gitlab_issue_tracker_service.rb
+2
-1
app/models/project_services/hipchat_service.rb
app/models/project_services/hipchat_service.rb
+2
-1
app/models/project_services/issue_tracker_service.rb
app/models/project_services/issue_tracker_service.rb
+2
-1
app/models/project_services/jira_service.rb
app/models/project_services/jira_service.rb
+2
-1
app/models/project_services/pivotaltracker_service.rb
app/models/project_services/pivotaltracker_service.rb
+2
-1
app/models/project_services/pushover_service.rb
app/models/project_services/pushover_service.rb
+2
-1
app/models/project_services/redmine_service.rb
app/models/project_services/redmine_service.rb
+2
-1
app/models/project_services/slack_service.rb
app/models/project_services/slack_service.rb
+2
-1
app/models/project_services/teamcity_service.rb
app/models/project_services/teamcity_service.rb
+2
-1
app/views/admin/application_settings/_external_issues_tracker_template.html.haml
...tion_settings/_external_issues_tracker_template.html.haml
+0
-22
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+6
-0
spec/models/service_spec.rb
spec/models/service_spec.rb
+2
-1
No files found.
app/models/project_services/asana_service.rb
View file @
b3f944a3
...
@@ -2,14 +2,15 @@
...
@@ -2,14 +2,15 @@
#
#
# Table name: services
# Table name: services
#
#
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
require
'asana'
require
'asana'
...
...
app/models/project_services/assembla_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
AssemblaService
<
Service
class
AssemblaService
<
Service
...
...
app/models/project_services/bamboo_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
BambooService
<
CiService
class
BambooService
<
CiService
...
...
app/models/project_services/buildbox_service.rb
View file @
b3f944a3
...
@@ -5,13 +5,13 @@
...
@@ -5,13 +5,13 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
require
"addressable/uri"
require
"addressable/uri"
class
BuildboxService
<
CiService
class
BuildboxService
<
CiService
...
...
app/models/project_services/campfire_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
CampfireService
<
Service
class
CampfireService
<
Service
...
...
app/models/project_services/ci_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
# Base class for CI services
# Base class for CI services
...
...
app/models/project_services/custom_issue_tracker_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
CustomIssueTrackerService
<
IssueTrackerService
class
CustomIssueTrackerService
<
IssueTrackerService
...
...
app/models/project_services/emails_on_push_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
EmailsOnPushService
<
Service
class
EmailsOnPushService
<
Service
...
...
app/models/project_services/flowdock_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
require
"flowdock-git-hook"
require
"flowdock-git-hook"
...
...
app/models/project_services/gemnasium_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
require
"gemnasium/gitlab_service"
require
"gemnasium/gitlab_service"
...
...
app/models/project_services/gitlab_ci_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
GitlabCiService
<
CiService
class
GitlabCiService
<
CiService
...
...
app/models/project_services/gitlab_issue_tracker_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
GitlabIssueTrackerService
<
IssueTrackerService
class
GitlabIssueTrackerService
<
IssueTrackerService
...
...
app/models/project_services/hipchat_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
HipchatService
<
Service
class
HipchatService
<
Service
...
...
app/models/project_services/issue_tracker_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
IssueTrackerService
<
Service
class
IssueTrackerService
<
Service
...
...
app/models/project_services/jira_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
JiraService
<
IssueTrackerService
class
JiraService
<
IssueTrackerService
...
...
app/models/project_services/pivotaltracker_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
PivotaltrackerService
<
Service
class
PivotaltrackerService
<
Service
...
...
app/models/project_services/pushover_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
PushoverService
<
Service
class
PushoverService
<
Service
...
...
app/models/project_services/redmine_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
RedmineService
<
IssueTrackerService
class
RedmineService
<
IssueTrackerService
...
...
app/models/project_services/slack_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
SlackService
<
Service
class
SlackService
<
Service
...
...
app/models/project_services/teamcity_service.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
class
TeamcityService
<
CiService
class
TeamcityService
<
CiService
...
...
app/views/admin/application_settings/_external_issues_tracker_template.html.haml
deleted
100644 → 0
View file @
6b4ddf2c
-
service
.
fields
.
each
do
|
field
|
TOPD
/ - name = field[:name]
/ - value = "V"#@service.send(name) unless field[:type] == 'password'
/ - type = field[:type]
/ - placeholder = field[:placeholder]
/ - choices = field[:choices]
/ - default_choice = field[:default_choice]
/ .form-group
/ = f.label name, class: "control-label"
/ .col-sm-10
/ - if type == 'text'
/ = f.text_field name, class: "form-control", placeholder: placeholder
/ - elsif type == 'textarea'
/ = f.text_area name, rows: 5, class: "form-control", placeholder: placeholder
/ - elsif type == 'checkbox'
/ = f.check_box name
/ - elsif type == 'select'
/ = f.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control" }
/ - elsif type == 'password'
/ = f.password_field name, class: 'form-control'
app/views/layouts/nav/_admin.html.haml
View file @
b3f944a3
...
@@ -46,6 +46,12 @@
...
@@ -46,6 +46,12 @@
%span
%span
Applications
Applications
=
nav_link
(
controller: :application_settings
)
do
=
link_to
admin_application_settings_services_path
,
title:
'Service Templates'
do
%i
.fa.fa-copy
%span
Service Templates
=
nav_link
(
controller: :application_settings
,
html_options:
{
class:
'separate-item'
})
do
=
nav_link
(
controller: :application_settings
,
html_options:
{
class:
'separate-item'
})
do
=
link_to
admin_application_settings_path
,
title:
'Settings'
do
=
link_to
admin_application_settings_path
,
title:
'Settings'
do
%i
.fa.fa-cogs
%i
.fa.fa-cogs
...
...
spec/models/service_spec.rb
View file @
b3f944a3
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
# id :integer not null, primary key
# id :integer not null, primary key
# type :string(255)
# type :string(255)
# title :string(255)
# title :string(255)
# project_id :integer
not null
# project_id :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# properties :text
# properties :text
# template :boolean default(FALSE)
#
#
require
'spec_helper'
require
'spec_helper'
...
...
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