Skip to content

Commit

Permalink
Add information about how to update merge requests to the owner
Browse files Browse the repository at this point in the history
  • Loading branch information
Marius Mathiesen committed Jul 16, 2009
1 parent 32b4759 commit 4fa48ea
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
9 changes: 9 additions & 0 deletions app/views/merge_requests/show.html.erb
Expand Up @@ -33,13 +33,21 @@
<% if logged_in? && @merge_request.resolvable_by?(current_user) && !@merge_request.possible_next_states.blank? -%>
<% help_box(:left) do -%>
<p>
<%- if @merge_request.user == current_user -%>
<%= t("views.merges.help_for_owners").call(url_for(:action => :edit)) -%>
<%- else -%>
<%= t("views.merges.help") %>
<%- end -%>
<small>
<%= link_to_function(t("views.merges.example"),
"$('detailed_merge_request_help').toggle()", :class => "more_info") -%>
</small>
</p>
<pre id="detailed_merge_request_help" style="display:none;">
<%- if @merge_request.user == current_user -%>
git push <%= @merge_request.target_repository.push_url -%> \
<%= @merge_request.source_branch -%>:<%= @merge_request.merge_branch_name -%>
<%- else -%>
git checkout master
git remote add <%= @merge_request.source_repository.user.login -%> <%= @merge_request.source_repository.clone_url %>
git fetch <%= @merge_request.source_repository.user.login %>
Expand All @@ -51,6 +59,7 @@
git checkout <%= @merge_request.target_branch || 'master' %>
git merge <%= @merge_request.source_repository.user.login -%>/<%= @merge_request.source_branch || 'master' %>
git push origin <%= @merge_request.target_branch || 'master' -%>
<%- end -%>
</pre>
<% end -%>
<% end -%>
Expand Down
4 changes: 4 additions & 0 deletions config/locales/en.rb
Expand Up @@ -465,6 +465,10 @@
"branch for review, verifying the changes and then merge to back " +
"to master. Your project may or may not use another method for " +
"integrating merge requests.",
:help_for_owners => lambda{|edit_link| "To make updates to your merge requests," +
"you can either edit it from <a href='#{edit_link}'>this link</a> or push your changes through git. "+
"Either way, a new version of your merge request will be created, up until the last commit you push. " +
"You may make as many updates as you like; the last one will always be displayed by default."},
:example => "Show example workflow",
:commits_to_merged => "Commits that would be merged",
:commits => "Commits",
Expand Down

0 comments on commit 4fa48ea

Please sign in to comment.