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
Kazuhiko Shiozaki
gitlab-ce
Commits
a0db028c
Commit
a0db028c
authored
Jun 04, 2012
by
Zevs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'avakarev/remove-trailing-whitespaces-in-templates'
parents
f12ac71b
3bd06d55
Changes
66
Show whitespace changes
Inline
Side-by-side
Showing
66 changed files
with
232 additions
and
267 deletions
+232
-267
app/views/admin/dashboard/index.html.haml
app/views/admin/dashboard/index.html.haml
+3
-3
app/views/admin/projects/_form.html.haml
app/views/admin/projects/_form.html.haml
+3
-3
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+1
-1
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+6
-8
app/views/admin/team_members/_form.html.haml
app/views/admin/team_members/_form.html.haml
+1
-2
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+4
-4
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+5
-8
app/views/commits/_diffs.html.haml
app/views/commits/_diffs.html.haml
+5
-8
app/views/commits/_head.html.haml
app/views/commits/_head.html.haml
+5
-6
app/views/commits/_text_file.html.haml
app/views/commits/_text_file.html.haml
+3
-3
app/views/commits/compare.html.haml
app/views/commits/compare.html.haml
+6
-7
app/views/commits/index.html.haml
app/views/commits/index.html.haml
+1
-1
app/views/commits/show.html.haml
app/views/commits/show.html.haml
+2
-2
app/views/deploy_keys/index.html.haml
app/views/deploy_keys/index.html.haml
+3
-3
app/views/errors/encoding.html.haml
app/views/errors/encoding.html.haml
+1
-1
app/views/errors/git_not_found.html.haml
app/views/errors/git_not_found.html.haml
+3
-3
app/views/events/_event.html.haml
app/views/events/_event.html.haml
+2
-2
app/views/events/_event_issue.html.haml
app/views/events/_event_issue.html.haml
+3
-3
app/views/events/_event_merge_request.html.haml
app/views/events/_event_merge_request.html.haml
+3
-3
app/views/events/_event_push.html.haml
app/views/events/_event_push.html.haml
+5
-6
app/views/help/index.html.haml
app/views/help/index.html.haml
+2
-2
app/views/help/web_hooks.html.haml
app/views/help/web_hooks.html.haml
+1
-1
app/views/help/workflow.html.haml
app/views/help/workflow.html.haml
+7
-7
app/views/hooks/index.html.haml
app/views/hooks/index.html.haml
+2
-3
app/views/issues/_form.html.haml
app/views/issues/_form.html.haml
+4
-6
app/views/issues/_head.html.haml
app/views/issues/_head.html.haml
+5
-5
app/views/issues/_show.html.haml
app/views/issues/_show.html.haml
+1
-7
app/views/issues/edit.html.haml
app/views/issues/edit.html.haml
+2
-2
app/views/issues/index.html.haml
app/views/issues/index.html.haml
+5
-5
app/views/issues/new.html.haml
app/views/issues/new.html.haml
+2
-2
app/views/issues/show.html.haml
app/views/issues/show.html.haml
+8
-8
app/views/keys/index.html.haml
app/views/keys/index.html.haml
+2
-2
app/views/keys/show.html.haml
app/views/keys/show.html.haml
+3
-5
app/views/layouts/_app_menu.html.haml
app/views/layouts/_app_menu.html.haml
+2
-2
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+4
-5
app/views/layouts/_project_menu.html.haml
app/views/layouts/_project_menu.html.haml
+3
-3
app/views/merge_requests/_commits.html.haml
app/views/merge_requests/_commits.html.haml
+11
-11
app/views/merge_requests/_diffs.html.haml
app/views/merge_requests/_diffs.html.haml
+1
-1
app/views/merge_requests/_form.html.haml
app/views/merge_requests/_form.html.haml
+5
-5
app/views/merge_requests/_head.html.haml
app/views/merge_requests/_head.html.haml
+3
-3
app/views/merge_requests/index.html.haml
app/views/merge_requests/index.html.haml
+5
-5
app/views/merge_requests/show.html.haml
app/views/merge_requests/show.html.haml
+16
-19
app/views/milestones/_form.html.haml
app/views/milestones/_form.html.haml
+4
-5
app/views/milestones/edit.html.haml
app/views/milestones/edit.html.haml
+2
-2
app/views/milestones/index.html.haml
app/views/milestones/index.html.haml
+2
-2
app/views/milestones/show.html.haml
app/views/milestones/show.html.haml
+4
-4
app/views/notes/_form.html.haml
app/views/notes/_form.html.haml
+2
-2
app/views/notes/_load.js.haml
app/views/notes/_load.js.haml
+1
-1
app/views/notes/_per_line_form.html.haml
app/views/notes/_per_line_form.html.haml
+3
-3
app/views/notes/_per_line_show.html.haml
app/views/notes/_per_line_show.html.haml
+1
-1
app/views/notes/_reply_button.html.haml
app/views/notes/_reply_button.html.haml
+2
-2
app/views/notes/create.js.haml
app/views/notes/create.js.haml
+1
-1
app/views/profile/design.html.haml
app/views/profile/design.html.haml
+4
-4
app/views/profile/show.html.haml
app/views/profile/show.html.haml
+2
-3
app/views/profile/token.html.haml
app/views/profile/token.html.haml
+1
-1
app/views/projects/_form.html.haml
app/views/projects/_form.html.haml
+7
-7
app/views/projects/_new_form.html.haml
app/views/projects/_new_form.html.haml
+2
-2
app/views/projects/_project_head.html.haml
app/views/projects/_project_head.html.haml
+7
-8
app/views/projects/_show.html.haml
app/views/projects/_show.html.haml
+2
-2
app/views/projects/_team.html.haml
app/views/projects/_team.html.haml
+1
-1
app/views/projects/empty.html.haml
app/views/projects/empty.html.haml
+5
-5
app/views/projects/files.html.haml
app/views/projects/files.html.haml
+2
-2
app/views/projects/index.html.haml
app/views/projects/index.html.haml
+8
-8
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+4
-4
app/views/projects/team.html.haml
app/views/projects/team.html.haml
+4
-4
app/views/protected_branches/index.html.haml
app/views/protected_branches/index.html.haml
+2
-7
No files found.
app/views/admin/dashboard/index.html.haml
View file @
a0db028c
app/views/admin/projects/_form.html.haml
View file @
a0db028c
app/views/admin/projects/index.html.haml
View file @
a0db028c
app/views/admin/projects/show.html.haml
View file @
a0db028c
...
@@ -85,9 +85,7 @@
...
@@ -85,9 +85,7 @@
width
:
300px
;
width
:
300px
;
}
}
:javascript
:javascript
$
(
'
select#user_ids
'
).
chosen
();
$
(
'
select#user_ids
'
).
chosen
();
$
(
'
select#repo_access
'
).
chosen
();
$
(
'
select#repo_access
'
).
chosen
();
$
(
'
select#project_access
'
).
chosen
();
$
(
'
select#project_access
'
).
chosen
();
app/views/admin/team_members/_form.html.haml
View file @
a0db028c
...
@@ -25,4 +25,3 @@
...
@@ -25,4 +25,3 @@
$
(
'
select#team_member_project_id
'
).
chosen
();
$
(
'
select#team_member_project_id
'
).
chosen
();
$
(
'
select#team_member_repo_access
'
).
chosen
();
$
(
'
select#team_member_repo_access
'
).
chosen
();
$
(
'
select#team_member_project_access
'
).
chosen
();
$
(
'
select#team_member_project_access
'
).
chosen
();
app/views/admin/users/index.html.haml
View file @
a0db028c
app/views/admin/users/show.html.haml
View file @
a0db028c
...
@@ -53,7 +53,6 @@
...
@@ -53,7 +53,6 @@
%td
%td
=
@admin_user
.
twitter
=
@admin_user
.
twitter
%br
%br
%h3
Add User to Projects
%h3
Add User to Projects
%br
%br
...
@@ -104,9 +103,7 @@
...
@@ -104,9 +103,7 @@
width
:
300px
;
width
:
300px
;
}
}
:javascript
:javascript
$
(
'
select#project_ids
'
).
chosen
();
$
(
'
select#project_ids
'
).
chosen
();
$
(
'
select#repo_access
'
).
chosen
();
$
(
'
select#repo_access
'
).
chosen
();
$
(
'
select#project_access
'
).
chosen
();
$
(
'
select#project_access
'
).
chosen
();
app/views/commits/_diffs.html.haml
View file @
a0db028c
...
@@ -7,13 +7,11 @@
...
@@ -7,13 +7,11 @@
But if you still want to see diff
But if you still want to see diff
=
link_to
"click this link"
,
project_commit_path
(
@project
,
@commit
.
id
,
:force_show_diff
=>
true
),
:class
=>
"dark"
=
link_to
"click this link"
,
project_commit_path
(
@project
,
@commit
.
id
,
:force_show_diff
=>
true
),
:class
=>
"dark"
%p
.cgray
%p
.cgray
Showing
#{
pluralize
(
diffs
.
count
,
"changed file"
)
}
Showing
#{
pluralize
(
diffs
.
count
,
"changed file"
)
}
.file_stats
.file_stats
=
render
"commits/diff_head"
,
:diffs
=>
diffs
=
render
"commits/diff_head"
,
:diffs
=>
diffs
-
unless
@suppress_diff
-
unless
@suppress_diff
-
diffs
.
each_with_index
do
|
diff
,
i
|
-
diffs
.
each_with_index
do
|
diff
,
i
|
-
next
if
diff
.
diff
.
empty?
-
next
if
diff
.
diff
.
empty?
...
@@ -39,4 +37,3 @@
...
@@ -39,4 +37,3 @@
-
else
-
else
%p
%p
%center
No preview for this file type
%center
No preview for this file type
app/views/commits/_head.html.haml
View file @
a0db028c
...
@@ -27,7 +27,6 @@
...
@@ -27,7 +27,6 @@
=
link_to
project_commits_path
(
@project
,
:atom
,
{
:private_token
=>
current_user
.
private_token
,
:ref
=>
@ref
}),
:title
=>
"Feed"
do
=
link_to
project_commits_path
(
@project
,
:atom
,
{
:private_token
=>
current_user
.
private_token
,
:ref
=>
@ref
}),
:title
=>
"Feed"
do
=
image_tag
"rss_ui.png"
,
:title
=>
"feed"
=
image_tag
"rss_ui.png"
,
:title
=>
"feed"
:javascript
:javascript
$
(
function
(){
$
(
function
(){
$
(
'
.project-refs-select
'
).
chosen
();
$
(
'
.project-refs-select
'
).
chosen
();
...
...
app/views/commits/_text_file.html.haml
View file @
a0db028c
app/views/commits/compare.html.haml
View file @
a0db028c
...
@@ -31,7 +31,6 @@
...
@@ -31,7 +31,6 @@
%h4
Diff
%h4
Diff
=
render
"commits/diffs"
,
:diffs
=>
@diffs
=
render
"commits/diffs"
,
:diffs
=>
@diffs
:javascript
:javascript
$
(
function
()
{
$
(
function
()
{
var
availableTags
=
#{
@project
.
heads
.
map
(
&
:name
).
to_json
}
;
var
availableTags
=
#{
@project
.
heads
.
map
(
&
:name
).
to_json
}
;
...
...
app/views/commits/index.html.haml
View file @
a0db028c
app/views/commits/show.html.haml
View file @
a0db028c
app/views/deploy_keys/index.html.haml
View file @
a0db028c
app/views/errors/encoding.html.haml
View file @
a0db028c
app/views/errors/git_not_found.html.haml
View file @
a0db028c
app/views/events/_event.html.haml
View file @
a0db028c
app/views/events/_event_issue.html.haml
View file @
a0db028c
app/views/events/_event_merge_request.html.haml
View file @
a0db028c
app/views/events/_event_push.html.haml
View file @
a0db028c
...
@@ -27,4 +27,3 @@
...
@@ -27,4 +27,3 @@
-
else
-
else
-
event
.
commits
.
each
do
|
commit
|
-
event
.
commits
.
each
do
|
commit
|
=
render
"events/commit"
,
:commit
=>
commit
,
:project
=>
project
=
render
"events/commit"
,
:commit
=>
commit
,
:project
=>
project
app/views/help/index.html.haml
View file @
a0db028c
app/views/help/web_hooks.html.haml
View file @
a0db028c
app/views/help/workflow.html.haml
View file @
a0db028c
app/views/hooks/index.html.haml
View file @
a0db028c
...
@@ -40,4 +40,3 @@
...
@@ -40,4 +40,3 @@
%td
POST
%td
POST
%td
%td
=
link_to
'Remove'
,
project_hook_path
(
@project
,
hook
),
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"danger btn small right"
=
link_to
'Remove'
,
project_hook_path
(
@project
,
hook
),
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"danger btn small right"
app/views/issues/_form.html.haml
View file @
a0db028c
...
@@ -35,8 +35,6 @@
...
@@ -35,8 +35,6 @@
=
f
.
text_area
:description
,
:maxlength
=>
2000
,
:class
=>
"xxlarge"
,
:rows
=>
14
=
f
.
text_area
:description
,
:maxlength
=>
2000
,
:class
=>
"xxlarge"
,
:rows
=>
14
%p
.hint
Markdown is enabled.
%p
.hint
Markdown is enabled.
.actions
.actions
-
if
@issue
.
new_record?
-
if
@issue
.
new_record?
=
f
.
submit
'Submit new issue'
,
:class
=>
"primary btn"
=
f
.
submit
'Submit new issue'
,
:class
=>
"primary btn"
...
...
app/views/issues/_head.html.haml
View file @
a0db028c
app/views/issues/_show.html.haml
View file @
a0db028c
...
@@ -22,11 +22,5 @@
...
@@ -22,11 +22,5 @@
-
if
issue
.
upvotes
>
0
-
if
issue
.
upvotes
>
0
%span
.label.success
=
"+
#{
issue
.
upvotes
}
"
%span
.label.success
=
"+
#{
issue
.
upvotes
}
"
=
link_to
project_issue_path
(
issue
.
project
,
issue
)
do
=
link_to
project_issue_path
(
issue
.
project
,
issue
)
do
%p
.row_title
=
truncate
(
issue
.
title
,
:length
=>
100
)
%p
.row_title
=
truncate
(
issue
.
title
,
:length
=>
100
)
app/views/issues/edit.html.haml
View file @
a0db028c
app/views/issues/index.html.haml
View file @
a0db028c
app/views/issues/new.html.haml
View file @
a0db028c
app/views/issues/show.html.haml
View file @
a0db028c
app/views/keys/index.html.haml
View file @
a0db028c
app/views/keys/show.html.haml
View file @
a0db028c
...
@@ -12,5 +12,3 @@
...
@@ -12,5 +12,3 @@
%pre
=
@key
.
key
%pre
=
@key
.
key
.actions
.actions
=
link_to
'Remove'
,
@key
,
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"btn danger delete-key"
=
link_to
'Remove'
,
@key
,
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"btn danger delete-key"
app/views/layouts/_app_menu.html.haml
View file @
a0db028c
app/views/layouts/_head_panel.html.haml
View file @
a0db028c
...
@@ -43,4 +43,3 @@
...
@@ -43,4 +43,3 @@
}
}
});
});
});
});
app/views/layouts/_project_menu.html.haml
View file @
a0db028c
app/views/merge_requests/_commits.html.haml
View file @
a0db028c
app/views/merge_requests/_diffs.html.haml
View file @
a0db028c
app/views/merge_requests/_form.html.haml
View file @
a0db028c
app/views/merge_requests/_head.html.haml
View file @
a0db028c
app/views/merge_requests/index.html.haml
View file @
a0db028c
app/views/merge_requests/show.html.haml
View file @
a0db028c
...
@@ -83,9 +83,6 @@
...
@@ -83,9 +83,6 @@
.alert.alert-info
.alert.alert-info
%strong
This merge request already can not be merged. Try to reload page.
%strong
This merge request already can not be merged. Try to reload page.
=
render
"merge_requests/commits"
=
render
"merge_requests/commits"
-
unless
@commits
.
empty?
-
unless
@commits
.
empty?
...
...
app/views/milestones/_form.html.haml
View file @
a0db028c
...
@@ -30,7 +30,6 @@
...
@@ -30,7 +30,6 @@
.controls
.controls
.datepicker
.datepicker
.form-actions
.form-actions
-
if
@milestone
.
new_record?
-
if
@milestone
.
new_record?
=
f
.
submit
'Create milestone'
,
:class
=>
"primary btn"
=
f
.
submit
'Create milestone'
,
:class
=>
"primary btn"
...
...
app/views/milestones/edit.html.haml
View file @
a0db028c
app/views/milestones/index.html.haml
View file @
a0db028c
app/views/milestones/show.html.haml
View file @
a0db028c
app/views/notes/_form.html.haml
View file @
a0db028c
app/views/notes/_load.js.haml
View file @
a0db028c
app/views/notes/_per_line_form.html.haml
View file @
a0db028c
app/views/notes/_per_line_show.html.haml
View file @
a0db028c
app/views/notes/_reply_button.html.haml
View file @
a0db028c
app/views/notes/create.js.haml
View file @
a0db028c
app/views/profile/design.html.haml
View file @
a0db028c
app/views/profile/show.html.haml
View file @
a0db028c
...
@@ -65,6 +65,5 @@
...
@@ -65,6 +65,5 @@
=
link_to
"Add Public Key"
,
new_key_path
,
:class
=>
"btn small right"
=
link_to
"Add Public Key"
,
new_key_path
,
:class
=>
"btn small right"
.form-actions
.form-actions
=
f
.
submit
'Save'
,
:class
=>
"btn-primary btn"
=
f
.
submit
'Save'
,
:class
=>
"btn-primary btn"
app/views/profile/token.html.haml
View file @
a0db028c
app/views/projects/_form.html.haml
View file @
a0db028c
app/views/projects/_new_form.html.haml
View file @
a0db028c
app/views/projects/_project_head.html.haml
View file @
a0db028c
...
@@ -27,4 +27,3 @@
...
@@ -27,4 +27,3 @@
=
link_to
edit_project_path
(
@project
),
:class
=>
"stat-tab tab "
do
=
link_to
edit_project_path
(
@project
),
:class
=>
"stat-tab tab "
do
%i
.icon-edit
%i
.icon-edit
Edit
Edit
app/views/projects/_show.html.haml
View file @
a0db028c
app/views/projects/_team.html.haml
View file @
a0db028c
app/views/projects/empty.html.haml
View file @
a0db028c
app/views/projects/files.html.haml
View file @
a0db028c
app/views/projects/index.html.haml
View file @
a0db028c
app/views/projects/show.html.haml
View file @
a0db028c
app/views/projects/team.html.haml
View file @
a0db028c
app/views/protected_branches/index.html.haml
View file @
a0db028c
...
@@ -23,7 +23,6 @@
...
@@ -23,7 +23,6 @@
=
f
.
submit
'Protect'
,
:class
=>
"primary btn"
=
f
.
submit
'Protect'
,
:class
=>
"primary btn"
-
unless
@branches
.
empty?
-
unless
@branches
.
empty?
%table
.admin-table
%table
.admin-table
%thead
%thead
...
@@ -48,9 +47,5 @@
...
@@ -48,9 +47,5 @@
-
if
can?
current_user
,
:admin_project
,
@project
-
if
can?
current_user
,
:admin_project
,
@project
=
link_to
'Unprotect'
,
[
@project
,
branch
],
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"danger btn small"
=
link_to
'Unprotect'
,
[
@project
,
branch
],
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"danger btn small"
:javascript
:javascript
$
(
'
select#protected_branch_name
'
).
chosen
();
$
(
'
select#protected_branch_name
'
).
chosen
();
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