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
Kazuhiko Shiozaki
gitlab-ce
Commits
3713fc6c
Commit
3713fc6c
authored
Jan 27, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
1eccec17
05eb6185
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/models/project_services/hipchat_service.rb
app/models/project_services/hipchat_service.rb
+1
-1
doc/update/6.4-to-6.5.md
doc/update/6.4-to-6.5.md
+1
-1
No files found.
app/models/project_services/hipchat_service.rb
View file @
3713fc6c
...
@@ -61,7 +61,7 @@ class HipchatService < Service
...
@@ -61,7 +61,7 @@ class HipchatService < Service
elsif
after
=~
/000000/
elsif
after
=~
/000000/
message
<<
"removed branch
#{
ref
}
from <a href=
\"
#{
project
.
web_url
}
\"
>
#{
project
.
name_with_namespace
.
gsub!
(
/\s/
,
''
)
}
</a>
\n
"
message
<<
"removed branch
#{
ref
}
from <a href=
\"
#{
project
.
web_url
}
\"
>
#{
project
.
name_with_namespace
.
gsub!
(
/\s/
,
''
)
}
</a>
\n
"
else
else
message
<<
"
#
pushed to branch <a href=
\"
#{
project
.
web_url
}
/commits/
#{
ref
}
\"
>
#{
ref
}
</a> "
message
<<
"pushed to branch <a href=
\"
#{
project
.
web_url
}
/commits/
#{
ref
}
\"
>
#{
ref
}
</a> "
message
<<
"of <a href=
\"
#{
project
.
web_url
}
\"
>
#{
project
.
name_with_namespace
.
gsub!
(
/\s/
,
''
)
}
</a> "
message
<<
"of <a href=
\"
#{
project
.
web_url
}
\"
>
#{
project
.
name_with_namespace
.
gsub!
(
/\s/
,
''
)
}
</a> "
message
<<
"(<a href=
\"
#{
project
.
web_url
}
/compare/
#{
before
}
...
#{
after
}
\"
>Compare changes</a>)"
message
<<
"(<a href=
\"
#{
project
.
web_url
}
/compare/
#{
before
}
...
#{
after
}
\"
>Compare changes</a>)"
for
commit
in
push
[
:commits
]
do
for
commit
in
push
[
:commits
]
do
...
...
doc/update/6.4-to-6.5.md
View file @
3713fc6c
...
@@ -55,7 +55,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
...
@@ -55,7 +55,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
sudo service gitlab start
sudo service gitlab start
sudo service nginx restart
sudo service nginx restart
###
8
. Check application status
###
6
. Check application status
Check if GitLab and its environment are configured correctly:
Check if GitLab and its environment are configured correctly:
...
...
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