deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'mergerequest-to-coffee' of https://github.com/koenpunt/gitlabhq into koenpunt-mergerequest-to-coffee

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-05 22:54:48 +02:00
commit eaa8cd28d0
13 changed files with 142 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/views/merge_requests/_form.html.haml
View file

@ -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: "#{controller.action_name}-merge-request form-horizontal" } do |f|
-if @merge_request.errors.any?
.alert-message.block-message.error
%ul
@ -61,8 +61,9 @@
:javascript
$(function(){
disableButtonIfEmptyField("#merge_request_title", ".save-btn");
var source_branch = $("#merge_request_source_branch");
var target_branch = $("#merge_request_target_branch");
var source_branch = $("#merge_request_source_branch")
, target_branch = $("#merge_request_target_branch");
$.get("#{branch_from_project_merge_requests_path(@project)}", {ref: source_branch.val() });
$.get("#{branch_to_project_merge_requests_path(@project)}", {ref: target_branch.val() });

57
app/views/merge_requests/_show.html.haml
View file

@ -1,33 +1,35 @@
= render "merge_requests/show/mr_title"
= render "merge_requests/show/how_to_merge"
= render "merge_requests/show/mr_box"
= render "merge_requests/show/mr_accept"
- if @project.gitlab_ci?
= render "merge_requests/show/mr_ci"
= render "merge_requests/show/commits"
.merge-request
= render "merge_requests/show/mr_title"
= render "merge_requests/show/how_to_merge"
= render "merge_requests/show/mr_box"
= render "merge_requests/show/mr_accept"
- if @project.gitlab_ci?
= render "merge_requests/show/mr_ci"
= render "merge_requests/show/commits"
- 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
%i.icon-comment
Comments
%li
= link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), class: "merge-diffs-tab tab" do
%i.icon-list-alt
Diff
- if @commits.present?
%ul.nav.nav-tabs
%li.notes-tab{data: {action: 'notes'}}
= link_to project_merge_request_path(@project, @merge_request) do
%i.icon-comment
Comments
%li.diffs-tab{data: {action: 'diffs'}}
= link_to diffs_project_merge_request_path(@project, @merge_request) do
%i.icon-list-alt
Diff
.merge_request_notes.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
= render("notes/notes_with_form", tid: @merge_request.id, tt: "merge_request")
.merge-request-diffs
= render "merge_requests/show/diffs" if @diffs
.status
.notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
= render("notes/notes_with_form", tid: @merge_request.id, tt: "merge_request")
.diffs.tab-content
= render "merge_requests/show/diffs" if @diffs
.status
= render "notes/per_line_form"
= render "notes/per_line_form"
:javascript
var merge_request;
$(function(){
MergeRequest.init({
merge_request = new MergeRequest({
url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
check_enable: #{@merge_request.state == MergeRequest::UNCHECKED ? "true" : "false"},
url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}",
@ -35,10 +37,5 @@
current_state: "#{@merge_request.human_state}",
action: "#{controller.action_name}"
});
$(".edit_merge_request").live("ajax:beforeSend", function() {
$('.can_be_merged').hide();
$('.merge_in_progress').show();
})
})
});

2
app/views/merge_requests/automerge.js.haml
View file

@ -3,5 +3,5 @@
location.reload();
-else
:plain
MergeRequest.already_cannot_be_merged()
merge_request.alreadyOrCannotBeMerged()

2
app/views/merge_requests/commits.js.haml
View file

@ -1,4 +1,4 @@
:plain
$(".merge-request-commits").html("#{escape_javascript(render(partial: "commits"))}");
merge_request.$(".commits").html("#{escape_javascript(render(partial: "commits"))}");

6
app/views/merge_requests/diffs.js.haml
View file

@ -1,7 +1,5 @@
: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"))}");
$(function(){
PerLineNotes.init();
});
PerLineNotes.init();

4
app/views/merge_requests/index.html.haml
View file

@ -44,6 +44,4 @@
%span.cgray.right #{@merge_requests.total_count} merge requests for this filter
:javascript
$(function() {
merge_requestsPage();
})
$(merge_requestsPage);

2
app/views/merge_requests/show.js.haml
View file

@ -1,2 +1,2 @@
:plain
$(".merge-request-notes").html("#{escape_javascript(render notes/notes_with_form", tid: @merge_request.id, tt: "merge_request")}");
merge_request.$(".notes").html("#{escape_javascript(render "notes/notes_with_form", tid: @merge_request.id, tt: "merge_request")}");

8
app/views/merge_requests/show/_commits.html.haml
View file

@ -3,16 +3,16 @@
%h5.title
%i.icon-list
Commits (#{@commits.count})
.merge-request-commits
.commits
- if @commits.count > 8
%ul.first_mr_commits.well-list
%ul.first-commits.well-list
- @commits.first(8).each do |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.well-list
%a.show-all-commits Click here to show all
%ul.all-commits.hide.well-list
- @commits.each do |commit|
= render "commits/commit", commit: commit

2
app/views/merge_requests/show/_mr_accept.html.haml
View file

@ -40,6 +40,6 @@
.alert.alert-info
%strong This merge request already can not be merged. Try to reload page.
.merge_in_progress.hide
.merge-in-progress.hide
%span.cgray Merge is in progress. Please wait. Page will be automatically reloaded.  
= image_tag "ajax_loader.gif"