Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
c8b78ea12236
Commit
c8b78ea1
authored
Jan 20, 2015
by
Marin Jankovski
Browse files
Allow creation of the jira and redmine services.
parent
0422d33d6186
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/controllers/projects/services_controller.rb
View file @
c8b78ea1
...
...
@@ -17,7 +17,8 @@
def
update
if
@service
.
update_attributes
(
service_params
)
redirect_to
edit_project_service_path
(
@project
,
@service
.
to_param
)
redirect_to
edit_project_service_path
(
@project
,
@service
.
to_param
),
notice:
'Successfully updated.'
else
render
'edit'
end
...
...
@@ -41,7 +42,8 @@
:title
,
:token
,
:type
,
:active
,
:api_key
,
:subdomain
,
:room
,
:recipients
,
:project_url
,
:webhook
,
:user_key
,
:device
,
:priority
,
:sound
,
:bamboo_url
,
:username
,
:password
,
:build_key
,
:server
,
:teamcity_url
,
:build_type
:build_key
,
:server
,
:teamcity_url
,
:build_type
,
:description
,
:issues_url
,
:new_issue_url
)
end
end
app/models/project.rb
View file @
c8b78ea1
...
...
@@ -68,6 +68,9 @@
has_one
:bamboo_service
,
dependent: :destroy
has_one
:teamcity_service
,
dependent: :destroy
has_one
:pushover_service
,
dependent: :destroy
has_one
:jira_service
,
dependent: :destroy
has_one
:redmine_service
,
dependent: :destroy
has_one
:forked_project_link
,
dependent: :destroy
,
foreign_key:
"forked_to_project_id"
has_one
:forked_from_project
,
through: :forked_project_link
# Merge Requests for target project should be removed with it
...
...
@@ -321,7 +324,7 @@
def
available_services_names
%w(gitlab_ci campfire hipchat pivotaltracker flowdock assembla
emails_on_push gemnasium slack pushover buildbox bamboo teamcity)
emails_on_push gemnasium slack pushover buildbox bamboo teamcity
jira redmine
)
end
def
gitlab_ci?
...
...
Write
Preview
Supports
Markdown
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