summaryrefslogtreecommitdiff
path: root/app/views/merge_requests
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/merge_requests')
-rw-r--r--app/views/merge_requests/_form.html.haml20
-rw-r--r--app/views/merge_requests/_head.html.haml2
-rw-r--r--app/views/merge_requests/_merge_request.html.haml6
-rw-r--r--app/views/merge_requests/_show.html.haml8
-rw-r--r--app/views/merge_requests/branch_from.js.haml2
-rw-r--r--app/views/merge_requests/branch_to.js.haml2
-rw-r--r--app/views/merge_requests/commits.js.haml2
-rw-r--r--app/views/merge_requests/diffs.js.haml2
-rw-r--r--app/views/merge_requests/index.html.haml20
-rw-r--r--app/views/merge_requests/show.js.haml2
-rw-r--r--app/views/merge_requests/show/_commits.html.haml6
-rw-r--r--app/views/merge_requests/show/_diffs.html.haml4
-rw-r--r--app/views/merge_requests/show/_how_to_merge.html.haml2
-rw-r--r--app/views/merge_requests/show/_mr_accept.html.haml16
-rw-r--r--app/views/merge_requests/show/_mr_box.html.haml4
-rw-r--r--app/views/merge_requests/show/_mr_title.html.haml6
16 files changed, 52 insertions, 52 deletions
diff --git a/app/views/merge_requests/_form.html.haml b/app/views/merge_requests/_form.html.haml
index 4f20a06fd25..b6c12397d6c 100644
--- a/app/views/merge_requests/_form.html.haml
+++ b/app/views/merge_requests/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project, @merge_request], :html => { :class => "new_merge_request form-horizontal" } do |f|
+= form_for [@project, @merge_request], html: { class: "new_merge_request form-horizontal" } do |f|
-if @merge_request.errors.any?
.alert-message.block-message.error
%ul
@@ -14,9 +14,9 @@
%h5 From (Head Branch)
.body
.padded
- = f.label :source_branch, "From", :class => "control-label"
+ = f.label :source_branch, "From", class: "control-label"
.controls
- = f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
+ = f.select(:source_branch, @project.heads.map(&:name), { include_blank: "Select branch" }, style: "width:250px")
.bottom_commit
.mr_source_commit
@@ -25,9 +25,9 @@
%h5 To (Base Branch)
.body
.padded
- = f.label :target_branch, "To", :class => "control-label"
+ = f.label :target_branch, "To", class: "control-label"
.controls
- = f.select(:target_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
+ = f.select(:target_branch, @project.heads.map(&:name), { include_blank: "Select branch" }, style: "width:250px")
.bottom_commit
.mr_target_commit
@@ -38,22 +38,22 @@
.top_box_content
= f.label :title do
%strong= "Title *"
- .input= f.text_field :title, :class => "input-xxlarge pad", :maxlength => 255, :rows => 5
+ .input= f.text_field :title, class: "input-xxlarge pad", maxlength: 255, rows: 5
.middle_box_content
= f.label :assignee_id do
%i.icon-user
Assign to
- .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")
+ .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, style: "width:250px")
.control-group
.form-actions
- = f.submit 'Save', :class => "btn-primary btn"
+ = f.submit 'Save', class: "btn-primary btn"
- if @merge_request.new_record?
- = link_to project_merge_requests_path(@project), :class => "btn" do
+ = link_to project_merge_requests_path(@project), class: "btn" do
Cancel
- else
- = link_to project_merge_request_path(@project, @merge_request), :class => "btn" do
+ = link_to project_merge_request_path(@project, @merge_request), class: "btn" do
Cancel
diff --git a/app/views/merge_requests/_head.html.haml b/app/views/merge_requests/_head.html.haml
index c578c794060..35a86e6511c 100644
--- a/app/views/merge_requests/_head.html.haml
+++ b/app/views/merge_requests/_head.html.haml
@@ -1,5 +1,5 @@
.top-tabs
- = link_to project_merge_requests_path(@project), :class => "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do
+ = link_to project_merge_requests_path(@project), class: "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do
%span
Merge Requests
diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml
index 59af97a3cd8..7499609066a 100644
--- a/app/views/merge_requests/_merge_request.html.haml
+++ b/app/views/merge_requests/_merge_request.html.haml
@@ -1,4 +1,4 @@
-%li.wll{ :class => mr_css_classes(merge_request) }
+%li.wll{ class: mr_css_classes(merge_request) }
.right
.left
- if merge_request.merged?
@@ -14,9 +14,9 @@
= merge_request.source_branch
→
= merge_request.target_branch
- = image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
+ = image_tag gravatar_icon(merge_request.author_email), class: "avatar"
- %p= link_to_gfm truncate(merge_request.title, :length => 80), project_merge_request_path(merge_request.project, merge_request), :class => "row_title"
+ %p= link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.project, merge_request), class: "row_title"
%span.update-author
%small.cdark= "##{merge_request.id}"
diff --git a/app/views/merge_requests/_show.html.haml b/app/views/merge_requests/_show.html.haml
index c0b3dd9f5aa..072bf259f46 100644
--- a/app/views/merge_requests/_show.html.haml
+++ b/app/views/merge_requests/_show.html.haml
@@ -7,16 +7,16 @@
- if @commits.present?
%ul.nav.nav-tabs.mr_nav_tabs
%li
- = link_to "#notes", "data-url" => project_merge_request_path(@project, @merge_request), :class => "merge-notes-tab tab" do
+ = link_to "#notes", "data-url" => project_merge_request_path(@project, @merge_request), class: "merge-notes-tab tab" do
%i.icon-comment
Comments
%li
- = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do
+ = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), class: "merge-diffs-tab tab" do
%i.icon-list-alt
Diff
-.merge_request_notes#notes{ :class => (controller.action_name == 'show') ? "" : "hide" }
- = render("notes/notes", :tid => @merge_request.id, :tt => "merge_request")
+.merge_request_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
+ = render("notes/notes", tid: @merge_request.id, tt: "merge_request")
.merge-request-diffs
= render "merge_requests/show/diffs" if @diffs
.status
diff --git a/app/views/merge_requests/branch_from.js.haml b/app/views/merge_requests/branch_from.js.haml
index 3e278015b49..156b4f0dc73 100644
--- a/app/views/merge_requests/branch_from.js.haml
+++ b/app/views/merge_requests/branch_from.js.haml
@@ -1,2 +1,2 @@
:plain
- $(".mr_source_commit").html("#{escape_javascript(render 'commits/commit', :commit => @commit)}");
+ $(".mr_source_commit").html("#{escape_javascript(render 'commits/commit', commit: @commit)}");
diff --git a/app/views/merge_requests/branch_to.js.haml b/app/views/merge_requests/branch_to.js.haml
index 1ab1f6c43a9..8a201d42088 100644
--- a/app/views/merge_requests/branch_to.js.haml
+++ b/app/views/merge_requests/branch_to.js.haml
@@ -1,3 +1,3 @@
:plain
- $(".mr_target_commit").html("#{escape_javascript(render 'commits/commit', :commit => @commit)}");
+ $(".mr_target_commit").html("#{escape_javascript(render 'commits/commit', commit: @commit)}");
diff --git a/app/views/merge_requests/commits.js.haml b/app/views/merge_requests/commits.js.haml
index 2055aa9b4bd..76322bdb210 100644
--- a/app/views/merge_requests/commits.js.haml
+++ b/app/views/merge_requests/commits.js.haml
@@ -1,4 +1,4 @@
:plain
- $(".merge-request-commits").html("#{escape_javascript(render(:partial => "commits"))}");
+ $(".merge-request-commits").html("#{escape_javascript(render(partial: "commits"))}");
diff --git a/app/views/merge_requests/diffs.js.haml b/app/views/merge_requests/diffs.js.haml
index 4be5ec132e3..b147e5be71c 100644
--- a/app/views/merge_requests/diffs.js.haml
+++ b/app/views/merge_requests/diffs.js.haml
@@ -1,4 +1,4 @@
:plain
- $(".merge-request-diffs").html("#{escape_javascript(render(:partial => "merge_requests/show/diffs"))}");
+ $(".merge-request-diffs").html("#{escape_javascript(render(partial: "merge_requests/show/diffs"))}");
diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml
index 5210b95e3e4..4ad6e5c18ce 100644
--- a/app/views/merge_requests/index.html.haml
+++ b/app/views/merge_requests/index.html.haml
@@ -1,7 +1,7 @@
%h3.page_title
Merge Requests
- if can? current_user, :write_issue, @project
- = link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do
+ = link_to new_project_merge_request_path(@project), class: "right btn small", title: "New Merge Request" do
New Merge Request
%br
@@ -10,17 +10,17 @@
.ui-box
.title
%ul.nav.nav-pills
- %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
- = link_to project_merge_requests_path(@project, :f => 0) do
+ %li{class: ("active" if (params[:f] == "0" || !params[:f]))}
+ = link_to project_merge_requests_path(@project, f: 0) do
Open
- %li{:class => ("active" if params[:f] == "2")}
- = link_to project_merge_requests_path(@project, :f => 2) do
+ %li{class: ("active" if params[:f] == "2")}
+ = link_to project_merge_requests_path(@project, f: 2) do
Closed
- %li{:class => ("active" if params[:f] == "3")}
- = link_to project_merge_requests_path(@project, :f => 3) do
+ %li{class: ("active" if params[:f] == "3")}
+ = link_to project_merge_requests_path(@project, f: 3) do
To Me
- %li{:class => ("active" if params[:f] == "1")}
- = link_to project_merge_requests_path(@project, :f => 1) do
+ %li{class: ("active" if params[:f] == "1")}
+ = link_to project_merge_requests_path(@project, f: 1) do
All
%ul.unstyled
@@ -31,7 +31,7 @@
- if @merge_requests.present?
%li.bottom
.row
- .span7= paginate @merge_requests, :theme => "gitlab"
+ .span7= paginate @merge_requests, theme: "gitlab"
.span4.right
%span.cgray.right #{@merge_requests.total_count} merge requests for this filter
diff --git a/app/views/merge_requests/show.js.haml b/app/views/merge_requests/show.js.haml
index 2922b3bc6f0..7a27b166849 100644
--- a/app/views/merge_requests/show.js.haml
+++ b/app/views/merge_requests/show.js.haml
@@ -1,2 +1,2 @@
:plain
- $(".merge-request-notes").html("#{escape_javascript(render("notes/notes", :tid => @merge_request.id, :tt => "merge_request"))}");
+ $(".merge-request-notes").html("#{escape_javascript(render("notes/notes", tid: @merge_request.id, tt: "merge_request"))}");
diff --git a/app/views/merge_requests/show/_commits.html.haml b/app/views/merge_requests/show/_commits.html.haml
index d10e8fd597a..d25e707c64e 100644
--- a/app/views/merge_requests/show/_commits.html.haml
+++ b/app/views/merge_requests/show/_commits.html.haml
@@ -7,19 +7,19 @@
- if @commits.count > 8
%ul.first_mr_commits.unstyled
- @commits.first(8).each do |commit|
- = render "commits/commit", :commit => commit
+ = render "commits/commit", commit: commit
%li.bottom
8 of #{@commits.count} commits displayed.
%strong
%a.mr_show_all_commits Click here to show all
%ul.all_mr_commits.hide.unstyled
- @commits.each do |commit|
- = render "commits/commit", :commit => commit
+ = render "commits/commit", commit: commit
- else
%ul.unstyled
- @commits.each do |commit|
- = render "commits/commit", :commit => commit
+ = render "commits/commit", commit: commit
- else
%h5
diff --git a/app/views/merge_requests/show/_diffs.html.haml b/app/views/merge_requests/show/_diffs.html.haml
index 80776f19132..7685090311a 100644
--- a/app/views/merge_requests/show/_diffs.html.haml
+++ b/app/views/merge_requests/show/_diffs.html.haml
@@ -1,8 +1,8 @@
- if @merge_request.valid_diffs?
- = render "commits/diffs", :diffs => @diffs
+ = render "commits/diffs", diffs: @diffs
- elsif @merge_request.broken_diffs?
%h4.nothing_here_message
Can't load diff.
- You can #{link_to "download MR patch", raw_project_merge_request_path(@project, @merge_request), :class => "vlink"} instead.
+ You can #{link_to "download MR patch", raw_project_merge_request_path(@project, @merge_request), class: "vlink"} instead.
- else
%h4.nothing_here_message Nothing to merge
diff --git a/app/views/merge_requests/show/_how_to_merge.html.haml b/app/views/merge_requests/show/_how_to_merge.html.haml
index 2512d254fe0..c21f2727a47 100644
--- a/app/views/merge_requests/show/_how_to_merge.html.haml
+++ b/app/views/merge_requests/show/_how_to_merge.html.haml
@@ -1,6 +1,6 @@
%div#modal_merge_info.modal.hide
.modal-header
- %a.close{:href => "#"} ×
+ %a.close{href: "#"} ×
%h3 How To Merge
.modal-body
%pre
diff --git a/app/views/merge_requests/show/_mr_accept.html.haml b/app/views/merge_requests/show/_mr_accept.html.haml
index c158ef88bba..a6c2afb117c 100644
--- a/app/views/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/merge_requests/show/_mr_accept.html.haml
@@ -4,29 +4,29 @@
- if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project)
- .automerge_widget.can_be_merged{:style => "display:none"}
+ .automerge_widget.can_be_merged{style: "display:none"}
.alert.alert-success
%span
- = form_for [:automerge, @project, @merge_request], :remote => true, :method => :get do |f|
+ = form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
%p
You can accept this request automatically.
If you still want to do it manually -
- %strong= link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"
+ %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
for instructions
.accept_group
- = f.submit "Accept Merge Request", :class => "btn small success accept_merge_request"
+ = f.submit "Accept Merge Request", class: "btn small success accept_merge_request"
- unless @project.root_ref? @merge_request.source_branch
.remove_branch_holder
- = label_tag :should_remove_source_branch, :class => "checkbox" do
+ = label_tag :should_remove_source_branch, class: "checkbox" do
= check_box_tag :should_remove_source_branch
Remove source-branch
.clearfix
- .automerge_widget.cannot_be_merged{:style => "display:none"}
+ .automerge_widget.cannot_be_merged{style: "display:none"}
.alert.alert-info
%span
- = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
+ = link_to "Show how to merge", "#", class: "how_to_merge_link btn small padded", title: "How To Merge"
 
