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
ff94f29b
Commit
ff94f29b
authored
11 years ago
by
Andrew8xx8
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
States events fixed
parent
231d9e04
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
16 deletions
+17
-16
app/views/issues/_show.html.haml
app/views/issues/_show.html.haml
+2
-2
app/views/issues/show.html.haml
app/views/issues/show.html.haml
+2
-2
app/views/merge_requests/show/_mr_box.html.haml
app/views/merge_requests/show/_mr_box.html.haml
+8
-8
app/views/merge_requests/show/_mr_title.html.haml
app/views/merge_requests/show/_mr_title.html.haml
+2
-1
app/views/milestones/_milestone.html.haml
app/views/milestones/_milestone.html.haml
+1
-1
app/views/milestones/show.html.haml
app/views/milestones/show.html.haml
+1
-1
features/steps/project/project_merge_requests.rb
features/steps/project/project_merge_requests.rb
+1
-1
No files found.
app/views/issues/_show.html.haml
View file @
ff94f29b
...
...
@@ -9,9 +9,9 @@
=
issue
.
notes
.
count
-
if
can?
current_user
,
:modify_issue
,
issue
-
if
issue
.
closed?
=
link_to
'Reopen'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
state
: :reopened
},
status_only:
true
),
method: :put
,
class:
"btn btn-small grouped reopen_issue"
,
remote:
true
=
link_to
'Reopen'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
state
_event: :reopen
},
status_only:
true
),
method: :put
,
class:
"btn btn-small grouped reopen_issue"
,
remote:
true
-
else
=
link_to
'Close'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
state
: :closed
},
status_only:
true
),
method: :put
,
class:
"btn btn-small grouped close_issue"
,
remote:
true
=
link_to
'Close'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
state
_event: :close
},
status_only:
true
),
method: :put
,
class:
"btn btn-small grouped close_issue"
,
remote:
true
=
link_to
edit_project_issue_path
(
issue
.
project
,
issue
),
class:
"btn btn-small edit-issue-link grouped"
do
%i
.icon-edit
Edit
...
...
This diff is collapsed.
Click to expand it.
app/views/issues/show.html.haml
View file @
ff94f29b
...
...
@@ -8,9 +8,9 @@
%span
.pull-right
-
if
can?
(
current_user
,
:admin_project
,
@project
)
||
@issue
.
author
==
current_user
-
if
@issue
.
closed?
=
link_to
'Reopen'
,
project_issue_path
(
@project
,
@issue
,
issue:
{
state
: :reopened
},
status_only:
true
),
method: :put
,
class:
"btn grouped reopen_issue"
=
link_to
'Reopen'
,
project_issue_path
(
@project
,
@issue
,
issue:
{
state
_event: :reopen
},
status_only:
true
),
method: :put
,
class:
"btn grouped reopen_issue"
-
else
=
link_to
'Close'
,
project_issue_path
(
@project
,
@issue
,
issue:
{
state
: :closed
},
status_only:
true
),
method: :put
,
class:
"btn grouped close_issue"
,
title:
"Close Issue"
=
link_to
'Close'
,
project_issue_path
(
@project
,
@issue
,
issue:
{
state
_event: :close
},
status_only:
true
),
method: :put
,
class:
"btn grouped close_issue"
,
title:
"Close Issue"
-
if
can?
(
current_user
,
:admin_project
,
@project
)
||
@issue
.
author
==
current_user
=
link_to
edit_project_issue_path
(
@project
,
@issue
),
class:
"btn grouped"
do
%i
.icon-edit
...
...
This diff is collapsed.
Click to expand it.
app/views/merge_requests/show/_mr_box.html.haml
View file @
ff94f29b
...
...
@@ -23,12 +23,12 @@
-
if
@merge_request
.
closed?
.ui-box-bottom
-
if
@merge_request
.
merged?
%span
Merged by
#{
link_to_member
(
@project
,
@merge_request
.
merge_event
.
author
)
}
%small
#{
time_ago_in_words
(
@merge_request
.
merge_event
.
created_at
)
}
ago.
-
elsif
@merge_request
.
closed_event
%span
Closed by
#{
link_to_member
(
@project
,
@merge_request
.
closed
_event
.
author
)
}
%small
#{
time_ago_in_words
(
@merge_request
.
closed
_event
.
created_at
)
}
ago.
%span
Closed by
#{
link_to_member
(
@project
,
@merge_request
.
closed_event
.
author
)
}
%small
#{
time_ago_in_words
(
@merge_request
.
closed_event
.
created_at
)
}
ago.
-
if
@merge_request
.
merged?
.ui-box-bottom
%span
Merged by
#{
link_to_member
(
@project
,
@merge_request
.
merge
_event
.
author
)
}
%small
#{
time_ago_in_words
(
@merge_request
.
merge
_event
.
created_at
)
}
ago.
This diff is collapsed.
Click to expand it.
app/views/merge_requests/show/_mr_title.html.haml
View file @
ff94f29b
...
...
@@ -17,7 +17,8 @@
%li
=
link_to
"Email Patches"
,
project_merge_request_path
(
@project
,
@merge_request
,
format: :patch
)
%li
=
link_to
"Plain Diff"
,
project_merge_request_path
(
@project
,
@merge_request
,
format: :diff
)
=
link_to
'Close'
,
project_merge_request_path
(
@project
,
@merge_request
,
merge_request:
{
closed:
true
},
status_only:
true
),
method: :put
,
class:
"btn grouped btn-close"
,
title:
"Close merge request"
=
link_to
'Close'
,
project_merge_request_path
(
@project
,
@merge_request
,
merge_request:
{
state_event: :close
}),
method: :put
,
class:
"btn grouped btn-close"
,
title:
"Close merge request"
=
p
project_merge_request_path
(
@project
,
@merge_request
,
merge_request:
{
state_event: :close
})
=
link_to
edit_project_merge_request_path
(
@project
,
@merge_request
),
class:
"btn grouped"
do
%i
.icon-edit
...
...
This diff is collapsed.
Click to expand it.
app/views/milestones/_milestone.html.haml
View file @
ff94f29b
...
...
@@ -6,7 +6,7 @@
Edit
%h4
=
link_to_gfm
truncate
(
milestone
.
title
,
length:
100
),
project_milestone_path
(
milestone
.
project
,
milestone
)
-
if
milestone
.
expired?
and
not
milestone
.
closed
-
if
milestone
.
expired?
and
not
milestone
.
closed
?
%span
.cred
(Expired)
%small
=
milestone
.
expires_at
...
...
This diff is collapsed.
Click to expand it.
app/views/milestones/show.html.haml
View file @
ff94f29b
...
...
@@ -25,7 +25,7 @@
%hr
%p
%span
All issues for this milestone are closed. You may close milestone now.
=
link_to
'Close Milestone'
,
project_milestone_path
(
@project
,
@milestone
,
milestone:
{
state
: :closed
}),
method: :put
,
class:
"btn btn-small btn-remove"
=
link_to
'Close Milestone'
,
project_milestone_path
(
@project
,
@milestone
,
milestone:
{
state
_event: :close
}),
method: :put
,
class:
"btn btn-small btn-remove"
.ui-box.ui-box-show
.ui-box-head
...
...
This diff is collapsed.
Click to expand it.
features/steps/project/project_merge_requests.rb
View file @
ff94f29b
...
...
@@ -64,7 +64,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
And
'project "Shop" have "Bug NS-04" open merge request'
do
project
=
Project
.
find_by_name
(
"Shop"
)
create
(
:
closed_
merge_request
,
create
(
:merge_request
,
title:
"Bug NS-04"
,
project:
project
,
author:
project
.
users
.
first
)
...
...
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