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
Tatuya Kamada
gitlab-ce
Commits
792b9920
Commit
792b9920
authored
Dec 30, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8513 from dblessing/fix_hipchat
Fix HipChat Server
parents
2010ae11
9f9f1b3b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/models/project_services/hipchat_service.rb
app/models/project_services/hipchat_service.rb
+2
-2
No files found.
app/models/project_services/hipchat_service.rb
View file @
792b9920
...
@@ -35,7 +35,7 @@ class HipchatService < Service
...
@@ -35,7 +35,7 @@ class HipchatService < Service
{
type:
'text'
,
name:
'token'
,
placeholder:
''
},
{
type:
'text'
,
name:
'token'
,
placeholder:
''
},
{
type:
'text'
,
name:
'room'
,
placeholder:
''
},
{
type:
'text'
,
name:
'room'
,
placeholder:
''
},
{
type:
'text'
,
name:
'server'
,
{
type:
'text'
,
name:
'server'
,
placeholder:
'Leave blank for default. https://
chat.hipchat
.com'
}
placeholder:
'Leave blank for default. https://
hipchat.example
.com'
}
]
]
end
end
...
@@ -47,7 +47,7 @@ class HipchatService < Service
...
@@ -47,7 +47,7 @@ class HipchatService < Service
def
gate
def
gate
options
=
{
api_version:
'v2'
}
options
=
{
api_version:
'v2'
}
options
[
:server_url
]
=
server
unless
server
.
nil
?
options
[
:server_url
]
=
server
unless
server
.
blank
?
@gate
||=
HipChat
::
Client
.
new
(
token
,
options
)
@gate
||=
HipChat
::
Client
.
new
(
token
,
options
)
end
end
...
...
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