| |   |
| 143 | 143 | |
| 144 | 144 | project = target.project |
| 145 | 145 | |
| 146 | | action = "<strong>cloned</strong> #{link_to h(project.title), project_path(project)}/#{link_to h(original_repo.name), project_repository_url(project, original_repo)} in #{link_to h(target.name), project_repository_url(project, target)}" |
| 146 | action = "<strong>cloned</strong> #{link_to h(project.slug), project_path(project)}/#{link_to h(original_repo.name), project_repository_url(project, original_repo)} in #{link_to h(target.name), project_repository_url(project, target)}" |
| 147 | 147 | category = "repository" |
| 148 | 148 | when Action::DELETE_REPOSITORY |
| 149 | 149 | action = "<strong>deleted repository</strong> #{link_to h(target.title), project_path(target)}/#{event.data}" |
| … | … | |
| 156 | 156 | when Action::CREATE_BRANCH |
| 157 | 157 | project = target.project |
| 158 | 158 | if event.data == "master" |
| 159 | | action = "<strong>started development</strong> of #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 159 | action = "<strong>started development</strong> of #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 160 | 160 | body = event.body |
| 161 | 161 | else |
| 162 | | action = "<strong>created branch</strong> #{link_to h(event.data), project_repository_tree_path(project, target, event.data)} on #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 162 | action = "<strong>created branch</strong> #{link_to h(event.data), project_repository_tree_path(project, target, event.data)} on #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 163 | 163 | end |
| 164 | 164 | category = "commit" |
| 165 | 165 | when Action::DELETE_BRANCH |
| 166 | 166 | project = target.project |
| 167 | | action = "<strong>deleted branch</strong> #{event.data} on #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 167 | action = "<strong>deleted branch</strong> #{event.data} on #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 168 | 168 | category = "commit" |
| 169 | 169 | when Action::CREATE_TAG |
| 170 | 170 | project = target.project |
| 171 | | action = "<strong>tagged</strong> #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 171 | action = "<strong>tagged</strong> #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 172 | 172 | body = "#{link_to event.data, project_repository_commit_path(project, target, event.data)}<br/>#{event.body}" |
| 173 | 173 | category = "commit" |
| 174 | 174 | when Action::DELETE_TAG |
| 175 | 175 | project = target.project |
| 176 | | action = "<strong>deleted tag</strong> #{event.data} on #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 176 | action = "<strong>deleted tag</strong> #{event.data} on #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 177 | 177 | category = "commit" |
| 178 | 178 | when Action::ADD_COMMITTER |
| 179 | 179 | user = target.user |
| 180 | 180 | repo = target.repository |
| 181 | | action = "<strong>added committer</strong> #{link_to user.login, user_path(user)} to #{link_to h(repo.project.title), project_path(repo.project)}/#{link_to h(repo.name), project_repository_url(repo.project, repo)}" |
| 181 | action = "<strong>added committer</strong> #{link_to user.login, user_path(user)} to #{link_to h(repo.project.slug), project_path(repo.project)}/#{link_to h(repo.name), project_repository_url(repo.project, repo)}" |
| 182 | 182 | category = "repository" |
| 183 | 183 | when Action::REMOVE_COMMITTER |
| 184 | 184 | user = User.find_by_id(event.data.to_i) |
| 185 | 185 | next unless user |
| 186 | 186 | |
| 187 | 187 | project = target.project |
| 188 | | action = "<strong>removed committer</strong> #{link_to user.login, user_path(user)} from #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 188 | action = "<strong>removed committer</strong> #{link_to user.login, user_path(user)} from #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 189 | 189 | category = "repository" |
| 190 | 190 | when Action::COMMENT |
| 191 | 191 | project = target.project |
| 192 | 192 | repo = target.repository |
| 193 | 193 | |
| 194 | | action = "<strong>commented</strong> on #{link_to h(project.title), project_path(project)}/#{link_to h(repo.name), project_repository_url(project, repo)}" |
| 194 | action = "<strong>commented</strong> on #{link_to h(project.slug), project_path(project)}/#{link_to h(repo.name), project_repository_url(project, repo)}" |
| 195 | 195 | body = truncate(h(target.body), 150) |
| 196 | 196 | category = "comment" |
| 197 | 197 | when Action::REQUEST_MERGE |
| … | … | |
| 199 | 199 | project = source_repository.project |
| 200 | 200 | target_repository = target.target_repository |
| 201 | 201 | |
| 202 | | action = "<strong>requested merge</strong> #{link_to h(project.title), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)} to #{link_to h(project.title), project_path(project)}/#{link_to h(target_repository.name)}" |
| 203 | | body = "#{link_to "review", [project, target_repository, target]}<br/>#{truncate(h(target.proposal), 100)}" |
| 204 | | category = "merge request" |
| 202 | action = "<strong>requested a merge of</strong> #{link_to h(project.slug), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)} with #{link_to h(project.slug), project_path(project)}/#{link_to h(target_repository.name)}" |
| 203 | body = "#{link_to truncate(h(target.proposal), 100), [project, target_repository, target]}" |
| 204 | category = "merge_request" |
| 205 | 205 | when Action::RESOLVE_MERGE_REQUEST |
| 206 | 206 | source_repository = target.source_repository |
| 207 | 207 | project = source_repository.project |
| 208 | 208 | target_repository = target.target_repository |
| 209 | 209 | |
| 210 | | action = "<strong>resolved merge request </strong>to [#{target.status_string}] from #{link_to h(project.title), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)}" |
| 210 | action = "<strong>resolved merge request</strong> as [#{target.status_string}] from #{link_to h(project.slug), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)}" |
| 211 | body = "#{link_to truncate(h(target.proposal), 100), [project, target_repository, target]}" |
| 211 | 212 | category = "merge_request" |
| 212 | 213 | when Action::UPDATE_MERGE_REQUEST |
| 213 | 214 | source_repository = target.source_repository |
| … | … | |
| 220 | 220 | when Action::DELETE_MERGE_REQUEST |
| 221 | 221 | project = target.project |
| 222 | 222 | |
| 223 | | action = "<strong>deleted merge request</strong> from #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 223 | action = "<strong>deleted merge request</strong> from #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}" |
| 224 | 224 | category = "merge_request" |
| 225 | 225 | end |
| 226 | 226 | |
| toggle raw diff |
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -143,7 +143,7 @@ module ApplicationHelper
project = target.project
- action = "<strong>cloned</strong> #{link_to h(project.title), project_path(project)}/#{link_to h(original_repo.name), project_repository_url(project, original_repo)} in #{link_to h(target.name), project_repository_url(project, target)}"
+ action = "<strong>cloned</strong> #{link_to h(project.slug), project_path(project)}/#{link_to h(original_repo.name), project_repository_url(project, original_repo)} in #{link_to h(target.name), project_repository_url(project, target)}"
category = "repository"
when Action::DELETE_REPOSITORY
action = "<strong>deleted repository</strong> #{link_to h(target.title), project_path(target)}/#{event.data}"
@@ -156,42 +156,42 @@ module ApplicationHelper
when Action::CREATE_BRANCH
project = target.project
if event.data == "master"
- action = "<strong>started development</strong> of #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+ action = "<strong>started development</strong> of #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
body = event.body
else
- action = "<strong>created branch</strong> #{link_to h(event.data), project_repository_tree_path(project, target, event.data)} on #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+ action = "<strong>created branch</strong> #{link_to h(event.data), project_repository_tree_path(project, target, event.data)} on #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
end
category = "commit"
when Action::DELETE_BRANCH
project = target.project
- action = "<strong>deleted branch</strong> #{event.data} on #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+ action = "<strong>deleted branch</strong> #{event.data} on #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
category = "commit"
when Action::CREATE_TAG
project = target.project
- action = "<strong>tagged</strong> #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+ action = "<strong>tagged</strong> #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
body = "#{link_to event.data, project_repository_commit_path(project, target, event.data)}<br/>#{event.body}"
category = "commit"
when Action::DELETE_TAG
project = target.project
- action = "<strong>deleted tag</strong> #{event.data} on #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+ action = "<strong>deleted tag</strong> #{event.data} on #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
category = "commit"
when Action::ADD_COMMITTER
user = target.user
repo = target.repository
- action = "<strong>added committer</strong> #{link_to user.login, user_path(user)} to #{link_to h(repo.project.title), project_path(repo.project)}/#{link_to h(repo.name), project_repository_url(repo.project, repo)}"
+ action = "<strong>added committer</strong> #{link_to user.login, user_path(user)} to #{link_to h(repo.project.slug), project_path(repo.project)}/#{link_to h(repo.name), project_repository_url(repo.project, repo)}"
category = "repository"
when Action::REMOVE_COMMITTER
user = User.find_by_id(event.data.to_i)
next unless user
project = target.project
- action = "<strong>removed committer</strong> #{link_to user.login, user_path(user)} from #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+ action = "<strong>removed committer</strong> #{link_to user.login, user_path(user)} from #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
category = "repository"
when Action::COMMENT
project = target.project
repo = target.repository
- action = "<strong>commented</strong> on #{link_to h(project.title), project_path(project)}/#{link_to h(repo.name), project_repository_url(project, repo)}"
+ action = "<strong>commented</strong> on #{link_to h(project.slug), project_path(project)}/#{link_to h(repo.name), project_repository_url(project, repo)}"
body = truncate(h(target.body), 150)
category = "comment"
when Action::REQUEST_MERGE
@@ -199,15 +199,16 @@ module ApplicationHelper
project = source_repository.project
target_repository = target.target_repository
- action = "<strong>requested merge</strong> #{link_to h(project.title), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)} to #{link_to h(project.title), project_path(project)}/#{link_to h(target_repository.name)}"
- body = "#{link_to "review", [project, target_repository, target]}<br/>#{truncate(h(target.proposal), 100)}"
- category = "merge request"
+ action = "<strong>requested a merge of</strong> #{link_to h(project.slug), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)} with #{link_to h(project.slug), project_path(project)}/#{link_to h(target_repository.name)}"
+ body = "#{link_to truncate(h(target.proposal), 100), [project, target_repository, target]}"
+ category = "merge_request"
when Action::RESOLVE_MERGE_REQUEST
source_repository = target.source_repository
project = source_repository.project
target_repository = target.target_repository
- action = "<strong>resolved merge request </strong>to [#{target.status_string}] from #{link_to h(project.title), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)}"
+ action = "<strong>resolved merge request</strong> as [#{target.status_string}] from #{link_to h(project.slug), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)}"
+ body = "#{link_to truncate(h(target.proposal), 100), [project, target_repository, target]}"
category = "merge_request"
when Action::UPDATE_MERGE_REQUEST
source_repository = target.source_repository
@@ -219,7 +220,7 @@ module ApplicationHelper
when Action::DELETE_MERGE_REQUEST
project = target.project
- action = "<strong>deleted merge request</strong> from #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+ action = "<strong>deleted merge request</strong> from #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
category = "merge_request"
end
|