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
d4e2805e
Commit
d4e2805e
authored
Dec 21, 2017
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Last push event widget width for fixed layout
parent
539996f7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
14 deletions
+21
-14
app/views/projects/_last_push.html.haml
app/views/projects/_last_push.html.haml
+14
-13
app/views/projects/tree/show.html.haml
app/views/projects/tree/show.html.haml
+2
-1
changelogs/unreleased/fix-last-push-event-widget-layout.yml
changelogs/unreleased/fix-last-push-event-widget-layout.yml
+5
-0
No files found.
app/views/projects/_last_push.html.haml
View file @
d4e2805e
-
event
=
last_push_event
-
event
=
last_push_event
-
if
event
&&
show_last_push_widget?
(
event
)
-
if
event
&&
show_last_push_widget?
(
event
)
.row-content-block.top-block.hidden-xs.white
%div
{
class:
container_class
}
.event-last-push
.row-content-block.top-block.hidden-xs.white
.event-last-push-text
.event-last-push
%span
=
s_
(
"LastPushEvent|You pushed to"
)
.event-last-push-text
%strong
%span
=
s_
(
"LastPushEvent|You pushed to"
)
=
link_to
event
.
ref_name
,
project_commits_path
(
event
.
project
,
event
.
ref_name
),
class:
'ref-name'
%strong
=
link_to
event
.
ref_name
,
project_commits_path
(
event
.
project
,
event
.
ref_name
),
class:
'ref-name'
-
if
event
.
project
!=
@project
-
if
event
.
project
!=
@project
%span
=
s_
(
"LastPushEvent|at"
)
%span
=
s_
(
"LastPushEvent|at"
)
%strong
=
link_to_project
event
.
project
%strong
=
link_to_project
event
.
project
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
#{
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'
)
}
app/views/projects/tree/show.html.haml
View file @
d4e2805e
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
project_commits_url
(
@project
,
@ref
,
rss_url_options
),
title:
"
#{
@project
.
name
}
:
#{
@ref
}
commits"
)
=
auto_discovery_link_tag
(
:atom
,
project_commits_url
(
@project
,
@ref
,
rss_url_options
),
title:
"
#{
@project
.
name
}
:
#{
@ref
}
commits"
)
=
render
'projects/last_push'
%div
{
class:
[(
container_class
),
(
"limit-container-width"
unless
fluid_layout
)]
}
%div
{
class:
[(
container_class
),
(
"limit-container-width"
unless
fluid_layout
)]
}
=
render
'projects/last_push'
=
render
'projects/files'
,
commit:
@last_commit
,
project:
@project
,
ref:
@ref
,
content_url:
project_tree_path
(
@project
,
@id
)
=
render
'projects/files'
,
commit:
@last_commit
,
project:
@project
,
ref:
@ref
,
content_url:
project_tree_path
(
@project
,
@id
)
changelogs/unreleased/fix-last-push-event-widget-layout.yml
0 → 100644
View file @
d4e2805e
---
title
:
Last push event widget width for fixed layout
merge_request
:
15862
author
:
George Tsiolis
type
:
fixed
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