Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
nexedi
gitlab-shell
Commits
ed37021c
Commit
ed37021c
authored
8 years ago
by
Lisanne Fellinger
Browse files
Options
Download
Email Patches
Plain Diff
Make merge request text after push clearer
Add changelog entry Editing changelog entry version
parent
e1b0aca1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab_post_receive.rb
lib/gitlab_post_receive.rb
+1
-1
spec/gitlab_post_receive_spec.rb
spec/gitlab_post_receive_spec.rb
+2
-2
No files found.
CHANGELOG
View file @
ed37021c
v4.1.0
- Add support for global custom hooks and chained hook directories (Elan Ruusamäe, Dirk Hörner), !93, !89, #32
- Clear up text with merge request after new branch push (Lisanne Fellinger)
v4.0.3
- Fetch repositories with `--prune` option by default
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab_post_receive.rb
View file @
ed37021c
...
...
@@ -56,7 +56,7 @@ class GitlabPostReceive
def
print_merge_request_link
(
merge_request
)
if
merge_request
[
"new_merge_request"
]
message
=
"
C
reate merge request for
#{
merge_request
[
"branch_name"
]
}
:"
message
=
"
To c
reate
a
merge request for
#{
merge_request
[
"branch_name"
]
}
, visit
:"
else
message
=
"View merge request for
#{
merge_request
[
"branch_name"
]
}
:"
end
...
...
This diff is collapsed.
Click to expand it.
spec/gitlab_post_receive_spec.rb
View file @
ed37021c
...
...
@@ -49,7 +49,7 @@ describe GitlabPostReceive do
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
ordered
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
with
(
"
C
reate merge request for new_branch:"
"
To c
reate
a
merge request for new_branch
, visit
:"
).
ordered
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
with
(
" http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch"
...
...
@@ -123,7 +123,7 @@ describe GitlabPostReceive do
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
ordered
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
with
(
"
C
reate merge request for new_branch:"
"
To c
reate
a
merge request for new_branch
, visit
:"
).
ordered
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
with
(
" http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch"
...
...
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