mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-19 09:36:47 +10:00
Izaak AlpertandIzaak Alpert
3d7194f011
The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
22 lines
793 B
Plaintext
22 lines
793 B
Plaintext
%li.commit
|
|
.browse_code_link_holder
|
|
%p
|
|
%strong= link_to "Browse Code »", project_tree_path(project, commit), class: "right"
|
|
%p
|
|
= link_to commit.short_id(8), project_commit_path(project, commit), class: "commit_short_id"
|
|
= commit_author_link(commit, avatar: true, size: 24)
|
|
|
|
= link_to_gfm truncate(commit.title, length: 70), project_commit_path(project, commit.id), class: "row_title"
|
|
|
|
%time.committed_ago{ datetime: commit.committed_date, title: commit.committed_date.stamp("Aug 21, 2011 9:23pm") }
|
|
= time_ago_in_words(commit.committed_date)
|
|
ago
|
|
|
|
|
|
%span.notes_count
|
|
- notes = project.notes.for_commit_id(commit.id)
|
|
- if notes.any?
|
|
%span.badge.badge-info
|
|
%i.icon-comment
|
|
= notes.count
|