Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-shell
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
nexedi
gitlab-shell
Commits
ed37021c
Commit
ed37021c
authored
Nov 28, 2016
by
Lisanne Fellinger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make merge request text after push clearer
Add changelog entry Editing changelog entry version
parent
e1b0aca1
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
v4.1.0
- Add support for global custom hooks and chained hook directories (Elan Ruusamäe, Dirk Hörner), !93, !89, #32
- 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
v4.0.3
- Fetch repositories with `--prune` option by default
- Fetch repositories with `--prune` option by default
...
...
lib/gitlab_post_receive.rb
View file @
ed37021c
...
@@ -56,7 +56,7 @@ class GitlabPostReceive
...
@@ -56,7 +56,7 @@ class GitlabPostReceive
def
print_merge_request_link
(
merge_request
)
def
print_merge_request_link
(
merge_request
)
if
merge_request
[
"new_merge_request"
]
if
merge_request
[
"new_merge_request"
]
message
=
"
Create merge request for
#{
merge_request
[
"branch_name"
]
}
:"
message
=
"
To create a merge request for
#{
merge_request
[
"branch_name"
]
}
, visit
:"
else
else
message
=
"View merge request for
#{
merge_request
[
"branch_name"
]
}
:"
message
=
"View merge request for
#{
merge_request
[
"branch_name"
]
}
:"
end
end
...
...
spec/gitlab_post_receive_spec.rb
View file @
ed37021c
...
@@ -49,7 +49,7 @@ describe GitlabPostReceive do
...
@@ -49,7 +49,7 @@ describe GitlabPostReceive do
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
ordered
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
ordered
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
with
(
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
with
(
"
Create merge request for new_branch
:"
"
To create a merge request for new_branch, visit
:"
).
ordered
).
ordered
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
with
(
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
with
(
" http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch"
" http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch"
...
@@ -123,7 +123,7 @@ describe GitlabPostReceive do
...
@@ -123,7 +123,7 @@ describe GitlabPostReceive do
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
ordered
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
ordered
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
with
(
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
with
(
"
Create merge request for new_branch
:"
"
To create a merge request for new_branch, visit
:"
).
ordered
).
ordered
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
with
(
expect
(
gitlab_post_receive
).
to
receive
(
:puts
).
with
(
" http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch"
" http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch"
...
...
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