diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-28 16:52:18 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-28 16:52:18 +0300 |
| commit | ef4848a6ff561d6ec8e6ad1c4d630a56035d82d8 (patch) | |
| tree | ed266e4fda1c879b8443b23306fdf471d366d06c | |
| parent | c8514bece972ad2a77a2f7327e84275d93d9d55a (diff) | |
| parent | 15c89672388a9868b88264c45a2a29838a246a43 (diff) | |
| download | gitlab-ce-ef4848a6ff561d6ec8e6ad1c4d630a56035d82d8.tar.gz | |
Merge pull request #7609 from cirosantilli/rm-haml-strings
[refactor] Remove HAML eval for const strings.
7 files changed, 7 insertions, 7 deletions
diff --git a/app/views/notify/project_was_moved_email.html.haml b/app/views/notify/project_was_moved_email.html.haml index 1667c59bc07..fe248584e55 100644 --- a/app/views/notify/project_was_moved_email.html.haml +++ b/app/views/notify/project_was_moved_email.html.haml @@ -1,5 +1,5 @@ %p - = "Project was moved to another location" + Project was moved to another location %p The project is now located under = link_to project_url(@project) do diff --git a/app/views/projects/commits/_diff_stats.html.haml b/app/views/projects/commits/_diff_stats.html.haml index 846a1ee10e6..8ef7cc6e086 100644 --- a/app/views/projects/commits/_diff_stats.html.haml +++ b/app/views/projects/commits/_diff_stats.html.haml @@ -26,7 +26,7 @@ %a{href: "#diff-#{i}"} %i.icon-minus = diff.old_path - = "->" + \-> = diff.new_path - elsif diff.new_file %span.new-file diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index db28b831182..e257f317b95 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -9,7 +9,7 @@ = link_to_gfm issue.title, project_issue_path(issue.project, issue), class: "row_title" - if issue.closed? %small.pull-right - = "CLOSED" + CLOSED .issue-info - if issue.assignee diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 7f5de232dcf..06cf390fbde 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -5,7 +5,7 @@ - if merge_request.merged? %small.pull-right %i.icon-ok - = "MERGED" + MERGED - else %span.pull-right - if merge_request.for_fork? diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml index 7c43d355987..dc3f9d592f6 100644 --- a/app/views/projects/merge_requests/_new_submit.html.haml +++ b/app/views/projects/merge_requests/_new_submit.html.haml @@ -16,7 +16,7 @@ .form-group .light = f.label :title do - = "Title *" + Title * = f.text_field :title, class: "form-control input-lg js-gfm-input", maxlength: 255, rows: 5, required: true .form-group .light diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml index dd059fb99d3..5998e4c6b42 100644 --- a/app/views/projects/team_members/_form.html.haml +++ b/app/views/projects/team_members/_form.html.haml @@ -1,5 +1,5 @@ %h3.page-title - = "New project member(s)" + New project member(s) = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project), html: { class: "form-horizontal users-project-form" } do |f| -if @user_project_relation.errors.any? diff --git a/app/views/projects/team_members/import.html.haml b/app/views/projects/team_members/import.html.haml index d3e4a762018..510b579fe2f 100644 --- a/app/views/projects/team_members/import.html.haml +++ b/app/views/projects/team_members/import.html.haml @@ -1,5 +1,5 @@ %h3.page-title - = "Import members from another project" + Import members from another project %p.light Only project members will be imported. Group members will be skipped. %hr |