Revise the merge request git workflow helper text a bit

3 files changed, 24 insertions, 12 deletions

diff --git a/app/views/merge_requests/show.html.erb b/app/views/merge_requests/show.html.erb
index c01411f..105aec8 100644
--- a/app/views/merge_requests/show.html.erb
+++ b/app/views/merge_requests/show.html.erb
@@ -54,22 +54,30 @@
   <% end -%>
 
 <% if @merge_request.open? -%>
-  <p><%= t("views.merges.help") %></p>
-<pre>
+<% help_box(:left) do -%>
+  <p>
+    <%= t("views.merges.help") %> 
+    <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;">
 git checkout master
-git checkout -b review/master
-git remote add review <%= @merge_request.source_repository.clone_url %>
-git pull review <%= @merge_request.source_branch %>
+git remote add <%= @merge_request.source_repository.user.login -%> <%= @merge_request.source_repository.clone_url %>
+git fetch <%= @merge_request.source_repository.user.login %>
+git checkout -b <%= @merge_request.source_repository.user.login -%>-review <%= @merge_request.source_repository.user.login -%>/<%= @merge_request.source_branch || 'master' %>
 <% if @merge_request.applies_to_specific_commits? -%>
 git reset --hard <%=h @merge_request.ending_commit -%>
 <% end %>
 # review changes, assess they are ok
-git checkout master
-git merge review/master
-git push origin master
+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' -%>
 </pre>
   <% end -%>
 <% end -%>
+<% end -%>
 
 <% if @merge_request.open? -%>
 <h2><%= t("views.merges.commits_to_merged") %>:</h2>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index daabd5f..8dcd5ae 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -21,8 +21,8 @@ config.action_mailer.delivery_method = :test
 ExceptionNotifier.exception_recipients = YAML.load_file(File.join(RAILS_ROOT,
   "config/gitorious.yml"))["exception_notification_emails"]
 
-# config.cache_store = :mem_cache_store, ['localhost:11211'], { 
-#   :namespace => 'ks1' 
-# }
+config.cache_store = :mem_cache_store, ['localhost:11211'], { 
+  :namespace => 'ks1' 
+}
 
 SslRequirement.disable_ssl_check = true
diff --git a/config/locales/en.rb b/config/locales/en.rb
index 6064e88..8eba909 100644
--- a/config/locales/en.rb
+++ b/config/locales/en.rb
@@ -443,7 +443,11 @@
         :show_title => "Reviewing merge request {{source}} &#x2192; {{target}}",
         :update_btn => "Update merge request",
         :delete_btn => 'Delete merge request',
-        :help => "The recommended way to merge in these changes is to pull them into a local branch for review and them merge to back to master:",
+        :help => "One way to merge in these changes is to pull them into a local " +
+                  "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.",
+        :example => "Show example workflow",
         :commits_to_merged => "Commits that would be merged",
         :commits => "Commits",
         :reopen_btn => 'Reopen merge request',