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
80812a5d
Commit
80812a5d
authored
Feb 04, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Edited time ago location change.
Change edited icon to word. Change edited text color to gray cc/ @creamzy
parent
7f5a87f1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
62 additions
and
50 deletions
+62
-50
app/assets/javascripts/application.js.coffee
app/assets/javascripts/application.js.coffee
+47
-40
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+6
-0
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+4
-5
app/views/projects/merge_requests/show/_mr_box.html.haml
app/views/projects/merge_requests/show/_mr_box.html.haml
+5
-0
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+0
-5
No files found.
app/assets/javascripts/application.js.coffee
View file @
80812a5d
...
...
@@ -211,18 +211,23 @@ $ ->
$this
.
attr
'value'
,
$this
.
val
()
return
$
(
document
).
on
'keyup'
,
'input[type="search"]'
,
(
e
)
->
$
(
document
)
.
off
'keyup'
,
'input[type="search"]'
.
on
'keyup'
,
'input[type="search"]'
,
(
e
)
->
$this
=
$
(
this
)
$this
.
attr
'value'
,
$this
.
val
()
$
(
document
).
on
'breakpoint:change'
,
(
e
,
breakpoint
)
->
$
(
document
)
.
off
'breakpoint:change'
.
on
'breakpoint:change'
,
(
e
,
breakpoint
)
->
if
breakpoint
is
'sm'
or
breakpoint
is
'xs'
$gutterIcon
=
$
(
'.gutter-toggle'
).
find
(
'i'
)
if
$gutterIcon
.
hasClass
(
'fa-angle-double-right'
)
$gutterIcon
.
closest
(
'a'
).
trigger
(
'click'
)
$
(
document
).
on
'click'
,
'aside .gutter-toggle'
,
(
e
)
->
$
(
document
)
.
off
'click'
,
'aside .gutter-toggle'
.
on
'click'
,
'aside .gutter-toggle'
,
(
e
)
->
e
.
preventDefault
()
$this
=
$
(
this
)
$thisIcon
=
$this
.
find
'i'
...
...
@@ -282,7 +287,9 @@ $ ->
if
bootstrapBreakpoint
is
"xs"
or
"sm"
$
(
document
).
trigger
(
'breakpoint:change'
,
[
bootstrapBreakpoint
])
$
(
window
).
on
"resize"
,
(
e
)
->
$
(
window
)
.
off
"resize"
.
on
"resize"
,
(
e
)
->
fitSidebarForSize
()
setBootstrapBreakpoints
()
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
80812a5d
...
...
@@ -233,3 +233,9 @@
}
}
}
.detail-page-description
{
small
{
color
:
$gray-darkest
;
}
}
\ No newline at end of file
app/views/projects/issues/show.html.haml
View file @
80812a5d
...
...
@@ -15,11 +15,6 @@
opened by
#{
link_to_member
(
@project
,
@issue
.
author
,
size:
24
)
}
·
=
time_ago_with_tooltip
(
@issue
.
created_at
,
placement:
'bottom'
,
html_class:
'issue_created_ago'
)
-
if
@issue
.
updated_at
!=
@issue
.
created_at
%span
·
=
icon
(
'edit'
,
title:
'edited'
)
=
time_ago_with_tooltip
(
@issue
.
updated_at
,
placement:
'bottom'
,
html_class:
'issue_edited_ago'
)
.pull-right
-
if
can?
(
current_user
,
:create_issue
,
@project
)
...
...
@@ -46,6 +41,10 @@
=
markdown
(
@issue
.
description
,
cache_key:
[
@issue
,
"description"
])
%textarea
.hidden.js-task-list-field
=
@issue
.
description
-
if
@issue
.
updated_at
!=
@issue
.
created_at
%small
Edited
=
time_ago_with_tooltip
(
@issue
.
updated_at
,
placement:
'bottom'
,
html_class:
'issue_edited_ago'
)
.merge-requests
=
render
'merge_requests'
...
...
app/views/projects/merge_requests/show/_mr_box.html.haml
View file @
80812a5d
...
...
@@ -10,3 +10,8 @@
=
markdown
(
@merge_request
.
description
,
cache_key:
[
@merge_request
,
"description"
])
%textarea
.hidden.js-task-list-field
=
@merge_request
.
description
-
if
@merge_request
.
updated_at
!=
@merge_request
.
created_at
%small
Edited
=
time_ago_with_tooltip
(
@merge_request
.
updated_at
,
placement:
'bottom'
)
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
80812a5d
...
...
@@ -8,11 +8,6 @@
opened by
#{
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
)
}
·
=
time_ago_with_tooltip
(
@merge_request
.
created_at
)
-
if
@merge_request
.
updated_at
!=
@merge_request
.
created_at
%span
·
=
icon
(
'edit'
,
title:
'edited'
)
=
time_ago_with_tooltip
(
@merge_request
.
updated_at
,
placement:
'bottom'
)
.issue-btn-group.pull-right
-
if
can?
(
current_user
,
:update_merge_request
,
@merge_request
)
...
...
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