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
d1544863
Commit
d1544863
authored
Jan 15, 2017
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HAMLLint: Fix `UnnecessaryStringOutput` offences
parent
c5c4b4aa
Changes
25
Show whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
31 additions
and
31 deletions
+31
-31
app/views/admin/broadcast_messages/_form.html.haml
app/views/admin/broadcast_messages/_form.html.haml
+1
-1
app/views/admin/identities/_identity.html.haml
app/views/admin/identities/_identity.html.haml
+1
-1
app/views/admin/system_info/show.html.haml
app/views/admin/system_info/show.html.haml
+3
-3
app/views/import/_githubish_status.html.haml
app/views/import/_githubish_status.html.haml
+1
-1
app/views/import/fogbugz/status.html.haml
app/views/import/fogbugz/status.html.haml
+1
-1
app/views/import/google_code/status.html.haml
app/views/import/google_code/status.html.haml
+1
-1
app/views/notify/closed_issue_email.html.haml
app/views/notify/closed_issue_email.html.haml
+1
-1
app/views/notify/closed_issue_email.text.haml
app/views/notify/closed_issue_email.text.haml
+1
-1
app/views/notify/closed_merge_request_email.html.haml
app/views/notify/closed_merge_request_email.html.haml
+1
-1
app/views/notify/closed_merge_request_email.text.haml
app/views/notify/closed_merge_request_email.text.haml
+1
-1
app/views/notify/issue_status_changed_email.html.haml
app/views/notify/issue_status_changed_email.html.haml
+1
-1
app/views/notify/merge_request_status_email.html.haml
app/views/notify/merge_request_status_email.html.haml
+1
-1
app/views/notify/merge_request_status_email.text.haml
app/views/notify/merge_request_status_email.text.haml
+1
-1
app/views/notify/merged_merge_request_email.html.haml
app/views/notify/merged_merge_request_email.html.haml
+1
-1
app/views/notify/merged_merge_request_email.text.haml
app/views/notify/merged_merge_request_email.text.haml
+1
-1
app/views/notify/pipeline_failed_email.html.haml
app/views/notify/pipeline_failed_email.html.haml
+1
-1
app/views/notify/pipeline_success_email.html.haml
app/views/notify/pipeline_success_email.html.haml
+2
-2
app/views/notify/project_was_not_exported_email.text.haml
app/views/notify/project_was_not_exported_email.text.haml
+2
-2
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+1
-1
app/views/projects/commits/_commits.html.haml
app/views/projects/commits/_commits.html.haml
+1
-1
app/views/projects/deployments/_deployment.html.haml
app/views/projects/deployments/_deployment.html.haml
+2
-2
app/views/projects/diffs/_file_header.html.haml
app/views/projects/diffs/_file_header.html.haml
+1
-1
app/views/projects/forks/index.html.haml
app/views/projects/forks/index.html.haml
+1
-1
app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml
...es/mattermost_slash_commands/_installation_info.html.haml
+1
-1
app/views/shared/tokens/_scopes_form.html.haml
app/views/shared/tokens/_scopes_form.html.haml
+2
-2
No files found.
app/views/admin/broadcast_messages/_form.html.haml
View file @
d1544863
...
...
@@ -4,7 +4,7 @@
-
if
@broadcast_message
.
message
.
present?
=
render_broadcast_message
(
@broadcast_message
)
-
else
=
"Your message here"
=
(
"Your message here"
)
=
form_for
[
:admin
,
@broadcast_message
],
html:
{
class:
'broadcast-message-form form-horizontal js-quick-submit js-requires-input'
}
do
|
f
|
=
form_errors
(
@broadcast_message
)
...
...
app/views/admin/identities/_identity.html.haml
View file @
d1544863
%tr
%td
=
"
#{
Gitlab
::
OAuth
::
Provider
.
label_for
(
identity
.
provider
)
}
(
#{
identity
.
provider
}
)"
#{
Gitlab
::
OAuth
::
Provider
.
label_for
(
identity
.
provider
)
}
(
#{
identity
.
provider
}
)
%td
=
identity
.
extern_uid
%td
...
...
app/views/admin/system_info/show.html.haml
View file @
d1544863
...
...
@@ -10,7 +10,7 @@
%h4
CPU
.data
-
if
@cpus
%h1
=
"
#{
@cpus
.
length
}
cores"
%h1
#{
@cpus
.
length
}
cores
-
else
=
icon
(
'warning'
,
class:
'text-warning'
)
Unable to collect CPU info
...
...
@@ -19,7 +19,7 @@
%h4
Memory
.data
-
if
@memory
%h1
=
"
#{
number_to_human_size
(
@memory
.
active_bytes
)
}
/
#{
number_to_human_size
(
@memory
.
total_bytes
)
}
"
%h1
#{
number_to_human_size
(
@memory
.
active_bytes
)
}
/
#{
number_to_human_size
(
@memory
.
total_bytes
)
}
-
else
=
icon
(
'warning'
,
class:
'text-warning'
)
Unable to collect memory info
...
...
@@ -28,6 +28,6 @@
%h4
Disks
.data
-
@disks
.
each
do
|
disk
|
%h1
=
"
#{
number_to_human_size
(
disk
[
:bytes_used
])
}
/
#{
number_to_human_size
(
disk
[
:bytes_total
])
}
"
%h1
#{
number_to_human_size
(
disk
[
:bytes_used
])
}
/
#{
number_to_human_size
(
disk
[
:bytes_total
])
}
%p
=
disk
[
:disk_name
]
%p
=
disk
[
:mount_path
]
app/views/import/_githubish_status.html.haml
View file @
d1544863
...
...
@@ -16,7 +16,7 @@
%colgroup
.import-jobs-status-col
%thead
%tr
%th
=
"From
#{
provider_title
}
"
%th
From
#{
provider_title
}
%th
To GitLab
%th
Status
%tbody
...
...
app/views/import/fogbugz/status.html.haml
View file @
d1544863
...
...
@@ -50,7 +50,7 @@
%td
=
repo
.
name
%td
.import-target
=
"
#{
current_user
.
username
}
/
#{
repo
.
name
}
"
#{
current_user
.
username
}
/
#{
repo
.
name
}
%td
.import-actions.job-status
=
button_tag
class:
"btn btn-import js-add-to-import"
do
Import
...
...
app/views/import/google_code/status.html.haml
View file @
d1544863
...
...
@@ -55,7 +55,7 @@
%td
=
link_to
repo
.
name
,
"https://code.google.com/p/
#{
repo
.
name
}
"
,
target:
"_blank"
%td
.import-target
=
"
#{
current_user
.
username
}
/
#{
repo
.
name
}
"
#{
current_user
.
username
}
/
#{
repo
.
name
}
%td
.import-actions.job-status
=
button_tag
class:
"btn btn-import js-add-to-import"
do
Import
...
...
app/views/notify/closed_issue_email.html.haml
View file @
d1544863
%p
=
"Issue was closed by
#{
@updated_by
.
name
}
"
Issue was closed by
#{
@updated_by
.
name
}
app/views/notify/closed_issue_email.text.haml
View file @
d1544863
=
"Issue was closed by
#{
@updated_by
.
name
}
"
Issue was closed by
#{
@updated_by
.
name
}
Issue ##{@issue.iid}:
#{
namespace_project_issue_url
(
@issue
.
project
.
namespace
,
@issue
.
project
,
@issue
)
}
app/views/notify/closed_merge_request_email.html.haml
View file @
d1544863
%p
=
"Merge Request
#{
@merge_request
.
to_reference
}
was closed by
#{
@updated_by
.
name
}
"
Merge Request
#{
@merge_request
.
to_reference
}
was closed by
#{
@updated_by
.
name
}
app/views/notify/closed_merge_request_email.text.haml
View file @
d1544863
=
"Merge Request
#{
@merge_request
.
to_reference
}
was closed by
#{
@updated_by
.
name
}
"
Merge Request
#{
@merge_request
.
to_reference
}
was closed by
#{
@updated_by
.
name
}
Merge Request url:
#{
namespace_project_merge_request_url
(
@merge_request
.
target_project
.
namespace
,
@merge_request
.
target_project
,
@merge_request
)
}
...
...
app/views/notify/issue_status_changed_email.html.haml
View file @
d1544863
%p
=
"Issue was
#{
@issue_status
}
by
#{
@updated_by
.
name
}
"
Issue was
#{
@issue_status
}
by
#{
@updated_by
.
name
}
app/views/notify/merge_request_status_email.html.haml
View file @
d1544863
%p
=
"Merge Request
#{
@merge_request
.
to_reference
}
was
#{
@mr_status
}
by
#{
@updated_by
.
name
}
"
Merge Request
#{
@merge_request
.
to_reference
}
was
#{
@mr_status
}
by
#{
@updated_by
.
name
}
app/views/notify/merge_request_status_email.text.haml
View file @
d1544863
=
"Merge Request
#{
@merge_request
.
to_reference
}
was
#{
@mr_status
}
by
#{
@updated_by
.
name
}
"
Merge Request
#{
@merge_request
.
to_reference
}
was
#{
@mr_status
}
by
#{
@updated_by
.
name
}
Merge Request url:
#{
namespace_project_merge_request_url
(
@merge_request
.
target_project
.
namespace
,
@merge_request
.
target_project
,
@merge_request
)
}
...
...
app/views/notify/merged_merge_request_email.html.haml
View file @
d1544863
%p
=
"Merge Request
#{
@merge_request
.
to_reference
}
was merged"
Merge Request
#{
@merge_request
.
to_reference
}
was merged
app/views/notify/merged_merge_request_email.text.haml
View file @
d1544863
=
"Merge Request
#{
@merge_request
.
to_reference
}
was merged"
Merge Request
#{
@merge_request
.
to_reference
}
was merged
Merge Request url:
#{
namespace_project_merge_request_url
(
@merge_request
.
target_project
.
namespace
,
@merge_request
.
target_project
,
@merge_request
)
}
...
...
app/views/notify/pipeline_failed_email.html.haml
View file @
d1544863
...
...
@@ -139,7 +139,7 @@
had
=
failed
.
size
failed
=
"
#{
'build'
.
pluralize
(
failed
.
size
)
}
."
#{
'build'
.
pluralize
(
failed
.
size
)
}
.
%tr
.warning
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;border:1px solid #ededed;border-bottom:0;border-radius:3px 3px 0 0;overflow:hidden;background-color:#fdf4f6;color:#d22852;font-size:14px;line-height:1.4;text-align:center;padding:8px 15px;"
}
Logs may contain sensitive data. Please consider before forwarding this email.
...
...
app/views/notify/pipeline_success_email.html.haml
View file @
d1544863
...
...
@@ -138,9 +138,9 @@
%a
{
href:
pipeline_url
(
@pipeline
),
style:
"color:#3777b0;text-decoration:none;"
}
=
"
\#
#{
@pipeline
.
id
}
"
successfully completed
=
"
#{
build_count
}
#{
'build'
.
pluralize
(
build_count
)
}
"
#{
build_count
}
#{
'build'
.
pluralize
(
build_count
)
}
in
=
"
#{
stage_count
}
#{
'stage'
.
pluralize
(
stage_count
)
}
."
#{
stage_count
}
#{
'stage'
.
pluralize
(
stage_count
)
}
.
%tr
.footer
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;"
}
%img
{
alt:
"GitLab"
,
height:
"33"
,
src:
image_url
(
'mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'
),
style:
"display:block;margin:0 auto 1em;"
,
width:
"90"
}
/
...
...
app/views/notify/project_was_not_exported_email.text.haml
View file @
d1544863
=
"Project
#{
@project
.
name
}
couldn't be exported."
Project
#{
@project
.
name
}
couldn't be exported.
=
"The errors we encountered were:"
The errors we encountered were:
-
@errors
.
each
do
|
error
|
#{
error
}
app/views/profiles/accounts/show.html.haml
View file @
d1544863
...
...
@@ -102,7 +102,7 @@
=
f
.
text_field
:username
,
required:
true
,
class:
'form-control'
.help-block
Current path:
=
"
#{
root_url
}#{
current_user
.
username
}
"
#{
root_url
}#{
current_user
.
username
}
.prepend-top-default
=
f
.
button
class:
"btn btn-warning"
,
type:
"submit"
do
=
icon
"spinner spin"
,
class:
"hidden loading-username"
...
...
app/views/projects/commits/_commits.html.haml
View file @
d1544863
...
...
@@ -2,7 +2,7 @@
-
commits
,
hidden
=
limited_commits
(
@commits
)
-
commits
.
chunk
{
|
c
|
c
.
committed_date
.
in_time_zone
.
to_date
}.
each
do
|
day
,
commits
|
%li
.commit-header
=
"
#{
day
.
strftime
(
'%d %b, %Y'
)
}
#{
pluralize
(
commits
.
count
,
'commit'
)
}
"
%li
.commit-header
#{
day
.
strftime
(
'%d %b, %Y'
)
}
#{
pluralize
(
commits
.
count
,
'commit'
)
}
%li
.commits-row
%ul
.content-list.commit-list.table-list.table-wide
=
render
commits
,
project:
project
,
ref:
ref
...
...
app/views/projects/deployments/_deployment.html.haml
View file @
d1544863
%tr
.deployment
%td
%strong
=
"#
#{
deployment
.
iid
}
"
%strong
=
(
"#
#{
deployment
.
iid
}
"
)
%td
=
render
'projects/deployments/commit'
,
deployment:
deployment
...
...
@@ -8,7 +8,7 @@
%td
.build-column
-
if
deployment
.
deployable
=
link_to
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
deployment
.
deployable
],
class:
'build-link'
do
=
"
#{
deployment
.
deployable
.
name
}
(#
#{
deployment
.
deployable
.
id
}
)"
=
(
"
#{
deployment
.
deployable
.
name
}
(#
#{
deployment
.
deployable
.
id
}
)"
)
-
if
deployment
.
user
by
=
user_avatar
(
user:
deployment
.
user
,
size:
20
)
...
...
app/views/projects/diffs/_file_header.html.haml
View file @
d1544863
...
...
@@ -25,4 +25,4 @@
-
if
diff_file
.
mode_changed?
%small
=
"
#{
diff_file
.
a_mode
}
→
#{
diff_file
.
b_mode
}
"
#{
diff_file
.
a_mode
}
→
#{
diff_file
.
b_mode
}
app/views/projects/forks/index.html.haml
View file @
d1544863
.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/services/mattermost_slash_commands/_installation_info.html.haml
View file @
d1544863
...
...
@@ -4,4 +4,4 @@
.col-sm-9.col-sm-offset-3
=
link_to
new_namespace_project_mattermost_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-lg'
do
=
custom_icon
(
'mattermost_logo'
,
size:
15
)
=
'Add to Mattermost'
Add to Mattermost
app/views/shared/tokens/_scopes_form.html.haml
View file @
d1544863
...
...
@@ -5,5 +5,5 @@
-
scopes
.
each
do
|
scope
|
%fieldset
=
check_box_tag
"
#{
prefix
}
[scopes][]"
,
scope
,
token
.
scopes
.
include?
(
scope
),
id:
"
#{
prefix
}
_scopes_
#{
scope
}
"
=
label_tag
"
#{
prefix
}
_scopes_
#{
scope
}
"
,
scope
%span
=
"(
#{
t
(
scope
,
scope:
[
:doorkeeper
,
:scopes
])
}
)"
=
label_tag
(
"
#{
prefix
}
_scopes_
#{
scope
}
"
)
,
scope
%span
=
t
(
scope
,
scope:
[
:doorkeeper
,
:scopes
])
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