Commit 05e4d1d02f49cf2b3c830a0e5e3d9d4b7c9432cb

Unify Project#slug usage on events display and reword mergerequest event text a bit

Commit diff

app/helpers/application_helper.rb

 
143143
144144 project = target.project
145145
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)}"
147147 category = "repository"
148148 when Action::DELETE_REPOSITORY
149149 action = "<strong>deleted repository</strong> #{link_to h(target.title), project_path(target)}/#{event.data}"
156156 when Action::CREATE_BRANCH
157157 project = target.project
158158 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)}"
160160 body = event.body
161161 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)}"
163163 end
164164 category = "commit"
165165 when Action::DELETE_BRANCH
166166 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)}"
168168 category = "commit"
169169 when Action::CREATE_TAG
170170 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)}"
172172 body = "#{link_to event.data, project_repository_commit_path(project, target, event.data)}<br/>#{event.body}"
173173 category = "commit"
174174 when Action::DELETE_TAG
175175 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)}"
177177 category = "commit"
178178 when Action::ADD_COMMITTER
179179 user = target.user
180180 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)}"
182182 category = "repository"
183183 when Action::REMOVE_COMMITTER
184184 user = User.find_by_id(event.data.to_i)
185185 next unless user
186186
187187 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)}"
189189 category = "repository"
190190 when Action::COMMENT
191191 project = target.project
192192 repo = target.repository
193193
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)}"
195195 body = truncate(h(target.body), 150)
196196 category = "comment"
197197 when Action::REQUEST_MERGE
199199 project = source_repository.project
200200 target_repository = target.target_repository
201201
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"
205205 when Action::RESOLVE_MERGE_REQUEST
206206 source_repository = target.source_repository
207207 project = source_repository.project
208208 target_repository = target.target_repository
209209
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]}"
211212 category = "merge_request"
212213 when Action::UPDATE_MERGE_REQUEST
213214 source_repository = target.source_repository
220220 when Action::DELETE_MERGE_REQUEST
221221 project = target.project
222222
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)}"
224224 category = "merge_request"
225225 end
226226
toggle raw diff