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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
4b15a8ed
Commit
4b15a8ed
authored
Apr 12, 2016
by
Phil Hughes
Committed by
Jacob Schatz
Apr 16, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed up based on feedback
parent
365f351a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
11 deletions
+9
-11
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+1
-3
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+6
-6
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+1
-1
spec/features/issues/move_spec.rb
spec/features/issues/move_spec.rb
+1
-1
No files found.
app/helpers/issuables_helper.rb
View file @
4b15a8ed
...
@@ -57,9 +57,7 @@ module IssuablesHelper
...
@@ -57,9 +57,7 @@ module IssuablesHelper
def
issuable_meta
(
issuable
,
project
,
text
)
def
issuable_meta
(
issuable
,
project
,
text
)
output
=
content_tag
:strong
,
"
#{
text
}
#{
issuable
.
to_reference
}
"
,
class:
"identifier"
output
=
content_tag
:strong
,
"
#{
text
}
#{
issuable
.
to_reference
}
"
,
class:
"identifier"
output
<<
" opened "
output
<<
" opened
#{
time_ago_with_tooltip
(
issuable
.
created_at
,
skip_js:
true
)
}
by"
.
html_safe
output
<<
time_ago_with_tooltip
(
issuable
.
created_at
)
output
<<
" by "
output
<<
content_tag
(
:strong
)
do
output
<<
content_tag
(
:strong
)
do
author_output
=
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
author_output
=
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
author_output
<<
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
by_username:
true
,
avatar:
false
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
)
author_output
<<
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
by_username:
true
,
avatar:
false
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
)
...
...
app/views/projects/issues/show.html.haml
View file @
4b15a8ed
...
@@ -5,11 +5,11 @@
...
@@ -5,11 +5,11 @@
.clearfix.detail-page-header
.clearfix.detail-page-header
.issuable-header
.issuable-header
.issuable-status-box.status-box.status-box-closed
{
class:
"#{issue_button_visibility(@issue, false)}"
}
.issuable-status-box.status-box.status-box-closed
{
class:
issue_button_visibility
(
@issue
,
false
)
}
=
icon
(
'check'
,
class:
"hidden-sm hidden-md hidden-lg"
)
=
icon
(
'check'
,
class:
"hidden-sm hidden-md hidden-lg"
)
%span
.hidden-xs
%span
.hidden-xs
Closed
Closed
.issuable-status-box.status-box.status-box-open
{
class:
"#{issue_button_visibility(@issue, true)}"
}
.issuable-status-box.status-box.status-box-open
{
class:
issue_button_visibility
(
@issue
,
true
)
}
=
icon
(
'circle-o'
,
class:
"hidden-sm hidden-md hidden-lg"
)
=
icon
(
'circle-o'
,
class:
"hidden-sm hidden-md hidden-lg"
)
%span
.hidden-xs
Open
%span
.hidden-xs
Open
...
@@ -32,9 +32,9 @@
...
@@ -32,9 +32,9 @@
=
link_to
'New issue'
,
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
),
title:
'New issue'
,
id:
'new_issue_link'
=
link_to
'New issue'
,
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
),
title:
'New issue'
,
id:
'new_issue_link'
-
if
can?
(
current_user
,
:update_issue
,
@issue
)
-
if
can?
(
current_user
,
:update_issue
,
@issue
)
%li
%li
=
link_to
'Reopen issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
status_only:
true
,
format:
'json'
),
data:
{
no_turbolink:
true
},
class:
"
#{
issue_button_visibility
(
@issue
,
false
)
}
"
,
title:
'Reopen issue'
=
link_to
'Reopen issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
status_only:
true
,
format:
'json'
),
data:
{
no_turbolink:
true
},
class:
"btn-reopen
#{
issue_button_visibility
(
@issue
,
false
)
}
"
,
title:
'Reopen issue'
%li
%li
=
link_to
'Close issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
status_only:
true
,
format:
'json'
),
data:
{
no_turbolink:
true
},
class:
"
#{
issue_button_visibility
(
@issue
,
true
)
}
"
,
title:
'Close issue'
=
link_to
'Close issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
status_only:
true
,
format:
'json'
),
data:
{
no_turbolink:
true
},
class:
"btn-close
#{
issue_button_visibility
(
@issue
,
true
)
}
"
,
title:
'Close issue'
%li
%li
=
link_to
'Edit'
,
edit_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
@issue
)
=
link_to
'Edit'
,
edit_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
@issue
)
-
if
can?
(
current_user
,
:create_issue
,
@project
)
-
if
can?
(
current_user
,
:create_issue
,
@project
)
...
@@ -42,8 +42,8 @@
...
@@ -42,8 +42,8 @@
=
icon
(
'plus'
)
=
icon
(
'plus'
)
New issue
New issue
-
if
can?
(
current_user
,
:update_issue
,
@issue
)
-
if
can?
(
current_user
,
:update_issue
,
@issue
)
=
link_to
'Reopen issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
status_only:
true
,
format:
'json'
),
data:
{
no_turbolink:
true
},
class:
"hidden-xs hidden-sm btn btn-nr btn-grouped btn-reopen
#{
issue_button_visibility
(
@issue
,
false
)
}
"
,
title:
'Reopen issue'
=
link_to
'Reopen issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
status_only:
true
,
format:
'json'
),
data:
{
no_turbolink:
true
},
class:
"hidden-xs hidden-sm btn btn-nr btn-grouped btn-reopen
#{
issue_button_visibility
(
@issue
,
false
)
}
"
,
title:
'Reopen issue'
=
link_to
'Close issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
status_only:
true
,
format:
'json'
),
data:
{
no_turbolink:
true
},
class:
"hidden-xs hidden-sm btn btn-nr btn-grouped btn-close
#{
issue_button_visibility
(
@issue
,
true
)
}
"
,
title:
'Close issue'
=
link_to
'Close issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
status_only:
true
,
format:
'json'
),
data:
{
no_turbolink:
true
},
class:
"hidden-xs hidden-sm btn btn-nr btn-grouped btn-close
#{
issue_button_visibility
(
@issue
,
true
)
}
"
,
title:
'Close issue'
=
link_to
edit_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
@issue
),
class:
'hidden-xs hidden-sm btn btn-nr btn-grouped issuable-edit'
do
=
link_to
edit_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
@issue
),
class:
'hidden-xs hidden-sm btn btn-nr btn-grouped issuable-edit'
do
=
icon
(
'pencil-square-o'
)
=
icon
(
'pencil-square-o'
)
Edit
Edit
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
4b15a8ed
.clearfix.detail-page-header
.clearfix.detail-page-header
.issuable-header
.issuable-header
.issuable-status-box.status-box
{
class:
"#{status_box_class(@merge_request)}"
}
.issuable-status-box.status-box
{
class:
status_box_class
(
@merge_request
)
}
=
icon
(
@merge_request
.
state_icon_name
,
class:
"hidden-sm hidden-md hidden-lg"
)
=
icon
(
@merge_request
.
state_icon_name
,
class:
"hidden-sm hidden-md hidden-lg"
)
%span
.hidden-xs
%span
.hidden-xs
=
@merge_request
.
state_human_name
=
@merge_request
.
state_human_name
...
...
spec/features/issues/move_spec.rb
View file @
4b15a8ed
...
@@ -72,7 +72,7 @@ feature 'issue move to another project' do
...
@@ -72,7 +72,7 @@ feature 'issue move to another project' do
def
edit_issue
(
issue
)
def
edit_issue
(
issue
)
visit
issue_path
(
issue
)
visit
issue_path
(
issue
)
page
.
within
(
'.issuable-actions'
)
{
fi
nd
(
'.issuable-e
dit'
).
click
}
page
.
within
(
'.issuable-actions'
)
{
fi
rst
(
:link
,
'E
dit'
).
click
}
end
end
def
issue_path
(
issue
)
def
issue_path
(
issue
)
...
...
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