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
f31d2aa4
Commit
f31d2aa4
authored
Jul 01, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
16b8a1ef
98049a3e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+1
-2
app/views/users/show.html.haml
app/views/users/show.html.haml
+1
-1
No files found.
app/views/projects/commits/show.html.haml
View file @
f31d2aa4
...
@@ -15,9 +15,8 @@
...
@@ -15,9 +15,8 @@
Create Merge Request
Create Merge Request
-
if
current_user
&&
current_user
.
private_token
-
if
current_user
&&
current_user
.
private_token
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
,
class:
'prepend-left-10 btn'
do
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"
Commits
Feed"
,
class:
'prepend-left-10 btn'
do
=
icon
(
"rss"
)
=
icon
(
"rss"
)
Commits Feed
%ul
.breadcrumb.repo-breadcrumb
%ul
.breadcrumb.repo-breadcrumb
...
...
app/views/users/show.html.haml
View file @
f31d2aa4
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
.row
.row
%section
.col-md-8
%section
.col-md-8
.header-with-avatar
.header-with-avatar
=
link_to
avatar_icon
(
@user
.
email
),
target:
'_blank'
do
=
link_to
avatar_icon
(
@user
.
email
,
400
),
target:
'_blank'
do
=
image_tag
avatar_icon
(
@user
.
email
,
90
),
class:
"avatar avatar-tile s90"
,
alt:
''
=
image_tag
avatar_icon
(
@user
.
email
,
90
),
class:
"avatar avatar-tile s90"
,
alt:
''
%h3
%h3
=
@user
.
name
=
@user
.
name
...
...
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