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
Boxiang Sun
gitlab-ce
Commits
193f9050
Commit
193f9050
authored
9 years ago
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:gitlabhq/gitlabhq
parents
2c4eef58
5e9d4a08
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
CHANGELOG
CHANGELOG
+1
-0
app/models/project_services/hipchat_service.rb
app/models/project_services/hipchat_service.rb
+3
-2
app/views/projects/_md_preview.html.haml
app/views/projects/_md_preview.html.haml
+1
-1
No files found.
CHANGELOG
View file @
193f9050
...
@@ -11,6 +11,7 @@ v 7.11.0 (unreleased)
...
@@ -11,6 +11,7 @@ v 7.11.0 (unreleased)
-
-
-
-
- Improve new project command options (Ben Bodenmiller)
- Improve new project command options (Ben Bodenmiller)
- Prevent sending empty messages to HipChat (Chulki Lee)
v 7.10.0 (unreleased)
v 7.10.0 (unreleased)
- Ignore submodules that are defined in .gitmodules but are checked in as directories.
- Ignore submodules that are defined in .gitmodules but are checked in as directories.
...
...
This diff is collapsed.
Click to expand it.
app/models/project_services/hipchat_service.rb
View file @
193f9050
...
@@ -50,8 +50,9 @@ class HipchatService < Service
...
@@ -50,8 +50,9 @@ class HipchatService < Service
def
execute
(
data
)
def
execute
(
data
)
return
unless
supported_events
.
include?
(
data
[
:object_kind
])
return
unless
supported_events
.
include?
(
data
[
:object_kind
])
message
=
create_message
(
data
)
gate
[
room
].
send
(
'GitLab'
,
create_message
(
data
))
return
unless
message
.
present?
gate
[
room
].
send
(
'GitLab'
,
message
)
end
end
private
private
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/_md_preview.html.haml
View file @
193f9050
...
@@ -9,5 +9,5 @@
...
@@ -9,5 +9,5 @@
%div
%div
.md-write-holder
.md-write-holder
=
yield
=
yield
.md-preview-holder.hide
.md
.md
-preview-holder.hide
.js-md-preview
{
class:
(
preview_class
if
defined?
(
preview_class
))}
.js-md-preview
{
class:
(
preview_class
if
defined?
(
preview_class
))}
This diff is collapsed.
Click to expand it.
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