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
368deb59
Commit
368deb59
authored
Nov 15, 2011
by
Nihad Abbasov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clean up whitespace from project
parent
415eddaf
Changes
49
Show whitespace changes
Inline
Side-by-side
Showing
49 changed files
with
354 additions
and
411 deletions
+354
-411
app/assets/javascripts/application.js
app/assets/javascripts/application.js
+5
-5
app/assets/javascripts/commits.js
app/assets/javascripts/commits.js
+10
-12
app/assets/javascripts/note.js
app/assets/javascripts/note.js
+12
-15
app/assets/javascripts/projects.js
app/assets/javascripts/projects.js
+0
-1
app/assets/stylesheets/application.css
app/assets/stylesheets/application.css
+3
-3
app/assets/stylesheets/issues.css.scss
app/assets/stylesheets/issues.css.scss
+3
-4
app/assets/stylesheets/notes.css.scss
app/assets/stylesheets/notes.css.scss
+0
-1
app/assets/stylesheets/projects.css.scss
app/assets/stylesheets/projects.css.scss
+20
-22
app/assets/stylesheets/style.scss
app/assets/stylesheets/style.scss
+215
-244
app/assets/stylesheets/tags.css.css
app/assets/stylesheets/tags.css.css
+5
-7
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+2
-2
app/controllers/commits_controller.rb
app/controllers/commits_controller.rb
+0
-1
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+2
-2
app/controllers/tags_controller.rb
app/controllers/tags_controller.rb
+8
-8
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+2
-2
app/helpers/dashboard_helper.rb
app/helpers/dashboard_helper.rb
+3
-3
app/models/issue.rb
app/models/issue.rb
+2
-2
app/models/note.rb
app/models/note.rb
+2
-2
app/models/project.rb
app/models/project.rb
+3
-3
app/models/repository.rb
app/models/repository.rb
+1
-1
app/views/admin/projects/_form.html.haml
app/views/admin/projects/_form.html.haml
+2
-3
app/views/commits/index.html.haml
app/views/commits/index.html.haml
+1
-3
app/views/dashboard/index.html.haml
app/views/dashboard/index.html.haml
+2
-2
app/views/issues/_show.html.haml
app/views/issues/_show.html.haml
+1
-1
app/views/issues/index.html.haml
app/views/issues/index.html.haml
+0
-1
app/views/issues/show.html.haml
app/views/issues/show.html.haml
+2
-3
app/views/layouts/_head_panel.html.erb
app/views/layouts/_head_panel.html.erb
+1
-1
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+1
-1
app/views/notes/_form.html.haml
app/views/notes/_form.html.haml
+1
-1
app/views/notes/_load.js.haml
app/views/notes/_load.js.haml
+0
-1
app/views/notes/_show.html.haml
app/views/notes/_show.html.haml
+1
-1
app/views/projects/_feed.html.haml
app/views/projects/_feed.html.haml
+2
-2
app/views/projects/_form.html.haml
app/views/projects/_form.html.haml
+2
-2
app/views/projects/_list.html.haml
app/views/projects/_list.html.haml
+0
-1
app/views/projects/_refs.html.haml
app/views/projects/_refs.html.haml
+0
-1
app/views/projects/_tile.html.haml
app/views/projects/_tile.html.haml
+1
-1
app/views/projects/_tree.html.haml
app/views/projects/_tree.html.haml
+1
-2
app/views/projects/index.html.haml
app/views/projects/index.html.haml
+1
-1
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+7
-7
app/views/snippets/index.html.haml
app/views/snippets/index.html.haml
+1
-1
app/views/tags/index.html.haml
app/views/tags/index.html.haml
+2
-3
config/routes.rb
config/routes.rb
+0
-1
db/migrate/20111027152724_issue_conten_to_note.rb
db/migrate/20111027152724_issue_conten_to_note.rb
+4
-4
lib/assets/javascripts/branch-graph.js
lib/assets/javascripts/branch-graph.js
+4
-4
lib/graph_commit.rb
lib/graph_commit.rb
+10
-10
spec/models/project_spec.rb
spec/models/project_spec.rb
+5
-5
spec/requests/dashboard_spec.rb
spec/requests/dashboard_spec.rb
+3
-3
spec/requests/projects_spec.rb
spec/requests/projects_spec.rb
+1
-1
spec/requests/tags_spec.rb
spec/requests/tags_spec.rb
+0
-4
No files found.
app/assets/javascripts/application.js
View file @
368deb59
app/assets/javascripts/commits.js
View file @
368deb59
...
...
@@ -8,8 +8,6 @@ $(document).ready(function(){
});
});
var
CommitsList
=
{
ref
:
null
,
...
...
app/assets/javascripts/note.js
View file @
368deb59
...
...
@@ -39,7 +39,6 @@ replace:
this
.
initLoadMore
();
},
prepend
:
function
(
id
,
html
)
{
if
(
id
!=
this
.
last_id
)
{
...
...
@@ -68,8 +67,6 @@ refresh:
dataType
:
"
script
"
});
},
initRefresh
:
function
()
{
// init timer
...
...
app/assets/javascripts/projects.js
View file @
368deb59
...
...
@@ -48,7 +48,6 @@ function taggifyForm(){
source
:
'
/tags.json
'
});
$
(
'
form
'
).
submit
(
function
()
{
var
tag_field
=
$
(
'
#tag_field
'
)
tag_field
.
val
(
tag_field
.
tagify
(
'
serialize
'
)
);
...
...
app/assets/stylesheets/application.css
View file @
368deb59
app/assets/stylesheets/issues.css.scss
View file @
368deb59
...
...
@@ -45,4 +45,3 @@
}
.issue
:hover
.action-links
{
display
:block
;
}
app/assets/stylesheets/notes.css.scss
View file @
368deb59
...
...
@@ -14,7 +14,6 @@
}
}
/* Note textare */
#note_note
{
height
:
100px
;
...
...
app/assets/stylesheets/projects.css.scss
View file @
368deb59
...
...
@@ -120,7 +120,6 @@ table.highlighttable pre{
font-size
:
12px
!
important
;
}
table
.highlighttable
.linenodiv
pre
{
text-align
:
right
;
padding-right
:
4px
;
...
...
@@ -235,7 +234,6 @@ input.ssh_project_url {
}
}
#user_projects_limit
{
width
:
60px
;
}
...
...
app/assets/stylesheets/style.scss
View file @
368deb59
...
...
@@ -60,7 +60,6 @@ input:invalid, textarea:invalid { background-color: #f0dddd; }
table
{
border-collapse
:
collapse
;
border-spacing
:
0
;
}
td
{
vertical-align
:
top
;
}
/* ==|== primary styles =====================================================
Author: Ricardo Rauch
========================================================================== */
...
...
@@ -127,7 +126,6 @@ table thead .image{width:100px}
table
tr
:hover
,
.listed_items
tr
.odd
:hover
{
background-color
:
#FFFFCF
}
/* eo Tables */
/* Buttons */
.grey-button
{
border-radius
:
5px
;
...
...
@@ -216,7 +214,6 @@ input.button{margin-bottom: 1.5em}
font-size
:
12px
;
}
.ui-box
.data
{
padding
:
.5em
1em
}
.ui-box
.buttons
{
background-color
:
#f7f8f9
;
padding
:
1em
;
...
...
@@ -282,7 +279,6 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
.login-box
a
.forgot
{
float
:
right
;
padding-top
:
6px
}
/* Icons */
.directory
,
.file
{
display
:
inline-block
;
...
...
@@ -324,8 +320,6 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
#container
{
background-color
:
white
;
overflow
:
hidden
;
}
body
.collapsed
#container
{
margin
:
auto
;
width
:
980px
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,.
22
);
border-top
:
0
;
box-shadow
:
0
0
0px
4px
rgba
(
0
,
0
,
0
,.
04
)}
/* Header */
header
{
background
:
#474D57
url('bg-header.png')
repeat-x
bottom
;
z-index
:
10000
;
height
:
44px
;
padding
:
10px
2%
6px
2%
;
position
:
relative
}
header
a
{
color
:
white
;
text-shadow
:
0
-1px
0
black
}
...
...
@@ -345,8 +339,6 @@ header h1.logo a{
text-indent
:
-1000em
;
}
header
nav
{
border-radius
:
4px
;
box-shadow
:
0
1px
2px
black
;
width
:
294px
;
margin
:
auto
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#595d63
)
,
to
(
#31363e
));
background-image
:
-webkit-linear-gradient
(
#595d63
6
.6%
,
#31363e
);
...
...
@@ -369,7 +361,6 @@ header nav a:active{
box-shadow
:
0
1px
4px
rgba
(
0
,
0
,
0
,.
8
)
inset
;
}
header
nav
a
.dashboard
{
-webkit-border-top-left-radius
:
4px
;
-webkit-border-bottom-left-radius
:
4px
;
...
...
@@ -388,7 +379,6 @@ header nav a.admin{
border-bottom-right-radius
:
4px
;
}
header
.search
{
display
:
inline-block
;
float
:
right
;
margin-right
:
46px
}
header
nav
a
span
{
width
:
20px
;
height
:
20px
;
display
:
inline-block
;
background
:
red
;
position
:
absolute
;
left
:
8px
;
top
:
6px
;}
...
...
@@ -397,7 +387,6 @@ header nav a.dashboard span{background: url('images.png') no-repeat -161px 0;}
header
nav
a
.admin
span
{
background
:
url('images.png')
no-repeat
-184px
0
;}
header
nav
a
.project
span
{
background
:
url('images.png')
no-repeat
-209px
-1px
;
top
:
7px
}
header
.login-top
{
float
:
right
;
width
:
180px
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
62
,
color-stop
(
0
.032
,
#464c56
)
,
to
(
#363c45
));
background-image
:
-webkit-linear-gradient
(
#464c56
3
.2%
,
#363c45
);
...
...
@@ -419,7 +408,6 @@ header{margin-bottom: 0; clear: both; }
.page-title
a
.grey-button
{
float
:
right
;}
.right
{
float
:
right
;}
/* Account box */
header
.account-box
{
position
:
absolute
;
right
:
0
;
top
:
8px
;
z-index
:
10000
;
width
:
128px
;
font-size
:
11px
;
float
:
right
;
display
:
block
;
cursor
:
pointer
;}
header
.account-box
img
{
border-radius
:
4px
;
right
:
20px
;
position
:
absolute
;
width
:
38px
;
height
:
38px
;
display
:
block
;
box-shadow
:
0
1px
2px
black
}
...
...
@@ -462,7 +450,6 @@ header .account-links:before {
z-index
:
10
;
}
/* Inspired by http://maxvoltar.com/temp/nowplaying/ */
header
.account-links
{
background
:
white
;
display
:
none
;
z-index
:
100000
;
border-radius
:
5px
;
width
:
100px
;
position
:
absolute
;
right
:
20px
;
top
:
46px
;
margin-top
:
0
;
float
:
right
;
box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,.
2
);
}
header
.account-links
a
{
color
:
#666
;
padding
:
6px
10px
;
display
:
block
;
text-shadow
:
none
;
border-bottom
:
1px
solid
#eee
}
...
...
@@ -509,13 +496,10 @@ input.search-input:focus{ background-color: white; width: 216px;}
input
.
search-input
:
:-
webkit-input-placeholder
{
color
:
#666
}
/* eo Header */
h2
.icon
{
position
:
relative
;
padding-left
:
40px
;
float
:
left
;
}
/*h2 a{font-weight: normal;}*/
h2
.icon
span
{
background
:
#E3E5EA
url('images.png')
;
height
:
32px
;
width
:
32px
;
left
:
0
;
top
:
-5px
;
border-radius
:
4px
;
display
:
inline-block
;
position
:
absolute
}
/* Dashboard Page */
html
,
body
{
height
:
100%
;
}
...
...
@@ -545,7 +529,6 @@ body.dashboard-page .news-feed .project-updates a.project-update span.update-aut
body
.dashboard-page
.news-feed
.project-updates
a
.project-update
span
.update-author
strong
{
font-weight
:
bold
;
font-style
:
normal
;}
/* eo Dashboard Page */
.grey-button.right
{
margin-top
:
20px
}
/* Project Page */
...
...
@@ -561,8 +544,6 @@ body.project-page h2.icon .project-name i.arrow{float: right;
height
:
5px
;
}
body
.project-page
h2
.icon
span
{
background-position
:
-78px
-68px
;
}
body
.project-page
.project-container
{
position
:
relative
;
float
:
left
;
width
:
100%
;
height
:
100%
;
}
body
.project-page
.page-title
{
margin-bottom
:
0
}
...
...
@@ -575,7 +556,6 @@ body.projects-page input.text.git-url {margin:10px 0 0 }
.projects_selector
:hover
>
.project-box
{
-moz-box-shadow
:
0px
0px
10px
rgba
(
0
,
0
,
0
,
.1
);
-webkit-box-shadow
:
0px
0px
10px
rgba
(
0
,
0
,
0
,
.1
);
box-shadow
:
0px
0px
10px
rgba
(
0
,
0
,
0
,
.1
);
}
body
.project-page
.project-sidebar
aside
{
width
:
219px
}
body
.project-page
.project-sidebar
aside
a
{
display
:
block
;
position
:
relative
;
background
:
white
;
padding
:
15px
10px
;
border-bottom
:
1px
solid
#eee
}
body
.project-page
.project-sidebar
aside
a
:first-child
{
...
...
@@ -623,7 +603,6 @@ body.project-page.commits-page .commit-info data.commit-button{
padding-right
:
20px
;
}
body
.project-page.commits-page
.commit-button
i
{
background
:
url('images.png')
no-repeat
-138px
-27px
;
width
:
6px
;
...
...
@@ -648,9 +627,6 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{
/* eo Project Page */
/* Projects Page */
body
.projects-page
h2
.icon
span
{
background-position
:
-31px
-70px
;}
body
.projects-page
.project-box.ui-box
.data
.repository
{
margin-bottom
:
20px
}
...
...
@@ -659,7 +635,6 @@ body.projects-page .project-box{width: 100%; margin-bottom: 3em}
body
.projects-page
.browse-code
{
margin-right
:
10px
}
/* eo Projects Page */
/* ==|== non-semantic helper classes ======================================== */
.ir
{
display
:
block
;
border
:
0
;
text-indent
:
-999em
;
overflow
:
hidden
;
background-color
:
transparent
;
background-repeat
:
no-repeat
;
text-align
:
left
;
direction
:
ltr
;
}
.ir
br
{
display
:
none
;
}
...
...
@@ -671,20 +646,16 @@ body.projects-page .browse-code{margin-right: 10px}
.clearfix
:after
{
clear
:
both
;
}
.clearfix
{
zoom
:
1
;
}
/* ==|== media queries ====================================================== */
@media
only
screen
and
(
min-width
:
480px
)
{
}
@media
only
screen
and
(
min-width
:
768px
)
{
}
/* ==|== print styles ======================================================= */
@media
print
{
...
...
app/assets/stylesheets/tags.css.css
View file @
368deb59
...
...
@@ -15,7 +15,6 @@
font-size
:
14px
;
}
.small-tags
a
{
font-size
:
9px
;
...
...
@@ -29,7 +28,6 @@
font-weight
:
bold
;
}
.medium-tags
a
{
font-size
:
12px
;
...
...
app/controllers/application_controller.rb
View file @
368deb59
app/controllers/commits_controller.rb
View file @
368deb59
...
...
@@ -10,7 +10,6 @@ class CommitsController < ApplicationController
before_filter
:require_non_empty_project
before_filter
:load_refs
,
:only
=>
:index
# load @branch, @tag & @ref
def
index
@repo
=
project
.
repo
limit
,
offset
=
(
params
[
:limit
]
||
20
),
(
params
[
:offset
]
||
0
)
...
...
app/controllers/projects_controller.rb
View file @
368deb59
app/controllers/tags_controller.rb
View file @
368deb59
app/helpers/application_helper.rb
View file @
368deb59
app/helpers/dashboard_helper.rb
View file @
368deb59
app/models/issue.rb
View file @
368deb59
app/models/note.rb
View file @
368deb59
app/models/project.rb
View file @
368deb59
app/models/repository.rb
View file @
368deb59
app/views/admin/projects/_form.html.haml
View file @
368deb59
...
...
@@ -19,7 +19,6 @@
%br
=
f
.
text_field
:path
.form-row
=
f
.
label
:tag_list
%br
...
...
app/views/commits/index.html.haml
View file @
368deb59
...
...
@@ -20,8 +20,6 @@
.loading
{
:style
=>
"display:none;"
}
%center
=
image_tag
"ajax-loader.gif"
:javascript
$
(
function
(){
CommitsList
.
init
(
"
#{
@ref
}
"
,
20
);
...
...
app/views/dashboard/index.html.haml
View file @
368deb59
app/views/issues/_show.html.haml
View file @
368deb59
app/views/issues/index.html.haml
View file @
368deb59
...
...
@@ -31,7 +31,6 @@
var
href
=
$
(
'
.issue_search
'
).
parent
().
attr
(
'
action
'
);
var
last_terms
=
''
;
var
setIssueFilter
=
function
(
form
,
value
){
$
.
cookie
(
'
issue_filter
'
,
value
,
{
expires
:
140
});
form
.
submit
();
...
...
app/views/issues/show.html.haml
View file @
368deb59
...
...
@@ -42,7 +42,6 @@
-
else
=
check_box_tag
"closed"
,
1
,
@issue
.
closed
,
:disabled
=>
true
-
if
can?
(
current_user
,
:write_issue
,
@issue
)
.clear
%br
...
...
app/views/layouts/_head_panel.html.erb
View file @
368deb59
app/views/layouts/profile.html.haml
View file @
368deb59
app/views/notes/_form.html.haml
View file @
368deb59
app/views/notes/_load.js.haml
View file @
368deb59
...
...
@@ -4,7 +4,6 @@
:plain
NoteList.replace(
#{
@notes
.
last
.
id
}
,
#{
@notes
.
first
.
id
}
, "
#{
escape_javascript
(
render
(
:partial
=>
'notes/notes_list'
))
}
");
-
elsif
params
[
:last_id
]
:plain
NoteList.prepend(
#{
@notes
.
first
.
id
}
, "
#{
escape_javascript
(
render
(
:partial
=>
'notes/notes_list'
))
}
");
...
...
app/views/notes/_show.html.haml
View file @
368deb59
app/views/projects/_feed.html.haml
View file @
368deb59
app/views/projects/_form.html.haml
View file @
368deb59
app/views/projects/_list.html.haml
View file @
368deb59
...
...
@@ -14,7 +14,6 @@
=
project
.
name
.small-tags
=
tag_list
project
%td
=
truncate
project
.
url_to_repo
%td
=
project
.
code
%td
=
check_box_tag
"read"
,
1
,
project
.
readers
.
include?
(
current_user
),
:disabled
=>
:disabled
...
...
app/views/projects/_refs.html.haml
View file @
368deb59
=
form_tag
destination
,
:method
=>
:get
,
:class
=>
"project-refs-form"
do
=
select_tag
"ref"
,
grouped_options_refs
,
:onchange
=>
"this.form.submit();"
,
:class
=>
"project-refs-select"
:javascript
$
(
function
(){
$
(
'
.project-refs-select
'
).
chosen
();
...
...
app/views/projects/_tile.html.haml
View file @
368deb59
app/views/projects/_tree.html.haml
View file @
368deb59
-#%a.right.button{:href => "#"} Download
-#-if can? current_user, :admin_project, @project
%a.right.button.blue{:href => "#"} EDIT
...
...
app/views/projects/index.html.haml
View file @
368deb59
app/views/projects/new.html.haml
View file @
368deb59
app/views/snippets/index.html.haml
View file @
368deb59
app/views/tags/index.html.haml
View file @
368deb59
...
...
@@ -4,7 +4,6 @@
%h2
Tags
.tags-list
-
@tags
.
all
.
each
do
|
tag
|
=
link_to
"
#{
tag
.
name
}
(
#{
tag
.
count
}
)"
,
tag_path
(
name
)
...
...
config/routes.rb
View file @
368deb59
...
...
@@ -3,7 +3,6 @@ Gitlab::Application.routes.draw do
get
'tags'
=>
'tags#index'
get
'tags/:tag'
=>
'projects#index'
namespace
:admin
do
resources
:users
resources
:projects
...
...
db/migrate/20111027152724_issue_conten_to_note.rb
View file @
368deb59
lib/assets/javascripts/branch-graph.js
View file @
368deb59
lib/graph_commit.rb
View file @
368deb59
spec/models/project_spec.rb
View file @
368deb59
spec/requests/dashboard_spec.rb
View file @
368deb59
spec/requests/projects_spec.rb
View file @
368deb59
spec/requests/tags_spec.rb
View file @
368deb59
...
...
@@ -10,7 +10,6 @@ describe "Tags" do
# end
# end
describe
"GET '/tags.json'"
do
before
do
@project
=
Factory
:project
...
...
@@ -20,12 +19,9 @@ describe "Tags" do
visit
'/tags.json'
end
it
"should contains tags"
do
page
.
should
have_content
(
'demo1'
)
end
end
end
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