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
c236d0d2
Commit
c236d0d2
authored
Jan 26, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix UnnecessaryStringOutput HAML linter
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
7ee6c81c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/groups/pipeline_quota/index.html.haml
app/views/groups/pipeline_quota/index.html.haml
+1
-1
app/views/notify/approved_merge_request_email.text.haml
app/views/notify/approved_merge_request_email.text.haml
+1
-1
app/views/notify/unapproved_merge_request_email.text.haml
app/views/notify/unapproved_merge_request_email.text.haml
+1
-1
No files found.
app/views/groups/pipeline_quota/index.html.haml
View file @
c236d0d2
...
...
@@ -22,7 +22,7 @@
minutes
.col-sm-6.right
-
if
@group
.
shared_runners_minutes_limit_enabled?
=
"
#{
group_shared_runner_limits_percent_used
(
@group
)
}
% used"
#{
group_shared_runner_limits_percent_used
(
@group
)
}
% used
-
else
Unlimited
=
group_shared_runner_limits_progress_bar
(
@group
)
...
...
app/views/notify/approved_merge_request_email.text.haml
View file @
c236d0d2
=
"Merge Request
#{
@merge_request
.
to_reference
}
was approved by
#{
@approved_by_user
}
"
Merge Request
#{
@merge_request
.
to_reference
}
was approved by
#{
@approved_by_user
}
Merge Request url:
#{
namespace_project_merge_request_url
(
@merge_request
.
target_project
.
namespace
,
@merge_request
.
target_project
,
@merge_request
)
}
...
...
app/views/notify/unapproved_merge_request_email.text.haml
View file @
c236d0d2
=
"Merge Request
#{
@merge_request
.
to_reference
}
was unapproved by
#{
@unapproved_by_user
}
"
Merge Request
#{
@merge_request
.
to_reference
}
was unapproved by
#{
@unapproved_by_user
}
Merge Request url:
#{
namespace_project_merge_request_url
(
@merge_request
.
target_project
.
namespace
,
@merge_request
.
target_project
,
@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