diff options
author | Johan Sørensen <johan@johansorensen.com> | 2009-07-15 10:40:39 +0200 |
---|---|---|
committer | Johan Sørensen <johan@johansorensen.com> | 2009-07-15 10:40:39 +0200 |
commit | d3c7cf5a26ae206ddf8bfdc7adec058c01f61e0c (patch) | |
tree | 899cfc96588aad6f5d783aee5d6798ba52af010b /app/models/merge_request.rb | |
parent | d27be798f10bc995990a57c2e6bc107e9c58b2a8 (diff) | |
download | gitorious-mainline-outdated-d3c7cf5a26ae206ddf8bfdc7adec058c01f61e0c.zip gitorious-mainline-outdated-d3c7cf5a26ae206ddf8bfdc7adec058c01f61e0c.tar.gz gitorious-mainline-outdated-d3c7cf5a26ae206ddf8bfdc7adec058c01f61e0c.tar.bz2 |
Prettified the rendering of merge request status changes in comments and events
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index ea3203d..5b389a5 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -194,9 +194,10 @@ class MergeRequest < ActiveRecord::Base def create_status_change_event(comment) if @current_user message = "State changed " - message << "from #{@previous_state} " if @previous_state - message << "to #{status_tag}" - target_repository.project.create_event(Action::UPDATE_MERGE_REQUEST, self, @current_user, message, comment) + message << "from <span class=\"changed\">#{@previous_state}</span> " if @previous_state + message << "to <span class=\"changed\">#{status_tag}</span>" + target_repository.project.create_event(Action::UPDATE_MERGE_REQUEST, self, + @current_user, message, comment) end end @@ -491,7 +492,7 @@ class MergeRequest < ActiveRecord::Base tracking_repository.full_repository_path, branch_spec) create_new_version target_repository.project.create_event(Action::UPDATE_MERGE_REQUEST, self, - user, "new version #{current_version_number}", "reason") + user, "new version #{current_version_number}") end def tracking_repository |