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
1
Merge Requests
1
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-ce
Commits
a635e1a3
Commit
a635e1a3
authored
Sep 15, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix last push widget
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
558084f4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
23 deletions
+29
-23
app/assets/stylesheets/generic/blocks.scss
app/assets/stylesheets/generic/blocks.scss
+5
-0
app/views/events/_event_last_push.html.haml
app/views/events/_event_last_push.html.haml
+12
-12
app/views/projects/_last_push.html.haml
app/views/projects/_last_push.html.haml
+12
-11
No files found.
app/assets/stylesheets/generic/blocks.scss
View file @
a635e1a3
...
@@ -36,6 +36,11 @@
...
@@ -36,6 +36,11 @@
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
&
.clear-block
{
margin-bottom
:
$gl-padding
-
1px
;
padding-bottom
:
$gl-padding
;
}
&
.second-block
{
&
.second-block
{
margin-top
:
-1px
;
margin-top
:
-1px
;
margin-bottom
:
0
;
margin-bottom
:
0
;
...
...
app/views/events/_event_last_push.html.haml
View file @
a635e1a3
-
if
show_last_push_widget?
(
event
)
-
if
show_last_push_widget?
(
event
)
.event-last-push
.gray-content-block.clear-block
.event-last-push-text
.event-last-push
%span
You pushed to
.event-last-push-text
=
link_to
namespace_project_commits_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
ref_name
)
do
%span
You pushed to
%strong
=
event
.
ref_name
=
link_to
namespace_project_commits_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
ref_name
)
do
%span
at
%strong
=
event
.
ref_name
%strong
=
link_to_project
event
.
project
%span
at
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
%strong
=
link_to_project
event
.
project
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
.pull-right
.pull-right
=
link_to
new_mr_path_from_push_event
(
event
),
title:
"New Merge Request"
,
class:
"btn btn-info btn-sm"
do
=
link_to
new_mr_path_from_push_event
(
event
),
title:
"New Merge Request"
,
class:
"btn btn-info btn-sm"
do
Create Merge Request
Create Merge Request
%hr
app/views/projects/_last_push.html.haml
View file @
a635e1a3
-
if
event
=
last_push_event
-
if
event
=
last_push_event
-
if
show_last_push_widget?
(
event
)
-
if
show_last_push_widget?
(
event
)
.hidden-xs.center
.slead
%span
You pushed to
=
link_to
namespace_project_commits_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
ref_name
)
do
%strong
=
event
.
ref_name
branch
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
%div
.gray-content-block.top-block.clear-block.hidden-xs
=
link_to
new_mr_path_from_push_event
(
event
),
title:
"New Merge Request"
,
class:
"btn btn-info btn-sm"
do
.event-last-push
Create Merge Request
.event-last-push-text
%hr
%span
You pushed to
=
link_to
namespace_project_commits_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
ref_name
)
do
%strong
=
event
.
ref_name
branch
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
.pull-right
=
link_to
new_mr_path_from_push_event
(
event
),
title:
"New Merge Request"
,
class:
"btn btn-info btn-sm"
do
Create 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