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
Jérome Perrin
gitlab-ce
Commits
168d5eab
Commit
168d5eab
authored
Jun 15, 2015
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
6b96eb8e
646ce0aa
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
41 additions
and
18 deletions
+41
-18
CHANGELOG
CHANGELOG
+4
-0
app/assets/stylesheets/pages/dashboard.scss
app/assets/stylesheets/pages/dashboard.scss
+0
-4
app/services/git_push_service.rb
app/services/git_push_service.rb
+16
-10
app/services/issues/close_service.rb
app/services/issues/close_service.rb
+1
-1
app/views/shared/_project.html.haml
app/views/shared/_project.html.haml
+0
-2
doc/project_services/irker.md
doc/project_services/irker.md
+1
-1
spec/services/git_push_service_spec.rb
spec/services/git_push_service_spec.rb
+9
-0
spec/services/issues/close_service_spec.rb
spec/services/issues/close_service_spec.rb
+10
-0
No files found.
CHANGELOG
View file @
168d5eab
Please view this file on the master branch, on stable branches it's out of date.
v 7.13.0 (unreleased)
- Remove project visibility icons from dashboard projects list
v 7.12.0 (unreleased)
- Fix post-receive errors on a push when an external issue tracker is configured (Stan Hu)
- Update oauth button logos for Twitter and Google to recommended assets
- Update browser gem to version 0.8.0 for IE11 support (Stan Hu)
- Fix timeout when rendering file with thousands of lines.
...
...
app/assets/stylesheets/pages/dashboard.scss
View file @
168d5eab
...
...
@@ -28,10 +28,6 @@
font-size
:
14px
;
line-height
:
24px
;
.str-truncated
{
max-width
:
76%
;
}
a
{
display
:
block
;
padding
:
8px
15px
;
...
...
app/services/git_push_service.rb
View file @
168d5eab
...
...
@@ -88,18 +88,24 @@ class GitPushService
end
end
# Create cross-reference notes for any other references. Omit any issues that were referenced in an
# issue-closing phrase, or have already been mentioned from this commit (probably from this commit
# being pushed to a different branch).
refs
=
commit
.
references
(
project
,
user
)
-
issues_to_close
refs
.
reject!
{
|
r
|
commit
.
has_mentioned?
(
r
)
}
if
project
.
default_issues_tracker?
create_cross_reference_notes
(
commit
,
issues_to_close
)
end
end
end
if
refs
.
present?
author
||=
commit_user
(
commit
)
def
create_cross_reference_notes
(
commit
,
issues_to_close
)
# Create cross-reference notes for any other references. Omit any issues that were referenced in an
# issue-closing phrase, or have already been mentioned from this commit (probably from this commit
# being pushed to a different branch).
refs
=
commit
.
references
(
project
,
user
)
-
issues_to_close
refs
.
reject!
{
|
r
|
commit
.
has_mentioned?
(
r
)
}
refs
.
each
do
|
r
|
Note
.
create_cross_reference_note
(
r
,
commit
,
author
)
end
if
refs
.
present?
author
||=
commit_user
(
commit
)
refs
.
each
do
|
r
|
Note
.
create_cross_reference_note
(
r
,
commit
,
author
)
end
end
end
...
...
app/services/issues/close_service.rb
View file @
168d5eab
module
Issues
class
CloseService
<
Issues
::
BaseService
def
execute
(
issue
,
commit
=
nil
)
if
issue
.
close
if
project
.
default_issues_tracker?
&&
issue
.
close
event_service
.
close_issue
(
issue
,
current_user
)
create_note
(
issue
,
commit
)
notification_service
.
close_issue
(
issue
,
current_user
)
...
...
app/views/shared/_project.html.haml
View file @
168d5eab
...
...
@@ -3,8 +3,6 @@
-
if
avatar
.dash-project-avatar
=
project_icon
(
project
,
alt:
''
,
class:
'avatar project-avatar s40'
)
.dash-project-access-icon
=
visibility_level_icon
(
project
.
visibility_level
)
%span
.str-truncated
%span
.namespace-name
-
if
project
.
namespace
...
...
doc/project_services/irker.md
View file @
168d5eab
...
...
@@ -4,7 +4,7 @@ GitLab provides a way to push update messages to an Irker server. When
configured, pushes to a project will trigger the service to send data directly
to the Irker server.
See the project homepage for further info: http
://www.catb.org/esr/irker/
See the project homepage for further info: http
s://gitlab.com/esr/irker
## Needed setup
...
...
spec/services/git_push_service_spec.rb
View file @
168d5eab
...
...
@@ -233,6 +233,15 @@ describe GitPushService do
expect
(
Issue
.
find
(
issue
.
id
)).
to
be_opened
end
it
"doesn't close issues when external issue tracker is in use"
do
allow
(
project
).
to
receive
(
:default_issues_tracker?
).
and_return
(
false
)
# The push still shouldn't create cross-reference notes.
expect
{
service
.
execute
(
project
,
user
,
@oldrev
,
@newrev
,
'refs/heads/hurf'
)
}.
not_to
change
{
Note
.
where
(
project_id:
project
.
id
,
system:
true
).
count
}
end
end
describe
"empty project"
do
...
...
spec/services/issues/close_service_spec.rb
View file @
168d5eab
...
...
@@ -31,5 +31,15 @@ describe Issues::CloseService do
expect
(
note
.
note
).
to
include
"Status changed to closed"
end
end
context
"external issue tracker"
do
before
do
allow
(
project
).
to
receive
(
:default_issues_tracker?
).
and_return
(
false
)
@issue
=
Issues
::
CloseService
.
new
(
project
,
user
,
{}).
execute
(
issue
)
end
it
{
expect
(
@issue
).
to
be_valid
}
it
{
expect
(
@issue
).
to
be_opened
}
end
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