%strong This request cant be merged with GitLab. You should do it manually
@@ -36,7 +36,7 @@
%i.icon-refresh
Checking for ability to automatically merge…
- .automerge_widget.already_cannot_be_merged{:style => "display:none"}
+ .automerge_widget.already_cannot_be_merged{style: "display:none"}
.alert.alert-info
%strong This merge request already can not be merged. Try to reload page.
diff --git a/app/views/merge_requests/show/_mr_box.html.haml b/app/views/merge_requests/show/_mr_box.html.haml
index bb8bf1ceba6..81ab83f3436 100644
--- a/app/views/merge_requests/show/_mr_box.html.haml
+++ b/app/views/merge_requests/show/_mr_box.html.haml
@@ -10,12 +10,12 @@
.middle_box_content
%div
%cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by
- = image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av"
+ = image_tag gravatar_icon(@merge_request.author_email), width: 16, class: "lil_av"
%strong.author= link_to_merge_request_author(@merge_request)
- if @merge_request.assignee
%cite.cgray and currently assigned to
- = image_tag gravatar_icon(@merge_request.assignee_email), :width => 16, :class => "lil_av"
+ = image_tag gravatar_icon(@merge_request.assignee_email), width: 16, class: "lil_av"
%strong.author= link_to_merge_request_assignee(@merge_request)
diff --git a/app/views/merge_requests/show/_mr_title.html.haml b/app/views/merge_requests/show/_mr_title.html.haml
index 3f6060b0645..31fa0779fd2 100644
--- a/app/views/merge_requests/show/_mr_title.html.haml
+++ b/app/views/merge_requests/show/_mr_title.html.haml
@@ -13,13 +13,13 @@
= "MERGED"
- if can?(current_user, :modify_merge_request, @merge_request)
- if @merge_request.open?
- = link_to raw_project_merge_request_path(@project, @merge_request), :class => "btn grouped" do
+ = link_to raw_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
%i.icon-download-alt
Get Patch
- = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn grouped danger", :title => "Close merge request"
+ = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped danger", title: "Close merge request"
- = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn grouped" do
+ = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
%i.icon-edit
Edit
View Lorry Controller Status