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
6572d96b
Commit
6572d96b
authored
12 years ago
by
vsizov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:gitlabhq/gitlabhq
parents
d6a0b8f4
7d750cbf
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
4 deletions
+23
-4
app/assets/stylesheets/commits.css.scss
app/assets/stylesheets/commits.css.scss
+2
-2
app/models/commit.rb
app/models/commit.rb
+10
-0
app/views/commits/_commits.html.haml
app/views/commits/_commits.html.haml
+10
-1
app/views/projects/empty.html.haml
app/views/projects/empty.html.haml
+1
-1
No files found.
app/assets/stylesheets/commits.css.scss
View file @
6572d96b
...
...
@@ -121,8 +121,8 @@ pre.commit_message {
/** COMMIT BLOCK **/
.commit-title
{
display
:
block
;}
.commit-title
{
margin-bottom
:
10px
}
.commit-author
{
color
:
#999
;
font-weight
:
normal
;
font-style
:
italic
;}
.commit-author
strong
{
font-weight
:
bold
;
font-style
:
normal
;}
.commit-author
,
.commit-committer
{
display
:
block
;
color
:
#999
;
font-weight
:
normal
;
font-style
:
italic
;}
.commit-author
strong
,
.commit-committer
strong
{
font-weight
:
bold
;
font-style
:
normal
;}
/** bordered list **/
ul
.bordered-list
{
...
...
This diff is collapsed.
Click to expand it.
app/models/commit.rb
View file @
6572d96b
...
...
@@ -5,10 +5,12 @@ class Commit
attr_accessor
:refs
delegate
:message
,
:authored_date
,
:committed_date
,
:parents
,
:sha
,
:date
,
:committer
,
:author
,
:message
,
:diffs
,
...
...
@@ -37,6 +39,14 @@ class Commit
author
.
name
end
def
committer_name
committer
.
name
end
def
committer_email
committer
.
email
end
def
prev_commit
parents
.
first
end
...
...
This diff is collapsed.
Click to expand it.
app/views/commits/_commits.html.haml
View file @
6572d96b
...
...
@@ -19,6 +19,15 @@
%strong
=
truncate
(
commit
.
safe_message
,
:length
=>
70
)
%span
.commit-author
Authored by
%strong
=
commit
.
author_name
=
time_ago_in_words
(
commit
.
authored_date
)
ago
-
if
commit
.
author_name
!=
commit
.
committer_name
or
commit
.
author_email
!=
commit
.
committer_email
or
commit
.
authored_date
!=
commit
.
committed_date
%span
.commit-committer
Committed by
%strong
=
commit
.
committer_name
=
time_ago_in_words
(
commit
.
committed_date
)
ago
This diff is collapsed.
Click to expand it.
app/views/projects/empty.html.haml
View file @
6572d96b
-
if
current_user
.
require_ssh_key?
%ul
.errors_holder
%li
You have no ssh keys added
yo t
our profile.
%li
You have no ssh keys added
to y
our profile.
%li
You wont be able to pull/push repository.
%li
Visit profile
→
keys and add public key of every machine you want to use for work with gitlabhq.
...
...
This diff is collapsed.
Click to expand it.
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