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
97f3c8f3
Commit
97f3c8f3
authored
Dec 23, 2016
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HAMLLint: Fix `TrailingWhitespace` offences
parent
df4f896b
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
12 additions
and
14 deletions
+12
-14
app/views/abuse_report_mailer/notify.html.haml
app/views/abuse_report_mailer/notify.html.haml
+3
-3
app/views/doorkeeper/authorized_applications/_delete_form.html.haml
...doorkeeper/authorized_applications/_delete_form.html.haml
+1
-1
app/views/projects/_find_file_link.html.haml
app/views/projects/_find_file_link.html.haml
+3
-3
app/views/projects/forks/index.html.haml
app/views/projects/forks/index.html.haml
+1
-1
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+1
-1
app/views/projects/merge_requests/widget/_closed.html.haml
app/views/projects/merge_requests/widget/_closed.html.haml
+1
-1
app/views/projects/merge_requests/widget/_open.html.haml
app/views/projects/merge_requests/widget/_open.html.haml
+0
-2
app/views/projects/merge_requests/widget/open/_archived.html.haml
...s/projects/merge_requests/widget/open/_archived.html.haml
+1
-1
app/views/projects/merge_requests/widget/open/_nothing.html.haml
...ws/projects/merge_requests/widget/open/_nothing.html.haml
+1
-1
No files found.
app/views/abuse_report_mailer/notify.html.haml
View file @
97f3c8f3
%p
#{
link_to
@abuse_report
.
user
.
name
,
user_url
(
@abuse_report
.
user
)
}
(@
#{
@abuse_report
.
user
.
username
}
) was reported for abuse by
#{
link_to
@abuse_report
.
reporter
.
name
,
user_url
(
@abuse_report
.
reporter
)
}
#{
link_to
@abuse_report
.
user
.
name
,
user_url
(
@abuse_report
.
user
)
}
(@
#{
@abuse_report
.
user
.
username
}
) was reported for abuse by
#{
link_to
@abuse_report
.
reporter
.
name
,
user_url
(
@abuse_report
.
reporter
)
}
(@
#{
@abuse_report
.
reporter
.
username
}
).
%blockquote
...
...
app/views/doorkeeper/authorized_applications/_delete_form.html.haml
View file @
97f3c8f3
...
...
@@ -3,7 +3,7 @@
-
path
=
oauth_authorized_application_path
(
0
,
token_id:
token
)
-
else
-
path
=
oauth_authorized_application_path
(
application
)
=
form_tag
path
do
%input
{
:name
=>
"_method"
,
:type
=>
"hidden"
,
:value
=>
"delete"
}
/
=
submit_tag
'Revoke'
,
onclick:
"return confirm('Are you sure?')"
,
class:
'btn btn-remove btn-sm'
app/views/projects/_find_file_link.html.haml
View file @
97f3c8f3
=
link_to
namespace_project_find_file_path
(
@project
.
namespace
,
@project
,
@ref
),
class:
'btn btn-grouped shortcuts-find-file'
,
rel:
'nofollow'
do
=
icon
(
'search'
)
%span
Find File
=
link_to
namespace_project_find_file_path
(
@project
.
namespace
,
@project
,
@ref
),
class:
'btn btn-grouped shortcuts-find-file'
,
rel:
'nofollow'
do
=
icon
(
'search'
)
%span
Find File
app/views/projects/forks/index.html.haml
View file @
97f3c8f3
.top-area
.nav-text
-
full_count_title
=
"
#{
@public_forks_count
}
public and
#{
@private_forks_count
}
private"
=
"
#{
pluralize
(
@total_forks_count
,
'fork'
)
}
:
#{
full_count_title
}
"
=
"
#{
pluralize
(
@total_forks_count
,
'fork'
)
}
:
#{
full_count_title
}
"
.nav-controls
=
form_tag
request
.
original_url
,
method: :get
,
class:
'project-filter-form'
,
id:
'project-filter-form'
do
|
f
|
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
97f3c8f3
...
...
@@ -65,7 +65,7 @@
-
merge_request
.
labels
.
each
do
|
label
|
=
link_to_label
(
label
,
subject:
merge_request
.
project
,
type: :merge_request
)
-
if
merge_request
.
tasks?
%span
.task-status
...
...
app/views/projects/merge_requests/widget/_closed.html.haml
View file @
97f3c8f3
...
...
@@ -6,7 +6,7 @@
-
if
@merge_request
.
closed_event
by
#{
link_to_member
(
@project
,
@merge_request
.
closed_event
.
author
,
avatar:
true
)
}
#{
time_ago_with_tooltip
(
@merge_request
.
closed_event
.
created_at
)
}
%p
%p
=
succeed
'.'
do
The changes were not merged into
%span
.label-branch
=
@merge_request
.
target_branch
app/views/projects/merge_requests/widget/_open.html.haml
View file @
97f3c8f3
...
...
@@ -43,5 +43,3 @@
#{
"Issue"
.
pluralize
(
mr_issues_mentioned_but_not_closing
.
size
)
}
!=
markdown
issues_sentence
(
mr_issues_mentioned_but_not_closing
),
pipeline: :gfm
,
author:
@merge_request
.
author
#{
mr_issues_mentioned_but_not_closing
.
size
>
1
?
'are'
:
'is'
}
mentioned but will not be closed.
app/views/projects/merge_requests/widget/open/_archived.html.haml
View file @
97f3c8f3
%h4
%h4
Project is archived
%p
This merge request cannot be merged because archived projects cannot be written to.
app/views/projects/merge_requests/widget/open/_nothing.html.haml
View file @
97f3c8f3
%h4
%h4
=
icon
(
"exclamation-triangle"
)
Nothing to merge from
%span
.label-branch
=
source_branch_with_namespace
(
@merge_request
)
...
...
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