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
a0635448
Commit
a0635448
authored
Apr 30, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Soullivaneuh-show-aside'
parents
26c62cb0
93359c7e
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
22 additions
and
19 deletions
+22
-19
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+2
-2
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+2
-2
app/views/dashboard/projects/starred.html.haml
app/views/dashboard/projects/starred.html.haml
+2
-3
app/views/dashboard/show.html.haml
app/views/dashboard/show.html.haml
+2
-2
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+3
-2
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_discussion.html.haml
+3
-2
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_discussion.html.haml
+2
-2
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+2
-2
app/views/shared/_show_aside.html.haml
app/views/shared/_show_aside.html.haml
+2
-0
app/views/users/show.html.haml
app/views/users/show.html.haml
+2
-2
No files found.
app/views/admin/projects/index.html.haml
View file @
a0635448
=
render
'shared/show_aside'
.row
=
link_to
'#aside'
,
class:
'show-aside'
do
%i
.fa.fa-angle-left
%aside
.col-md-3
.admin-filter
=
form_tag
admin_namespaces_projects_path
,
method: :get
,
class:
''
do
...
...
app/views/admin/users/index.html.haml
View file @
a0635448
=
render
'shared/show_aside'
.row
=
link_to
'#aside'
,
class:
'show-aside'
do
%i
.fa.fa-angle-left
%aside
.col-md-3
.admin-filter
%ul
.nav.nav-pills.nav-stacked
...
...
app/views/dashboard/projects/starred.html.haml
View file @
a0635448
-
if
@projects
.
any?
=
render
'shared/show_aside'
.dashboard.row
%section
.activities.col-md-8
=
render
'dashboard/activities'
...
...
@@ -15,9 +17,6 @@
=
render
'shared/projects_list'
,
projects:
@projects
,
projects_limit:
20
,
stars:
true
,
avatar:
false
=
link_to
'#aside'
,
class:
'show-aside'
do
%i
.fa.fa-angle-left
-
else
%h3
You don't have starred projects yet
%p
.slead
Visit project page and press on star icon and it will appear on this page.
app/views/dashboard/show.html.haml
View file @
a0635448
...
...
@@ -3,13 +3,13 @@
=
auto_discovery_link_tag
(
:atom
,
dashboard_url
(
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"All activity"
)
-
if
@projects
.
any?
=
render
'shared/show_aside'
.dashboard.row
%section
.activities.col-md-8
=
render
'activities'
%aside
.col-md-4
=
render
'sidebar'
=
link_to
'#aside'
,
class:
'show-aside'
do
%i
.fa.fa-angle-left
-
else
=
render
"zero_authorized_projects"
app/views/groups/show.html.haml
View file @
a0635448
...
...
@@ -13,6 +13,9 @@
.description
=
escaped_autolink
(
@group
.
description
)
%hr
=
render
'shared/show_aside'
.row
%section
.activities.col-md-8
.hidden-xs
...
...
@@ -33,5 +36,3 @@
=
spinner
%aside
.side.col-md-4
=
render
"projects"
,
projects:
@projects
=
link_to
'#aside'
,
class:
'show-aside'
do
%i
.fa.fa-angle-left
app/views/projects/issues/_discussion.html.haml
View file @
a0635448
...
...
@@ -4,6 +4,9 @@
=
link_to
'Reopen Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
status_only:
true
),
method: :put
,
class:
"btn btn-grouped btn-reopen js-note-target-reopen"
,
title:
'Reopen Issue'
-
else
=
link_to
'Close Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
status_only:
true
),
method: :put
,
class:
"btn btn-grouped btn-close js-note-target-close"
,
title:
"Close Issue"
=
render
'shared/show_aside'
.row
%section
.col-md-9
.votes-holder.pull-right
...
...
@@ -29,5 +32,3 @@
-
@issue
.
labels
.
each
do
|
label
|
=
link_to
namespace_project_issues_path
(
@project
.
namespace
,
@project
,
label_name:
label
.
name
)
do
=
render_colored_label
(
label
)
=
link_to
'#aside'
,
class:
'show-aside'
do
%i
.fa.fa-angle-left
app/views/projects/merge_requests/_discussion.html.haml
View file @
a0635448
...
...
@@ -5,6 +5,8 @@
-
if
@merge_request
.
closed?
=
link_to
'Reopen'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :reopen
}),
method: :put
,
class:
"btn btn-grouped btn-reopen reopen-mr-link js-note-target-reopen"
,
title:
"Reopen merge request"
=
render
'shared/show_aside'
.row
%section
.col-md-9
.votes-holder.pull-right
...
...
@@ -27,5 +29,3 @@
-
@merge_request
.
labels
.
each
do
|
label
|
=
link_to
namespace_project_merge_requests_path
(
@project
.
namespace
,
@project
,
label_name:
label
.
name
)
do
=
render_colored_label
(
label
)
=
link_to
'#aside'
,
class:
'show-aside'
do
%i
.fa.fa-angle-left
app/views/projects/show.html.haml
View file @
a0635448
...
...
@@ -37,9 +37,9 @@
.tab-content
.tab-pane.active
#tab-activity
=
render
'shared/show_aside'
.row
=
link_to
'#aside'
,
class:
'show-aside'
do
%i
.fa.fa-angle-left
%section
.col-md-9
.hidden-xs
=
render
"events/event_last_push"
,
event:
@last_push
...
...
app/views/shared/_show_aside.html.haml
0 → 100644
View file @
a0635448
=
link_to
'#aside'
,
class:
'show-aside'
do
%i
.fa.fa-angle-left
app/views/users/show.html.haml
View file @
a0635448
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
user_url
(
@user
,
format: :atom
),
title:
"
#{
@user
.
name
}
activity"
)
=
render
'shared/show_aside'
.row
=
link_to
'#aside'
,
class:
'show-aside'
do
%i
.fa.fa-angle-left
%section
.col-md-8
.header-with-avatar
=
image_tag
avatar_icon
(
@user
.
email
,
90
),
class:
"avatar avatar-tile s90"
,
alt:
''
...
...
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